[PORTAL-7] Rebase

This rebasing includes common libraries and common overlays projects abstraction of components Change-Id: I9a24a338665c7cd058978e8636bc412d9e2fdce8 Signed-off-by: st782s <statta@research.att.com>
author: st782s <statta@research.att.com> 2017-05-04 07:48:42 -0400
committer: st782s <statta@research.att.com> 2017-05-04 12:28:17 -0400
commit: b54df0ddd0c6a0372327c5aa3668e5a6458fcd64 (patch)
tree: e69cfa9b314a801bd187cf0145d1d4306436229c /ecomp-portal-BE-common/src/main/java
parent: 39d1e62c84041831bfc52cca73b5ed5efaf57d27 (diff)
223 files changed, 29745 insertions, 0 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
new file mode 100644
index 00000000..76d4b181
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/jarutil/ExtractJar.java
@@ -0,0 +1,204 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package jarutil;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+
+public class ExtractJar {
+
+	/**
+	 * @param args
+	 */
+	
+	public static int bufferSize = 8192;
+	public static String JARFILE = "raptor_upgrade.jar";
+	 
+	public static void main(String[] args) throws Exception {
+		if(args.length > 0 && args[0]!=null && args[0].length()>0)
+			extractFilesFromJar(args[0]);
+		else {
+			System.out.println("Current Directory is taken as webapp path");
+			String currentDir = new File(".").getAbsolutePath();
+			extractFilesFromJar(currentDir);
+		}
+	}
+	
+    public static void readJar(File jarFile) throws Exception{
+        JarInputStream in = new JarInputStream(new FileInputStream(jarFile));
+        ArrayList entries = new ArrayList( );
+        JarEntry je;
+        while((je=in.getNextJarEntry( ))!=null){
+        	 if( je.isDirectory() == false ) {
+        		 if(je.getName().startsWith("att/raptor/config/")) {
+        			 //while((je=in.getNextJarEntry( ))!=null) {
+        				 System.out.println(je.getName() + " " + je.getTime());
+        			 //}
+        			 
+        		 }
+        	 }
+        }
+        in.close( );
+    }
+    
+    public static void extractFilesFromJar(String directory) throws IOException{
+        //JarFile jar = new JarFile(jarFile);
+        Class clazz = ExtractJar.class;
+		String classContainer = clazz.getProtectionDomain().getCodeSource().getLocation().toString();
+		//System.out.println("classContainer ---------> " + classContainer);
+	    URL jarUrl = clazz.getProtectionDomain().getCodeSource().getLocation();
+		
+        JarInputStream entryStream = new JarInputStream(jarUrl.openStream()); 
+        JarEntry entry;
+        while(true) {
+            entry = entryStream.getNextJarEntry();
+            if(entry == null)
+                break;
+     	   if(entry.getName().indexOf("jarutil") < 0) {
+               System.out.println(entry.getName());
+        	   File file=new File(directory,entry.getName());
+               if(entry.isDirectory()) {
+            	   if (!file.exists())
+            		   file.mkdirs();
+               } else {
+                   // make directory (some jars don't list dirs)
+                   File dir = new File(file.getParent());
+                   if (!dir.exists())
+                       dir.mkdirs();
+                    if(file.exists()) file.delete();  
+                   // Make file
+                   FileOutputStream fout = new FileOutputStream(file);
+                   copy(entryStream,fout);
+                   fout.close();
+
+                   // touch the file.
+                   if (entry.getTime()>=0)
+                       file.setLastModified(entry.getTime());
+               }
+               
+     	   }
+     	  entryStream.closeEntry(); 
+        }
+        entryStream.close();
+        System.out.println("************************************************");
+        System.out.println("*                                              *");
+        System.out.println("*                                              *");
+        System.out.println("*          RAPTOR SETUP COMPLETE.              *");
+        System.out.println("*                                              *");
+        System.out.println("*         Thank you for upgrading.             *");
+        System.out.println("*                                              *");
+        System.out.println("************************************************");
+    }
+    
+	
+    public static void copy(InputStream in,  OutputStream out, long byteCount)
+    														throws IOException {     
+    	byte buffer[] = new byte[bufferSize];
+    	int len=bufferSize;
+    	if (byteCount>=0) {
+    		while (byteCount>0) {
+    			if (byteCount<bufferSize)
+    				len=in.read(buffer,0,(int)byteCount);
+    			else
+    				len=in.read(buffer,0,bufferSize);                   
+    			if (len==-1)
+    				break;
+
+    			byteCount -= len;
+    			out.write(buffer,0,len);
+    		}
+    	} else {
+    		while (true) {
+    			len=in.read(buffer,0,bufferSize);
+    			if (len<0 )
+    				break;
+    			out.write(buffer,0,len);
+    		}
+    	}
+    }  
+
+/* ------------------------------------------------------------------- */
+/** Copy Reader to Writer for byteCount bytes or until EOF or exception.
+*/
+    public static void copy(Reader in, Writer out, long byteCount)
+										throws IOException {  
+    	char buffer[] = new char[bufferSize];
+    	int len=bufferSize;
+    	if (byteCount>=0) {
+    		while (byteCount>0) {
+    			if (byteCount<bufferSize)
+    				len=in.read(buffer,0,(int)byteCount);
+    			else
+    				len=in.read(buffer,0,bufferSize);                   
+
+    			if (len==-1)
+    				break;
+    			byteCount -= len;
+    			out.write(buffer,0,len);
+    		}
+    	} else {
+    		while (true) {
+    			len=in.read(buffer,0,bufferSize);
+    			if (len==-1)
+    				break;
+    			out.write(buffer,0,len);
+    		}
+    	}
+    }
+
+    /* ------------------------------------------------------------------- */
+    /** Copy Stream in to Stream out until EOF or exception.
+     */
+    public static void copy(InputStream in, OutputStream out)
+         throws IOException
+    {
+        copy(in,out,-1);
+    }
+    
+    // Deletes all files and subdirectories under dir.
+    // Returns true if all deletions were successful.
+    // If a deletion fails, the method stops attempting to delete and returns false.
+    public static boolean deleteDir(File dir) {
+        if (dir.isDirectory()) {
+            String[] children = dir.list();
+            for (int i=0; i<children.length; i++) {
+                boolean success = deleteDir(new File(dir, children[i]));
+                if (!success) {
+                    return false;
+                }
+            }
+        }
+    
+        // The directory is now empty so delete it
+        return dir.delete();
+    }
+    
+    
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/command/EPLoginBean.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/command/EPLoginBean.java
new file mode 100644
index 00000000..97c2fd8c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/command/EPLoginBean.java
@@ -0,0 +1,186 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.command;
+
+import java.util.Set;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalsdk.core.domain.support.FusionCommand;
+
+public class EPLoginBean extends FusionCommand {
+    private String loginId;
+    private String loginPwd;
+    private String hrid;
+    private String orgUserId;
+    private String siteAccess;
+    private String loginErrorMessage;
+
+    private EPUser user;
+    private Set<?>  menu;
+    private Set<?>  businessDirectMenu;
+
+    /**
+     * getLoginId
+     *
+     * @return String
+     */
+    public String getLoginId() {
+        return loginId;
+    }
+
+    /**
+     * getLoginPwd
+     *
+     * @return String
+     */
+    public String getLoginPwd() {
+        return loginPwd;
+    }
+
+    /**
+     * getMenu
+     *
+     * @return Set
+     */
+    public Set<?> getMenu() {
+        return menu;
+    }
+
+    /**
+     * getUser
+     *
+     * @return User
+     */
+    public EPUser getUser() {
+        return user;
+    }
+
+    /**
+     * getHrid
+     *
+     * @return String
+     */
+    public String getHrid() {
+        return hrid;
+    }
+
+    /**
+     * getSiteAccess
+     *
+     * @return String
+     */
+    public String getSiteAccess() {
+        return siteAccess;
+    }
+
+    /**
+     * getBusinessDirectMenu
+     *
+     * @return Set
+     */
+    public Set<?> getBusinessDirectMenu() {
+        return businessDirectMenu;
+    }
+
+    /**
+     * getLoginErrorMessage
+     *
+     * @return String
+     */
+    public String getLoginErrorMessage() {
+        return loginErrorMessage;
+    }
+
+    public String getOrgUserId() {
+        return orgUserId;
+    }
+
+    /**
+     * setLoginId
+     *
+     * @param loginId String
+     */
+    public void setLoginId(String loginId) {
+        this.loginId = loginId;
+    }
+
+    /**
+     * setLoginPwd
+     *
+     * @param loginPwd String
+     */
+    public void setLoginPwd(String loginPwd) {
+        this.loginPwd = loginPwd;
+    }
+
+    public void setMenu(Set<?> menu) {
+        this.menu = menu;
+    }
+
+    /**
+     * setUser
+     *
+     * @param user User
+     */
+    public void setUser(EPUser user) {
+        this.user = user;
+    }
+
+    /**
+     * setHrid
+     *
+     * @param hrid String
+     */
+    public void setHrid(String hrid) {
+        this.hrid = hrid;
+    }
+
+    /**
+     * setSiteAccess
+     *
+     * @param siteAccess String
+     */
+    public void setSiteAccess(String siteAccess) {
+        this.siteAccess = siteAccess;
+    }
+
+    /**
+     * setBusinessDirectMenu
+     *
+     * @param businessDirectMenu Set
+     */
+    public void setBusinessDirectMenu(Set<?> businessDirectMenu) {
+        this.businessDirectMenu = businessDirectMenu;
+    }
+
+    /**
+     * setLoginErrorMessage
+     *
+     * @param loginErrorMessage String
+     */
+    public void setLoginErrorMessage(String loginErrorMessage) {
+        this.loginErrorMessage = loginErrorMessage;
+    }
+
+    public void setOrgUserId(String orgUserId) {
+        this.orgUserId = orgUserId;
+    }
+}
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/command/PostSearchBean.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/command/PostSearchBean.java
new file mode 100644
index 00000000..9861554a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/command/PostSearchBean.java
@@ -0,0 +1,373 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.command;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalsdk.core.command.support.SearchBase;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+@JsonSerialize
+public class PostSearchBean extends SearchBase {
+
+    private EPUser     user     = null;
+    private EPUser     userOrig = null;
+    private String[] selected;
+    private String[] postHrid;
+    private String[] postOrgUserId;
+    private String[] postFirstName;
+    private String[] postLastName;
+    private String[] postOrgCode;
+    private String[] postPhone;
+    private String[] postEmail;
+    private String[] postAddress1;
+    private String[] postAddress2;
+    private String[] postCity;
+    private String[] postState;
+    private String[] postZipCode;
+    private String[] postLocationClli;
+    private String[] postBusinessCountryCode;
+    private String[] postBusinessCountryName;
+    private String[] postDepartment;
+    private String[] postDepartmentName;
+    private String[] postBusinessUnit;
+    private String[] postBusinessUnitName;
+    private String[] postJobTitle;
+    private String[] postOrgManagerUserId;
+    private String[] postCommandChain;
+    private String[] postCompanyCode;
+    private String[] postCompany;
+    private String[] postCostCenter;
+    private String[] postSiloStatus;
+    private String[] postFinancialLocCode;
+
+
+    public PostSearchBean() {
+      this(null);
+    } // PostSearchBean
+
+    public PostSearchBean(List<?> items) {
+      super(items);
+
+      user     = new EPUser();
+      userOrig = new EPUser();
+
+      setSortBy1("");
+      setSortBy1Orig("");
+
+      //setSortByList(...);
+    }	// PostSearchBean
+
+
+    public String getFirstName()                      { return user.getFirstName(); }
+    public String getLastName()                       { return user.getLastName(); }
+    public String getHrid()                           { return user.getHrid(); }
+    public String getOrgUserId()                      { return user.getOrgUserId(); }
+    public String getOrgCode()                        { return user.getOrgCode(); }
+    public String getEmail()                          { return user.getEmail(); }
+    public String getOrgManagerUserId()                  { return user.getOrgManagerUserId(); }
+    
+    public String getFirstNameOrig()                  { return user.getFirstName(); }
+    public String getLastNameOrig()                   { return user.getLastName(); }
+    public String getHridOrig()                       { return user.getHrid(); }
+    public String getOrgUserIdOrig()                  { return user.getOrgUserId(); }
+    public String getOrgCodeOrig()                    { return user.getOrgCode(); }
+    public String getEmailOrig()                      { return user.getEmail(); }
+    public String getOrgManagerUserIdOrig()              { return user.getOrgManagerUserId(); }
+    
+    
+    public EPUser getUser()                             { return user; }
+
+    public String[] getPostEmail() {
+        return postEmail;
+    }
+
+    public String[] getPostFirstName() {
+        return postFirstName;
+    }
+
+    public String[] getPostHrid() {
+        return postHrid;
+    }
+
+    public String[] getPostLastName() {
+        return postLastName;
+    }
+
+    public String[] getPostOrgCode() {
+        return postOrgCode;
+    }
+
+    public String[] getPostPhone() {
+        return postPhone;
+    }
+
+    public String[] getPostOrgUserId() {
+        return postOrgUserId;
+    }
+
+    public String[] getSelected() {
+        return selected;
+    }
+
+    public String[] getPostAddress1() {
+        return postAddress1;
+    }
+
+    public String[] getPostBusinessCountryCode() {
+        return postBusinessCountryCode;
+    }
+
+    public String[] getPostCity() {
+        return postCity;
+    }
+
+    public String[] getPostCommandChain() {
+        return postCommandChain;
+    }
+
+    public String[] getPostCompany() {
+        return postCompany;
+    }
+
+    public String[] getPostCompanyCode() {
+        return postCompanyCode;
+    }
+
+    public String[] getPostDepartment() {
+        return postDepartment;
+    }
+
+    public String[] getPostDepartmentName() {
+        return postDepartmentName;
+    }
+
+    public String[] getPostBusinessCountryName() {
+        return postBusinessCountryName;
+    }
+
+    public String[] getPostJobTitle() {
+        return postJobTitle;
+    }
+
+    public String[] getPostLocationClli() {
+        return postLocationClli;
+    }
+
+    public String[] getPostManagerUserId() {
+        return postOrgManagerUserId;
+    }
+
+    public String[] getPostState() {
+        return postState;
+    }
+
+    public String[] getPostZipCode() {
+        return postZipCode;
+    }
+
+    public void setFirstName(String value)            { user.setFirstName(value); }
+    public void setLastName(String value)             { user.setLastName(value); }
+    public void setHrid(String value)                 { user.setHrid(value); }
+    public void setOrgUserId(String value)            { user.setOrgUserId(value); }
+    public void setOrgCode(String value)              { user.setOrgCode(value); }
+    public void setEmail(String value)                { user.setEmail(value); }
+    public void setOrgManagerUserId(String value)     { user.setOrgManagerUserId(value); }
+    
+    public void setFirstNameOrig(String value)        { userOrig.setFirstName(value); }
+    public void setLastNameOrig(String value)         { userOrig.setLastName(value); }
+    public void setHridOrig(String value)             { userOrig.setHrid(value); }
+    public void setOrgUserIdOrig(String value)        { userOrig.setOrgUserId(value); }
+    public void setOrgCodeOrig(String value)          { userOrig.setOrgCode(value); }
+    public void setEmailOrig(String value)            { userOrig.setEmail(value); }
+    public void setOrgManagerUserIdOrig(String value) { userOrig.setOrgManagerUserId(value); }
+    
+    public void setUser(EPUser value)                   { this.user = value; }
+
+    public void setPostEmail(String[] postEmail) {
+        this.postEmail = postEmail;
+    }
+
+    public void setPostFirstName(String[] postFirstName) {
+        this.postFirstName = postFirstName;
+    }
+
+    public void setPostHrid(String[] postHrid) {
+        this.postHrid = postHrid;
+    }
+
+    public void setPostLastName(String[] postLastName) {
+        this.postLastName = postLastName;
+    }
+
+    public void setPostOrgCode(String[] postOrgCode) {
+        this.postOrgCode = postOrgCode;
+    }
+
+    public void setPostPhone(String[] postPhone) {
+        this.postPhone = postPhone;
+    }
+
+    public void setPostUserId(String[] postOrgUserId) {
+        this.postOrgUserId = postOrgUserId;
+    }
+
+    public void setSelected(String[] selected) {
+        this.selected = selected;
+    }
+
+    public void setPostAddress1(String[] postAddress1) {
+        this.postAddress1 = postAddress1;
+    }
+
+    public void setPostBusinessCountryCode(String[] postBusinessCountryCode) {
+        this.postBusinessCountryCode = postBusinessCountryCode;
+    }
+
+    public void setPostCity(String[] postCity) {
+        this.postCity = postCity;
+    }
+
+    public void setPostCommandChain(String[] postCommandChain) {
+        this.postCommandChain = postCommandChain;
+    }
+
+    public void setPostCompany(String[] postCompany) {
+        this.postCompany = postCompany;
+    }
+
+    public void setPostCompanyCode(String[] postCompanyCode) {
+        this.postCompanyCode = postCompanyCode;
+    }
+
+    public void setPostDepartment(String[] postDepartment) {
+        this.postDepartment = postDepartment;
+    }
+
+    public void setPostDepartmentName(String[] postDepartmentName) {
+        this.postDepartmentName = postDepartmentName;
+    }
+
+    public void setPostBusinessCountryName(String[] postBusinessCountryName) {
+        this.postBusinessCountryName = postBusinessCountryName;
+    }
+
+    public void setPostJobTitle(String[] postJobTitle) {
+        this.postJobTitle = postJobTitle;
+    }
+
+    public void setPostLocationClli(String[] postLocationClli) {
+        this.postLocationClli = postLocationClli;
+    }
+
+    public void setPostManagerUserId(String[] postOrgManagerUserId) {
+        this.postOrgManagerUserId = postOrgManagerUserId;
+    }
+
+    public void setPostState(String[] postState) {
+        this.postState = postState;
+    }
+
+    public void setPostZipCode(String[] postZipCode) {
+        this.postZipCode = postZipCode;
+    }
+    
+    public String[] getPostAddress2() {
+		return postAddress2;
+	}
+
+	public void setPostAddress2(String[] postAddress2) {
+		this.postAddress2 = postAddress2;
+	}
+
+	public EPUser getUserOrig() {
+		return userOrig;
+	}
+
+	public void setUserOrig(EPUser userOrig) {
+		this.userOrig = userOrig;
+	}
+
+	public String[] getPostBusinessUnit() {
+		return postBusinessUnit;
+	}
+
+	public void setPostBusinessUnit(String[] postBusinessUnit) {
+		this.postBusinessUnit = postBusinessUnit;
+	}
+
+	public String[] getPostBusinessUnitName() {
+		return postBusinessUnitName;
+	}
+
+	public void setPostBusinessUnitName(String[] postBusinessUnitName) {
+		this.postBusinessUnitName = postBusinessUnitName;
+	}
+
+	public String[] getPostCostCenter() {
+		return postCostCenter;
+	}
+
+	public void setPostCostCenter(String[] postCostCenter) {
+		this.postCostCenter = postCostCenter;
+	}
+
+	public String[] getPostSiloStatus() {
+		return postSiloStatus;
+	}
+
+	public void setPostSiloStatus(String[] postSiloStatus) {
+		this.postSiloStatus = postSiloStatus;
+	}
+
+	public String[] getPostFinancialLocCode() {
+		return postFinancialLocCode;
+	}
+
+	public void setPostFinancialLocCode(String[] postFinancialLocCode) {
+		this.postFinancialLocCode = postFinancialLocCode;
+	}
+
+	public void resetSearch() {
+          super.resetSearch();
+          setUser(new EPUser());
+	} // resetSearch
+
+
+	public boolean isCriteriaUpdated() {
+          if(user==null&&userOrig==null)
+            return false;
+          else if(user==null||userOrig==null)
+            return true;
+          else
+            return (! (
+                Utilities.nvl(user.getFirstName()).equals(Utilities.nvl(userOrig.getFirstName()))&&
+                Utilities.nvl(user.getLastName()).equals(Utilities.nvl(userOrig.getLastName()))&&
+                //Utilities.nvl(user.getHrid()).equals(Utilities.nvl(userOrig.getHrid()))&&
+                Utilities.nvl(user.getOrgUserId()).equals(Utilities.nvl(userOrig.getOrgUserId()))&&
+                Utilities.nvl(user.getOrgCode()).equals(Utilities.nvl(userOrig.getOrgCode()))&&
+                Utilities.nvl(user.getEmail()).equals(Utilities.nvl(userOrig.getEmail()))&&
+                Utilities.nvl(user.getOrgManagerUserId()).equals(Utilities.nvl(userOrig.getOrgManagerUserId()))&&
+                true));
+       } // isCriteriaUpdated
+
+}	// PostSearchBean
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/SwaggerConfig.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/SwaggerConfig.java
new file mode 100644
index 00000000..7082fe78
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/SwaggerConfig.java
@@ -0,0 +1,58 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+
+    @Bean
+    public Docket api(){
+        return new Docket(DocumentationType.SWAGGER_2)
+            .select()
+            .apis(RequestHandlerSelectors.any())
+            .paths(PathSelectors.regex("/auxapi/.*"))
+            .build()
+            .apiInfo(apiInfo());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+            .title("ECOMP Portal API Documentation")
+            .description("ECOMP Portal API Documentation")
+            .version("1.2.6")
+            .termsOfServiceUrl("http://terms-of-services.url")
+            .license("LICENSE")
+            .licenseUrl("http://url-to-license.com")
+            .build();
+    }
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/SwaggerMVCConfig.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/SwaggerMVCConfig.java
new file mode 100644
index 00000000..7e2d4540
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/config/SwaggerMVCConfig.java
@@ -0,0 +1,37 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+@EnableWebMvc
+public class SwaggerMVCConfig extends WebMvcConfigurerAdapter {
+
+    @Override 
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+    }
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java
new file mode 100644
index 00000000..986f6387
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPFusionBaseController.java
@@ -0,0 +1,106 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.controller;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.controller.FusionBaseController;
+import org.openecomp.portalsdk.core.domain.MenuData;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Controller
+public abstract class EPFusionBaseController extends FusionBaseController {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPFusionBaseController.class);
+		
+	
+		
+	@Override
+	public boolean isAccessible() {
+		return true;
+	}
+
+	public boolean isRESTfulCall() {
+		return true;
+	}
+
+	@ModelAttribute("menu")
+	public Map<String, Object> messages(HttpServletRequest request) {
+		HttpSession session = null;
+		Map<String, Object> model = new HashMap<String, Object>();
+		session = request.getSession();
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (session != null && user != null) {
+			@SuppressWarnings("unchecked")
+			Set<MenuData> menuResult = (Set<MenuData>) session
+					.getAttribute(SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_ATTRIBUTE_NAME));
+			try {
+				model = setMenu(menuResult);
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+			}
+		}
+		
+		return model;
+	}
+
+	public Map<String, Object> setMenu(Set<MenuData> menuResult) throws Exception {
+		ObjectMapper mapper = new ObjectMapper();
+		List<List<MenuData>> childItemList = new ArrayList<List<MenuData>>();
+		;
+		List<MenuData> parentList = new ArrayList<MenuData>();
+		;
+		Map<String, Object> model = new HashMap<String, Object>();
+		for (MenuData menu : menuResult) {
+			MenuData parentData = new MenuData();
+			parentData.setLabel(menu.getLabel());
+			parentData.setAction(menu.getAction());
+			parentData.setImageSrc(menu.getImageSrc());
+			parentList.add(parentData);
+			List<MenuData> tempList = new ArrayList<MenuData>();
+			for (Object o : menu.getChildMenus()) {
+				MenuData m = (MenuData) o;
+				MenuData data = new MenuData();
+				data.setLabel(m.getLabel());
+				data.setAction(m.getAction());
+				data.setImageSrc(m.getImageSrc());
+				tempList.add(data);
+			}
+			childItemList.add(tempList);
+		}
+		model.put("childItemList", childItemList != null ? mapper.writeValueAsString(childItemList) : "");
+		model.put("parentList", parentList != null ? mapper.writeValueAsString(parentList) : "");
+		return model;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPRestrictedBaseController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPRestrictedBaseController.java
new file mode 100644
index 00000000..b3bef781
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPRestrictedBaseController.java
@@ -0,0 +1,52 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.controller;
+
+public class EPRestrictedBaseController extends EPFusionBaseController{
+	
+	protected String viewName;
+	private String exceptionView;
+	
+	@Override
+	public boolean isAccessible() {
+		return false;
+	}
+	
+	@Override
+	public boolean isRESTfulCall(){
+		return false;
+	}
+	
+	protected String getViewName() {
+		return viewName;
+	}
+	
+	protected void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+	public String getExceptionView() {
+        return (exceptionView == null) ? "runtime_error_handler" : exceptionView;
+	}
+
+	public void setExceptionView(String exceptionView) {
+		this.exceptionView = exceptionView;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPRestrictedRESTfulBaseController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPRestrictedRESTfulBaseController.java
new file mode 100644
index 00000000..7b1be46c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPRestrictedRESTfulBaseController.java
@@ -0,0 +1,54 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.controller;
+
+public class EPRestrictedRESTfulBaseController extends EPFusionBaseController{
+	
+	protected String viewName;
+	private String exceptionView;
+	
+	@Override
+	public boolean isAccessible() {
+		return false;
+	}
+	
+	@Override
+	public boolean isRESTfulCall(){
+		return true;
+	}
+	
+	protected String getViewName() {
+		return viewName;
+	}
+	
+	protected void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+
+	public String getExceptionView() {
+        return (exceptionView == null) ? "runtime_error_handler" : exceptionView;
+	}
+
+	public void setExceptionView(String exceptionView) {
+		this.exceptionView = exceptionView;
+	}
+	
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPUnRestrictedBaseController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPUnRestrictedBaseController.java
new file mode 100644
index 00000000..f16c1b94
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/EPUnRestrictedBaseController.java
@@ -0,0 +1,42 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.controller;
+
+public class EPUnRestrictedBaseController extends EPFusionBaseController{
+	protected String viewName;
+	
+	@Override
+	public boolean isAccessible() {
+		return true;
+	}
+	
+	@Override
+	public boolean isRESTfulCall(){
+		return false;
+	}
+	
+	protected String getViewName() {
+		return viewName;
+	}
+
+	protected void setViewName(String viewName) {
+		this.viewName = viewName;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/sessionmgt/SessionCommunicationController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/sessionmgt/SessionCommunicationController.java
new file mode 100644
index 00000000..eda094b5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/controller/sessionmgt/SessionCommunicationController.java
@@ -0,0 +1,72 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.controller.sessionmgt;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedRESTfulBaseController;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalapp.service.sessionmgt.ManageService;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+
+
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API)
+@Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class SessionCommunicationController  extends EPRestrictedRESTfulBaseController {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SessionCommunicationController.class);
+	
+	@Autowired
+	private ManageService manageService;
+		
+	protected boolean isAuxRESTfulCall(){
+		return true;
+	}
+	
+	@ApiOperation(value = "Gets session slot-check interval, a duration in milliseconds.",
+    response = Integer.class)
+ 	@RequestMapping(value={"/getSessionSlotCheckInterval"}, method = RequestMethod.GET, produces = "application/json")
+	public Integer getSessionSlotCheckInterval(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return manageService.fetchSessionSlotCheckInterval();
+	}
+	
+	@ApiOperation(value = "Extends session timeout values for all on-boarded applications.",
+    response = Boolean.class)
+	@RequestMapping(value={"/extendSessionTimeOuts"}, method = RequestMethod.POST)
+	public Boolean extendSessionTimeOuts(HttpServletRequest request, HttpServletResponse response, @RequestParam String sessionMap) throws Exception {
+		manageService.extendSessionTimeOuts(sessionMap);
+		
+		return true;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/controller/RolesApprovalSystemController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/controller/RolesApprovalSystemController.java
new file mode 100644
index 00000000..e0fa523a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/controller/RolesApprovalSystemController.java
@@ -0,0 +1,143 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.externalsystemapproval.controller;
+
+import java.util.ArrayList;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalapp.externalsystemapproval.model.ExternalSystemRoleApproval;
+import org.openecomp.portalapp.externalsystemapproval.model.ExternalSystemUser;
+import org.openecomp.portalapp.portal.controller.BasicAuthenticationController;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.UserRolesService;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API)
+@Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class RolesApprovalSystemController implements BasicAuthenticationController {
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RolesApprovalSystemController.class);
+
+	@Autowired
+	private UserRolesService userRolesService;
+
+	/**
+	 * Creates an application user with the specified roles.
+	 * 
+	 * @param request
+	 * @param extSysUser
+	 * @return PortalRestResponse with appropriate status value and message
+	 */
+	@ApiOperation(value = "Creates an application user with the specified roles.", response = PortalRestResponse.class)
+	@RequestMapping(value = { "/userProfile" }, method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> postUserProfile(HttpServletRequest request,
+			@RequestBody ExternalSystemUser extSysUser) {
+		try {
+			validateExtSystemUser(extSysUser, true);
+			String response = userRolesService.setAppWithUserRoleStateForUser(extSysUser);
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Saved Successfully", response);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "postUserProfile failed", e);
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}
+	}
+
+	/**
+	 * Updates an application user to have only the specified roles.
+	 * 
+	 * @param request
+	 * @param extSysUser
+	 * @return PortalRestResponse with appropriate status value and message
+	 */
+	@ApiOperation(value = "Updates an application user to have only the specified roles.", response = PortalRestResponse.class)
+	@RequestMapping(value = { "/userProfile" }, method = RequestMethod.PUT, produces = "application/json")
+	public PortalRestResponse<String> putUserProfile(HttpServletRequest request,
+			@RequestBody ExternalSystemUser extSysUser) {
+		try {
+			validateExtSystemUser(extSysUser, true);
+			String response = userRolesService.setAppWithUserRoleStateForUser(extSysUser);
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Updated Successfully", response);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putUserProfile failed", e);
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}
+	}
+
+	/**
+	 * Deletes an application user by removing all assigned roles.
+	 * 
+	 * @param request
+	 * @param extSysUser
+	 *            This object must have zero roles.
+	 * @return PortalRestResponse with appropriate status value and message
+	 */
+	@ApiOperation(value = "Processes a request to delete one or more application roles for one	specified user who has roles.", response = PortalRestResponse.class)
+	@RequestMapping(value = { "/userProfile" }, method = RequestMethod.DELETE, produces = "application/json")
+	public PortalRestResponse<String> deleteUserProfile(HttpServletRequest request,
+			@RequestBody ExternalSystemUser extSysUser) {
+		try {
+			validateExtSystemUser(extSysUser, false);
+			// Ignore any roles that might be mistakenly present in the request
+			extSysUser.setRoles(new ArrayList<ExternalSystemRoleApproval>());
+			String result = userRolesService.setAppWithUserRoleStateForUser(extSysUser);
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Deleted Successfully", result);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteUserProfile failed", e);
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}
+	}
+
+	/**
+	 * Checks for presence of required fields.
+	 * 
+	 * @param extSysUser
+	 * @param rolesRequired
+	 *            If true, checks whether roles are present
+	 * @throws Exception
+	 *             If any field is missing.
+	 */
+	private void validateExtSystemUser(ExternalSystemUser extSysUser, boolean rolesRequired) throws Exception {
+		if (extSysUser.getLoginId() == null)
+			throw new Exception("Request has no login ID");
+		if (extSysUser.getApplicationName() == null)
+			throw new Exception("Request has no application name");
+		if (extSysUser.getMyloginrequestId() == null)
+			throw new Exception("Request has no request ID");
+		if (rolesRequired && (extSysUser.getRoles() == null || extSysUser.getRoles().size() == 0))
+			throw new Exception("Request has no roles");
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/model/ExternalSystemRoleApproval.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/model/ExternalSystemRoleApproval.java
new file mode 100644
index 00000000..f958d2b5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/model/ExternalSystemRoleApproval.java
@@ -0,0 +1,41 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.externalsystemapproval.model;
+
+import java.io.Serializable;
+
+
+public class ExternalSystemRoleApproval implements Serializable{
+	
+
+	private static final long serialVersionUID = 6048830318039958615L;
+	
+	private String roleName ;
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/model/ExternalSystemUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/model/ExternalSystemUser.java
new file mode 100644
index 00000000..f3ccd14a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/externalsystemapproval/model/ExternalSystemUser.java
@@ -0,0 +1,74 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.externalsystemapproval.model;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExternalSystemUser {
+
+	private String loginId;
+	
+	private String applicationName;
+	
+	private String myloginrequestId;
+	
+	private List<ExternalSystemRoleApproval> roles;
+
+	public ExternalSystemUser() {
+		roles = new ArrayList<ExternalSystemRoleApproval>();
+	}
+
+	public String getApplicationName() {
+		return applicationName;
+	}
+
+	public void setApplicationName(String applicationName) {
+		this.applicationName = applicationName;
+	}
+
+	public String getLoginId() {
+		return loginId;
+	}
+
+	public void setLoginId(String loginId) {
+		this.loginId = loginId;
+	}
+
+	public List<ExternalSystemRoleApproval> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<ExternalSystemRoleApproval> roles) {
+		this.roles = roles;
+	}
+
+	public String getMyloginrequestId() {
+		return myloginrequestId;
+	}
+
+	public void setMyloginrequestId(String myloginrequestId) {
+		this.myloginrequestId = myloginrequestId;
+	}
+	
+	
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java
new file mode 100644
index 00000000..e932995f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/lm/FusionLicenseManagerImpl.java
@@ -0,0 +1,88 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.lm;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.openecomp.portalsdk.core.lm.FusionLicenseManager;
+import org.springframework.stereotype.Component;
+
+/*
+ *  Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface.
+ */
+
+@Component
+public class FusionLicenseManagerImpl implements FusionLicenseManager {
+
+	@Override
+	public void initKeyStoreParam() {
+		
+	}
+	
+	@Override
+	public void initCipherParam() {
+		
+	}
+
+	@Override	
+	public void initLicenseParam() {
+		
+	}
+
+	@Override
+	public void doInitWork() {
+		
+	}
+
+	@Override
+	public int installLicense() {
+		return 0;
+	}
+
+	@Override
+	public synchronized int verifyLicense(ServletContext context) {
+		return 0;
+	}
+
+	@Override
+	public void generateLicense(Map<String, String> clientInfoMap, List<String> ipAddressList) throws Exception {
+		
+	}
+	
+	@Override
+	public String nvl(String s) {
+		return null;
+	}
+
+	@Override
+	public Date getExpiredDate() {
+		return null;
+	}
+
+	@Override	
+	public void setExpiredDate(Date expiredDate) {
+		
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java
new file mode 100644
index 00000000..91fe7870
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/lm/LicenseableClassImpl.java
@@ -0,0 +1,62 @@
+/*-
+ * ================================================================================
+ * eCOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.lm;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import org.openecomp.portalsdk.core.lm.LicenseableClass;
+
+/*
+ *  Please note that this class is not being used; its a dummy stub to have a qualifying bean for the interface.
+ */
+
+public class LicenseableClassImpl implements LicenseableClass {
+		  
+	public String getApplicationName() {
+		return "";
+	}
+
+	public InputStream getPublicKeystoreAsInputStream() throws FileNotFoundException {
+	  return null;
+	}
+
+	public String getAlias() {
+		return "";
+	}
+
+	public String getKeyPasswd() {
+		return "";
+	}
+
+	public String getPublicKeystorePassword() {
+		return "";
+	}
+
+	public String getCipherParamPassword() {
+		return "";
+	}
+
+	@SuppressWarnings("rawtypes")
+	public Class getClassToLicense() {
+		return this.getClass();
+	}
+}
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/model/Result.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/model/Result.java
new file mode 100644
index 00000000..21c9c450
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/model/Result.java
@@ -0,0 +1,37 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.model;
+
+public class Result {
+	private String result;
+	
+	public Result(String result) {
+		this.result = result;
+	}
+
+	public String getResult() {
+		return result;
+	}
+
+	public void setResult(String result) {
+		this.result = result;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppCatalogController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppCatalogController.java
new file mode 100644
index 00000000..a799f496
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppCatalogController.java
@@ -0,0 +1,124 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.EPAppService;
+import org.openecomp.portalapp.portal.service.PersUserAppService;
+import org.openecomp.portalapp.portal.transport.AppCatalogPersonalization;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.portal.ecomp.model.AppCatalogItem;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class AppCatalogController extends EPRestrictedBaseController {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppCatalogController.class);
+
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	EPAppService appService;
+	@Autowired
+	PersUserAppService persUserAppService;
+
+	/**
+	 * RESTful service method to fetch all enabled applications, with details
+	 * about which are accessible to the current user, selected by the current
+	 * user.
+	 * 
+	 * @return List of items suitable for display
+	 */
+	@RequestMapping(value = { "/portalApi/appCatalog" }, method = RequestMethod.GET, produces = "application/json")
+	public List<AppCatalogItem> getAppCatalog(HttpServletRequest request, HttpServletResponse response)
+			throws IOException {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<AppCatalogItem> appCatalog = null;
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getAppCatalog");
+			} else {
+				if (adminRolesService.isSuperAdmin(user))
+					appCatalog = appService.getAdminAppCatalog(user);
+				else
+					appCatalog = appService.getUserAppCatalog(user);
+				EcompPortalUtils.logAndSerializeObject(logger,"/portalApi/getAppCatalog", "GET result =", appCatalog);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Failed in getAppCatalog", e);
+			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
+		}
+		return appCatalog;
+	}
+
+	/**
+	 * RESTful service to accept a user's action made on the application
+	 * catalog.
+	 * 
+	 * @param request
+	 * @param selectRequest
+	 *            JSON with data including application ID
+	 * @param response
+	 * @return FieldsValidator
+	 * @throws IOException
+	 */
+	@RequestMapping(value = { "/portalApi/appCatalog" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator putAppCatalogSelection(HttpServletRequest request,
+			@RequestBody AppCatalogPersonalization persRequest, HttpServletResponse response) throws IOException {
+		FieldsValidator result = new FieldsValidator();
+		EPApp app = appService.getApp(persRequest.getAppId());
+		EPUser user = EPUserUtils.getUserSession(request);
+		try {
+			if (app == null || user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "putAppCatalogSelection");
+			} else {
+				persUserAppService.setPersUserAppValue(user, app, persRequest.getSelect(), persRequest.getPending());
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Failed in putAppCatalogSelection", e);
+			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
+		}
+		result.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+		return result;
+	}
+
+}
+\ No newline at end of file
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppContactUsController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppContactUsController.java
new file mode 100644
index 00000000..9b476e05
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppContactUsController.java
@@ -0,0 +1,224 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.json.JSONObject;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.ecomp.model.AppCategoryFunctionsItem;
+import org.openecomp.portalapp.portal.ecomp.model.AppContactUsItem;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AppContactUsService;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/portalApi/contactus")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class AppContactUsController extends EPRestrictedBaseController {
+
+	static final String FAILURE = "failure";
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppContactUsController.class);
+
+	@Autowired
+	private AppContactUsService contactUsService;
+
+	/**
+	 * Answers a JSON object with three items from the system.properties file:
+	 * user self-help ticket URL, email for feedback, and Portal info link.
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/feedback", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<String> getPortalDetails(HttpServletRequest request) {
+		PortalRestResponse<String> portalRestResponse = null;
+		try {
+			final String ticketUrl = SystemProperties.getProperty(EPCommonSystemProperties.USH_TICKET_URL);
+			final String portalInfoUrl = SystemProperties.getProperty(EPCommonSystemProperties.PORTAL_INFO_URL);
+			final String feedbackEmail = SystemProperties.getProperty(EPCommonSystemProperties.FEEDBACK_EMAIL_ADDRESS);
+			HashMap<String, String> map = new HashMap<String, String>();
+			map.put(EPCommonSystemProperties.USH_TICKET_URL, ticketUrl);
+			map.put(EPCommonSystemProperties.PORTAL_INFO_URL, portalInfoUrl);
+			map.put(EPCommonSystemProperties.FEEDBACK_EMAIL_ADDRESS, feedbackEmail);
+			JSONObject j = new JSONObject(map);
+			String contactUsPortalResponse = j.toString();
+			portalRestResponse = new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+					contactUsPortalResponse);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, FAILURE, e.getMessage());
+		}
+		return portalRestResponse;
+	}
+
+	/**
+	 * Answers the contents of the contact-us table, extended with the
+	 * application name.
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/list", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<AppContactUsItem>> getAppContactUsList(HttpServletRequest request) {
+		PortalRestResponse<List<AppContactUsItem>> portalRestResponse = null;
+		try {
+			List<AppContactUsItem> contents = contactUsService.getAppContactUs();
+			portalRestResponse = new PortalRestResponse<List<AppContactUsItem>>(PortalRestStatusEnum.OK, "success",
+					contents);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppContactUsList failed", e);
+			portalRestResponse = new PortalRestResponse<List<AppContactUsItem>>(PortalRestStatusEnum.ERROR,
+					e.getMessage(), null);
+		}
+		return portalRestResponse;
+	}
+
+	/**
+	 * Answers a list of objects, one per application, extended with available
+	 * data on how to contact that app's organization (possibly none).
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/allapps", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<AppContactUsItem>> getAppsAndContacts(HttpServletRequest request) {
+		PortalRestResponse<List<AppContactUsItem>> portalRestResponse = null;
+		try {
+			List<AppContactUsItem> contents = contactUsService.getAppsAndContacts();
+			portalRestResponse = new PortalRestResponse<List<AppContactUsItem>>(PortalRestStatusEnum.OK, "success",
+					contents);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAllAppsAndContacts failed", e);
+			portalRestResponse = new PortalRestResponse<List<AppContactUsItem>>(PortalRestStatusEnum.ERROR,
+					e.getMessage(), null);
+		}
+		return portalRestResponse;
+	}
+
+	/**
+	 * Sorts by category name.
+	 */
+	private Comparator<AppCategoryFunctionsItem> appCategoryFunctionsItemComparator = new Comparator<AppCategoryFunctionsItem>() {
+		@Override
+		public int compare(AppCategoryFunctionsItem o1, AppCategoryFunctionsItem o2) {
+			return o1.getCategory().compareTo(o2.getCategory());
+		}
+	};
+	
+	/**
+	 * Answers a list of objects with category-application-function details. Not
+	 * all applications participate in the functional menu.
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value = "/functions", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<AppCategoryFunctionsItem>> getAppCategoryFunctions(HttpServletRequest request) {
+		PortalRestResponse<List<AppCategoryFunctionsItem>> portalRestResponse = null;
+		try {
+			List<AppCategoryFunctionsItem> contents = contactUsService.getAppCategoryFunctions();
+			// logger.debug(EELFLoggerDelegate.debugLogger,
+			// "getAppCategoryFunctions: result list size is " +
+			// contents.size());
+			Collections.sort(contents, appCategoryFunctionsItemComparator);
+			portalRestResponse = new PortalRestResponse<List<AppCategoryFunctionsItem>>(PortalRestStatusEnum.OK,
+					"success", contents);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppCategoryFunctions failed", e);
+			// TODO build JSON error
+			portalRestResponse = new PortalRestResponse<List<AppCategoryFunctionsItem>>(PortalRestStatusEnum.ERROR,
+					e.getMessage(), null);
+		}
+		return portalRestResponse;
+	}
+
+	/**
+	 * Accepts a new application's contact us details.
+	 * 
+	 * @param contactUs
+	 * @return
+	 */
+	@RequestMapping(value = "/save", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> save(@RequestBody AppContactUsItem contactUs) {
+
+		if (contactUs == null || contactUs.getAppName() == null)
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, FAILURE,
+					"AppName cannot be null or empty");
+
+		String saveAppContactUs = FAILURE;
+		try {
+			saveAppContactUs = contactUsService.saveAppContactUs(contactUs);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, saveAppContactUs, e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, saveAppContactUs, "");
+	}
+
+	@RequestMapping(value = "/saveAll", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> save(@RequestBody List<AppContactUsItem> contactUsList) {
+
+		String saveAppContactUs = FAILURE;
+		try {
+			saveAppContactUs = contactUsService.saveAppContactUs(contactUsList);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, saveAppContactUs, e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, saveAppContactUs, "");
+	}
+
+	/**
+	 * Deletes the specified application's contact-us details entry from the
+	 * table.
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/delete/{appid}", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> delete(@PathVariable("appid") Long id) {
+
+		String saveAppContactUs = FAILURE;
+		try {
+			saveAppContactUs = contactUsService.deleteContactUs(id);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, saveAppContactUs, e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, saveAppContactUs, "");
+	}
+
+}
+\ No newline at end of file
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsController.java
new file mode 100644
index 00000000..7a05d676
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsController.java
@@ -0,0 +1,670 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.AdminUserApplications;
+import org.openecomp.portalapp.portal.domain.AppIdAndNameTransportModel;
+import org.openecomp.portalapp.portal.domain.AppsResponse;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompApp;
+import org.openecomp.portalapp.portal.domain.UserRoles;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.EPAppService;
+import org.openecomp.portalapp.portal.service.EPLeftMenuService;
+import org.openecomp.portalapp.portal.transport.EPAppsManualPreference;
+import org.openecomp.portalapp.portal.transport.EPAppsSortPreference;
+import org.openecomp.portalapp.portal.transport.EPDeleteAppsManualSortPref;
+import org.openecomp.portalapp.portal.transport.EPWidgetsSortPreference;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.LocalRole;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.web.support.AppUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class AppsController extends EPRestrictedBaseController {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppsController.class);
+
+	@Autowired
+	private AdminRolesService adminRolesService;
+
+	@Autowired
+	private EPAppService appService;
+
+	@Autowired
+	private EPLeftMenuService leftMenuService;
+
+	/**
+	 * RESTful service method to fetch all Applications available to current
+	 * user
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/userApps" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EcompApp> getUserApps(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EcompApp> ecompApps = null;
+
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getUserApps");
+			} else {
+				ecompApps = appService.transformAppsToEcompApps(appService.getUserApps(user));
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userApps", "GET result =", ecompApps);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserApps failed", e);
+		}
+
+		return ecompApps;
+	}
+
+	/**
+	 * RESTful service method to fetch all applications accessible to the
+	 * current user, with personalizations.
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/persUserApps" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EcompApp> getPersUserApps(HttpServletRequest request, HttpServletResponse response) throws IOException {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EcompApp> ecompApps = null;
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getPersUserApps");
+			} else {
+				List<EPApp> apps = null;
+				if (adminRolesService.isSuperAdmin(user))
+					apps = appService.getPersAdminApps(user);
+				else
+					apps = appService.getPersUserApps(user);
+				ecompApps = appService.transformAppsToEcompApps(apps);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userPersApps", "GET result =", ecompApps);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getPersUserApps failed", e);
+			response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.toString());
+		}
+		return ecompApps;
+	}
+
+	/**
+	 * RESTful service method to fetch applications for which the current user
+	 * is an Administrator
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/adminApps" }, method = RequestMethod.GET, produces = "application/json")
+	public List<AppIdAndNameTransportModel> getAdminApps(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<AppIdAndNameTransportModel> adminApps = null;
+
+		try {
+			if (!adminRolesService.isAccountAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getAdminApps");
+			} else {
+				adminApps = appService.getAdminApps(user);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/adminApps", "GET result =", adminApps);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAdminApps failed", e);
+		}
+
+		return adminApps;
+	}
+
+	/**
+	 * RESTful service method to fetch Applications for user who is super admin
+	 * and/or app admin.
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = {
+			"/portalApi/appsForSuperAdminAndAccountAdmin" }, method = RequestMethod.GET, produces = "application/json")
+	public List<AppIdAndNameTransportModel> getAppsForSuperAdminAndAccountAdmin(HttpServletRequest request,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<AppIdAndNameTransportModel> adminApps = null;
+
+		try {
+			if (!adminRolesService.isSuperAdmin(user) && !adminRolesService.isAccountAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getAdminApps");
+			} else {
+				adminApps = appService.getAppsForSuperAdminAndAccountAdmin(user);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/appsForSuperAdminAndAccountAdmin",
+						"GET result =", adminApps);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppsForSuperAdminAndAccountAdmin failed", e);
+		}
+
+		return adminApps;
+	}
+
+	/**
+	 * RESTful service method to fetch left menu items from the user's session.
+	 * 
+	 * @return JSON with left menu
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@RequestMapping(value = { "/portalApi/leftmenuItems" }, method = RequestMethod.GET, produces = "application/json")
+	public String getLeftMenuItems(HttpServletRequest request, HttpServletResponse response) {
+		String menuList = null;
+		Set menuSet = (Set) AppUtils.getSession(request)
+				.getAttribute(SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_ATTRIBUTE_NAME));
+
+		Set roleFunctionSet = (Set) AppUtils.getSession(request)
+				.getAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME));
+
+		EPUser user = EPUserUtils.getUserSession(request);
+
+		try {
+			menuList = leftMenuService.getLeftMenuItems(user, menuSet, roleFunctionSet);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/leftmenuItems", "GET result =", menuList);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getLeftMenuItems failed", e);
+		}
+		return menuList;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/userAppsOrderBySortPref" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EcompApp> getUserAppsOrderBySortPref(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EcompApp> ecompApps = null;
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getUserAppsOrderBySortPref");
+			} else {
+				String usrSortPref = request.getParameter("mparams");
+				if (usrSortPref.equals("")) {
+					usrSortPref = "N";
+				}
+				switch (usrSortPref) {
+				case "N":
+					ecompApps = appService.transformAppsToEcompApps(appService.getAppsOrderByName(user));
+					EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppsOrderBySortPref", "GET result =",
+							ecompApps);
+					break;
+				case "L":
+					ecompApps = appService.transformAppsToEcompApps(appService.getAppsOrderByLastUsed(user));
+					EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppsOrderBySortPref", "GET result =",
+							ecompApps);
+					break;
+				case "F":
+					ecompApps = appService.transformAppsToEcompApps(appService.getAppsOrderByMostUsed(user));
+					EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppsOrderBySortPref", "GET result =",
+							ecompApps);
+					break;
+				case "M":
+					ecompApps = appService.transformAppsToEcompApps(appService.getAppsOrderByManual(user));
+					EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppsOrderBySortPref", "GET result =",
+							ecompApps);
+					break;
+				default:
+					logger.error(EELFLoggerDelegate.errorLogger,
+							"getUserAppsOrderBySortPref failed: no match for " + usrSortPref);
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserAppsOrderBySortPref failed", e);
+		}
+		return ecompApps;
+	}
+
+	/*
+	 * This method sends the user apps manual sort preference Data to service
+	 * 
+	 * @request: HTTP servlet request
+	 * 
+	 * @response: HTTP servlet response
+	 */
+	@RequestMapping(value = {
+			"/portalApi/saveUserAppsSortingManual" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator putUserAppsSortingManual(HttpServletRequest request,
+			@RequestBody List<EPAppsManualPreference> epAppsManualPref, HttpServletResponse response)
+			throws IOException {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			fieldsValidator = appService.saveAppsSortManual(epAppsManualPref, user);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putUserAppsSortingManual failed", e);
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/saveUserAppsSortingManual", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/saveUserWidgetsSortManual" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator putUserWidgetsSortManual(HttpServletRequest request,
+			@RequestBody List<EPWidgetsSortPreference> saveManualWidgetSData, HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			fieldsValidator = appService.saveWidgetsSortManual(saveManualWidgetSData, user);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putUserWidgetsSortManual failed", e);
+		}
+		// return fieldsValidator;
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/putUserWidgetsSortManual", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/updateWidgetsSortPref" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator putUserWidgetsSortPref(HttpServletRequest request,
+			@RequestBody List<EPWidgetsSortPreference> delManualWidgetData, HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			fieldsValidator = appService.deleteUserWidgetSortPref(delManualWidgetData, user);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putUserWidgetsSortPref failed", e);
+
+		}
+		// return fieldsValidator;
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/putUserWidgetsSortPref", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	/*
+	 * This method is being called to delete the user app manual sort preference
+	 * record
+	 * 
+	 * @request: HTTP servlet request
+	 * 
+	 * @response: HTTP servlet response
+	 */
+	@RequestMapping(value = {
+			"/portalApi/UpdateUserAppsSortManual" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator deleteUserAppSortManual(HttpServletRequest request,
+			@RequestBody EPDeleteAppsManualSortPref delManualAppData, HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			fieldsValidator = appService.deleteUserAppSortManual(delManualAppData, user);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteUserAppSortManual failed", e);
+
+		}
+		// return fieldsValidator;
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/deleteUserAppSortManual", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/saveUserAppsSortingPreference" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator putUserAppsSortingPreference(HttpServletRequest request,
+			@RequestBody EPAppsSortPreference userAppsValue, HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			fieldsValidator = appService.saveAppsSortPreference(userAppsValue, user);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putUserAppsSortingPreference failed", e);
+
+		}
+
+		// return fieldsValidator;
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/putUserAppsSortingPreference", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/userAppsSortTypePreference" }, method = RequestMethod.GET, produces = "application/String")
+	public String getUserAppsSortTypePreference(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		String userSortPreference = null;
+
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "userAppsSortTypePreference");
+			} else {
+				userSortPreference = appService.getUserAppsSortTypePreference(user);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppsSortTypePreference", "GET result =",
+						userSortPreference);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserAppsSortTypePreference failed", e);
+		}
+
+		return userSortPreference;
+	}
+
+	/**
+	 * RESTful service method to fetch Application Administrators to Super
+	 * Administrator user. Attention: Users which have Super Administrator roles
+	 * only are not included!
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/accountAdmins" }, method = RequestMethod.GET, produces = "application/json")
+	public List<AdminUserApplications> getAppsAdministrators(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<AdminUserApplications> admins = null;
+		try {
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getAppsAdministrators");
+			} else {
+				admins = appService.getAppsAdmins();
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/accountAdmins", "GET result =", admins);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppsAdministrators failed", e);
+		}
+
+		return admins;
+	}
+
+	@RequestMapping(value = { "/portalApi/availableApps" }, method = RequestMethod.GET, produces = "application/json")
+	public List<AppsResponse> getApps(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<AppsResponse> apps = null;
+		try {
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getApps");
+			} else {
+				apps = appService.getAllApps(false);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/availableApps", "GET result =", apps);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getApps failed", e);
+		}
+
+		return apps;
+	}
+
+	/**
+	 * Gets all apps, both active and inactive; i.e., all on-boarded apps,
+	 * regardless of enabled status.
+	 * 
+	 * @param request
+	 * @param response
+	 * @return List of applications
+	 */
+	// This API returns
+	@RequestMapping(value = {
+			"/portalApi/allAvailableApps" }, method = RequestMethod.GET, produces = "application/json")
+	public List<AppsResponse> getAllApps(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<AppsResponse> apps = null;
+		try {
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getApps");
+			} else {
+				apps = appService.getAllApps(true);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/availableApps", "GET result =", apps);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAllApps failed", e);
+		}
+
+		return apps;
+	}
+
+	/**
+	 * 
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/appsFullList" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EcompApp> getAppsFullList(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EcompApp> ecompApps = null;
+		if (user == null) {
+			EcompPortalUtils.setBadPermissions(user, response, "getAppsFullList");
+		} else {
+			ecompApps = appService.getEcompAppAppsFullList();
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/appsFullList", "GET result =", ecompApps);
+		}
+		return ecompApps;
+	}
+
+	/**
+	 * 
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/userProfile" }, method = RequestMethod.GET, produces = "application/json")
+	public UserRoles getUserProfile(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		UserRoles userAndRoles = null;
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getUserProfile");
+			} else {
+				userAndRoles = appService.getUserProfileNormalized(user);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserProfile failed", e);
+		}
+
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userProfile", "getUserProfile result =",
+				userAndRoles);
+		return userAndRoles;
+	}
+
+	/**
+	 * 
+	 * @param request
+	 * @param appId
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/appRoles/{appId}" }, method = {
+			RequestMethod.GET }, produces = "application/json")
+	public List<LocalRole> getAppRoles(HttpServletRequest request, @PathVariable("appId") Long appId) {
+		List<LocalRole> roleList = null;
+		try {
+			roleList = appService.getAppRoles(appId);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/appRoles/" + appId, "GET result =", roleList);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppRoles failed", e);
+		}
+
+		return roleList;
+	}
+
+	/**
+	 * 
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/onboardingApps" }, method = RequestMethod.GET, produces = "application/json")
+	public List<OnboardingApp> getOnboardingApps(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<OnboardingApp> onboardingApps = null;
+		try {
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getOnboardingApps");
+			} else {
+				onboardingApps = appService.getOnboardingApps();
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/onboardingApps", "GET result =",
+						"onboardingApps of size " + onboardingApps.size());
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getOnboardingApps failed", e);
+		}
+
+		return onboardingApps;
+	}
+
+	/**
+	 * 
+	 * @param request
+	 * @param modifiedOnboardingApp
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/onboardingApps" }, method = RequestMethod.PUT, produces = "application/json")
+	public FieldsValidator putOnboardingApp(HttpServletRequest request,
+			@RequestBody OnboardingApp modifiedOnboardingApp, HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "putOnboardingApp");
+			} else {
+				modifiedOnboardingApp.normalize();
+				fieldsValidator = appService.modifyOnboardingApp(modifiedOnboardingApp, user);
+				response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putOnboardingApps failed", e);
+		}
+
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/onboardingApps", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	/**
+	 * 
+	 * @param request
+	 * @param newOnboardingApp
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/onboardingApps" }, method = RequestMethod.POST, produces = "application/json")
+	public FieldsValidator postOnboardingApp(HttpServletRequest request, @RequestBody OnboardingApp newOnboardingApp,
+			HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "postOnboardingApps");
+			} else {
+				newOnboardingApp.normalize();
+				fieldsValidator = appService.addOnboardingApp(newOnboardingApp, user);
+				response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "postOnboardingApp failed", e);
+		}
+
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/onboardingApps", "POST result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	/**
+	 * REST endpoint to process a request to delete an on-boarded application.
+	 * 
+	 * @param request
+	 * @param appId
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = { "/portalApi/onboardingApps/{appId}" }, method = {
+			RequestMethod.DELETE }, produces = "application/json")
+	public FieldsValidator deleteOnboardingApp(HttpServletRequest request, @PathVariable("appId") Long appId,
+			HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "deleteOnboardingApps");
+			} else {
+				fieldsValidator = appService.deleteOnboardingApp(user, appId);
+				response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteOnboardingApp failed", e);
+			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/onboardingApps" + appId, "DELETE result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+
+	/**
+	 * Gets the application thumbnail image; sets status 404 if none exists.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @param appId
+	 *            Application ID
+	 * @return Bytes with the app thumbnail image; null if not available.
+	 */
+	@RequestMapping(value = { "/portalApi/appThumbnail/{appId}" }, method = { RequestMethod.GET })
+	public HttpEntity<byte[]> getAppThumbnail(HttpServletRequest request, @PathVariable("appId") Long appId,
+			HttpServletResponse response) {
+		EPApp app = appService.getApp(appId);
+		if (app == null || app.getImageUrl() == null || app.getThumbnail() == null || app.getThumbnail().length == 0) {
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"getAppThumbnail: no app and/or no thumbnail for app " + appId);
+			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		String url = app.getImageUrl();
+		int indexOfDot = url.lastIndexOf('.');
+		String urlSuffix = indexOfDot > 0 ? url.substring(indexOfDot + 1).toLowerCase() : "UNK";
+		// Default to JPG if no usable suffix.
+		MediaType mediaType = MediaType.IMAGE_JPEG;
+		if ("png".equals(urlSuffix))
+			mediaType = MediaType.IMAGE_PNG;
+		else if ("gif".equals(urlSuffix))
+			mediaType = MediaType.IMAGE_GIF;
+		HttpHeaders header = new HttpHeaders();
+		header.setContentType(mediaType);
+		header.setContentLength(app.getThumbnail().length);
+		return new HttpEntity<byte[]>(app.getThumbnail(), header);
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java
new file mode 100644
index 00000000..fa49d5b2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AppsControllerExternalRequest.java
@@ -0,0 +1,374 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.EPAppService;
+import org.openecomp.portalapp.portal.service.PortalAdminService;
+import org.openecomp.portalapp.portal.service.UserService;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * Processes requests from external systems (i.e., not the front-end web UI).
+ * First use case is ECOMP Controller, which has to create an admin and onboard
+ * itself upon launch of a fresh Portal.
+ * 
+ * Listens on the "auxapi" path prefix. Provides alternate implementations of
+ * methods in several existing controllers because an EPUser object is not
+ * available in the session for these requests.
+ * 
+ * Checks credentials sent via HTTP Basic Authentication. The Portal's basic
+ * HTTP authentication system requires that the user names and endpoints are
+ * registered together.
+ */
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API)
+@Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class AppsControllerExternalRequest implements BasicAuthenticationController {
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppsControllerExternalRequest.class);
+
+	private static final String ONBOARD_APP = "/onboardApp";
+
+	// Where is this used?
+	public boolean isAuxRESTfulCall() {
+		return true;
+	}
+
+	/**
+	 * For testing whether a user is a superadmin.
+	 */
+	@Autowired
+	private AdminRolesService adminRolesService;
+
+	/**
+	 * For onboarding or updating an app
+	 */
+	@Autowired
+	private EPAppService appService;
+
+	/**
+	 * For promoting a user to Portal admin
+	 */
+	@Autowired
+	private PortalAdminService portalAdminService;
+
+	/**
+	 * For creating a new user
+	 */
+	@Autowired
+	private UserService userService;
+
+	/**
+	 * Creates a new user as a Portal administrator.
+	 * 
+	 * <PRE>
+	 { 
+		"loginId" : "abc123",
+		"loginPwd": "",
+		"email":"ecomp@controller" 
+	 }
+	 * </PRE>
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @param epUser
+	 *            User details; the email and orgUserId fields are mandatory
+	 * @param response
+	 *            HttpServletResponse
+	 * @return PortalRestResponse with success or failure
+	 */
+	@ApiOperation(value = "Creates a new user as a Portal administrator.", response = PortalRestResponse.class)
+	@RequestMapping(value = "/portalAdmin", method = RequestMethod.POST, produces = "application/json")
+	@ResponseBody
+	public PortalRestResponse<String> postPortalAdmin(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody EPUser epUser) {
+		EcompPortalUtils.logAndSerializeObject(logger, "postPortalAdmin", "request", epUser);
+		PortalRestResponse<String> portalResponse = new PortalRestResponse<>();
+
+		// Check mandatory fields.
+		if (epUser.getEmail() == null || epUser.getEmail().trim().length() == 0 //
+				|| epUser.getLoginId() == null || epUser.getLoginId().trim().length() == 0 //
+				|| epUser.getLoginPwd() == null) {
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage("Missing required field: email, loginId, or loginPwd");
+			return portalResponse;
+		}
+
+		try {
+			// Check for existing user; create if not found.
+			List<EPUser> userList = userService.getUserByUserId(epUser.getOrgUserId());
+			if (userList == null || userList.size() == 0) {
+				// Create user with first, last names etc.; do check for
+				// duplicates.
+				String userCreateResult = userService.saveNewUser(epUser, "Yes");
+				if (!"success".equals(userCreateResult)) {
+					portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+					portalResponse.setMessage(userCreateResult);
+					return portalResponse;
+				}
+			}
+
+			// Check for Portal admin status; promote if not.
+			if (adminRolesService.isSuperAdmin(epUser)) {
+				portalResponse.setStatus(PortalRestStatusEnum.OK);
+			} else {
+				FieldsValidator fv = portalAdminService.createPortalAdmin(epUser.getOrgUserId());
+				if (fv.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+					portalResponse.setStatus(PortalRestStatusEnum.OK);
+				} else {
+					portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+					portalResponse.setMessage(fv.toString());
+				}
+			}
+		} catch (Exception ex) {
+			// Uncaught exceptions yield 404 and an empty error page
+			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage(ex.toString());
+		}
+
+		EcompPortalUtils.logAndSerializeObject(logger, "postPortalAdmin", "response", portalResponse);
+		return portalResponse;
+	}
+
+	/**
+	 * Gets the specified application that is on-boarded in Portal.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @param appId
+	 *            Application ID to get
+	 * @param response
+	 *            httpServletResponse
+	 * @return OnboardingApp objects
+	 */
+	@ApiOperation(value = "Gets the specified application that is on-boarded in Portal.", response = OnboardingApp.class)
+	@RequestMapping(value = { ONBOARD_APP + "/{appId}" }, method = RequestMethod.GET, produces = "application/json")
+	@ResponseBody
+	public OnboardingApp getOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("appId") Long appId) {
+		EPApp epApp = appService.getApp(appId);
+		OnboardingApp obApp = new OnboardingApp();
+		appService.createOnboardingFromApp(epApp, obApp);
+		EcompPortalUtils.logAndSerializeObject(logger, "getOnboardAppExternal", "response", obApp);
+		return obApp;
+	}
+
+	/**
+	 * Adds a new application to Portal. The My Logins App Owner in the request
+	 * must be the organization user ID of a person who is a Portal
+	 * administrator.
+	 * 
+	 * <pre>
+	 * { 
+		"myLoginsAppOwner" : "abc123",
+		"name": "dashboard",
+		"url": "http://k8s/something",
+		"restUrl" : "http://aic.att.com",
+		"restrictedApp" : true,
+		"isOpen" : true,
+		"isEnabled": false
+		}
+	 * </pre>
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @param response
+	 *            httpServletResponse
+	 * @param newOnboardApp
+	 *            Message with details about the app to add
+	 * @return PortalRestResponse
+	 */
+	@ApiOperation(value = "Adds a new application to Portal.", response = PortalRestResponse.class)
+	@RequestMapping(value = { ONBOARD_APP }, method = RequestMethod.POST, produces = "application/json")
+	@ResponseBody
+	public PortalRestResponse<String> postOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody OnboardingApp newOnboardApp) {
+		EcompPortalUtils.logAndSerializeObject(logger, "postOnboardAppExternal", "request", newOnboardApp);
+		PortalRestResponse<String> portalResponse = new PortalRestResponse<>();
+
+		// Validate fields
+		if (newOnboardApp.id != null) {
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage("Unexpected field: id");
+			return portalResponse;
+		}
+		if (newOnboardApp.name == null || newOnboardApp.name.trim().length() == 0 //
+				|| newOnboardApp.url == null || newOnboardApp.url.trim().length() == 0 //
+				|| newOnboardApp.restUrl == null || newOnboardApp.restUrl.trim().length() == 0
+				|| newOnboardApp.myLoginsAppOwner == null || newOnboardApp.myLoginsAppOwner.trim().length() == 0
+				|| newOnboardApp.restrictedApp == null //
+				|| newOnboardApp.isOpen == null //
+				|| newOnboardApp.isEnabled == null) {
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage(
+					"Missing required field: name, url, restUrl, restrictedApp, isOpen, isEnabled, myLoginsAppOwner");
+			return portalResponse;
+		}
+
+		try {
+			List<EPUser> userList = userService.getUserByUserId(newOnboardApp.myLoginsAppOwner);
+			if (userList == null || userList.size() != 1) {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage("Failed to find user: " + newOnboardApp.myLoginsAppOwner);
+				return portalResponse;
+			}
+
+			EPUser epUser = userList.get(0);
+			// Check for Portal admin status
+			if (! adminRolesService.isSuperAdmin(epUser)) {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage("User lacks Portal admin role: " + epUser.getLoginId());
+				return portalResponse;				
+			}
+				
+			newOnboardApp.normalize();
+			FieldsValidator fv = appService.addOnboardingApp(newOnboardApp, epUser);
+			if (fv.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+				portalResponse.setStatus(PortalRestStatusEnum.OK);
+			} else {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage(fv.toString());
+			}
+		} catch (Exception ex) {
+			// Uncaught exceptions yield 404 and an empty error page
+			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage(ex.toString());
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "postOnboardAppExternal", "response", portalResponse);
+		return portalResponse;
+	}
+
+	/**
+	 * Updates information about an on-boarded application in Portal. The My
+	 * Logins App Owner in the request must be the organization user ID of a
+	 * person who is a Portal administrator.
+	 * <pre>
+	   { 
+		"id" : 123,
+		"myLoginsAppOwner" : "abc123",
+		"name": "dashboard",
+		"url": "http://k8s/something",
+		"restUrl" : "http://aic.att.com",
+		"restrictedApp" : true,
+		"isOpen" : true,
+		"isEnabled": false
+		}
+		</pre>
+	 * @param request
+	 *            HttpServletRequest
+	 * @param response
+	 *            httpServletResponse
+	 * @param appId
+	 *            application id
+	 * @param oldOnboardApp
+	 *            Message with details about the app to add
+	 * @return PortalRestResponse
+	 */
+	@ApiOperation(value = "Updates information about an on-boarded application in Portal.", response = PortalRestResponse.class)
+	@RequestMapping(value = { ONBOARD_APP + "/{appId}" }, method = RequestMethod.PUT, produces = "application/json")
+	@ResponseBody
+	public PortalRestResponse<String> putOnboardAppExternal(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("appId") Long appId, @RequestBody OnboardingApp oldOnboardApp) {
+		EcompPortalUtils.logAndSerializeObject(logger, "putOnboardAppExternal", "request", oldOnboardApp);
+		PortalRestResponse<String> portalResponse = new PortalRestResponse<>();
+		// Validate fields.
+		if (oldOnboardApp.id == null || !appId.equals(oldOnboardApp.id)) {
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage("Unexpected value for field: id");
+			return portalResponse;
+		}
+		if (oldOnboardApp.name == null || oldOnboardApp.name.trim().length() == 0 //
+				|| oldOnboardApp.url == null || oldOnboardApp.url.trim().length() == 0 //
+				|| oldOnboardApp.restUrl == null || oldOnboardApp.restUrl.trim().length() == 0
+				|| oldOnboardApp.myLoginsAppOwner == null || oldOnboardApp.myLoginsAppOwner.trim().length() == 0
+				|| oldOnboardApp.restrictedApp == null //
+				|| oldOnboardApp.isOpen == null //
+				|| oldOnboardApp.isEnabled == null) {
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage(
+					"Missing required field: name, url, restUrl, restrictedApp, isOpen, isEnabled, myLoginsAppOwner");
+			return portalResponse;
+		}
+
+		try {
+			List<EPUser> userList = userService.getUserByUserId(oldOnboardApp.myLoginsAppOwner);
+			if (userList == null || userList.size() != 1) {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage("Failed to find user: " + oldOnboardApp.myLoginsAppOwner);
+				return portalResponse;
+			}
+
+			EPUser epUser = userList.get(0);
+			// Check for Portal admin status
+			if (! adminRolesService.isSuperAdmin(epUser)) {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage("User lacks Portal admin role: " + epUser.getLoginId());
+				return portalResponse;				
+			}
+
+			oldOnboardApp.normalize();
+			FieldsValidator fv = appService.modifyOnboardingApp(oldOnboardApp, epUser);
+			if (fv.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+				portalResponse.setStatus(PortalRestStatusEnum.OK);
+			} else {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage(fv.toString());
+			}
+		} catch (Exception ex) {
+			// Uncaught exceptions yield 404 and an empty error page
+			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			portalResponse.setMessage(ex.toString());
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "putOnboardAppExternal", "response", portalResponse);
+		return portalResponse;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AuditLogController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AuditLogController.java
new file mode 100644
index 00000000..705c9008
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/AuditLogController.java
@@ -0,0 +1,106 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.domain.AuditLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.AuditService;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@RestController
+@RequestMapping("/portalApi/auditLog")
+public class AuditLogController extends EPRestrictedBaseController {
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DashboardController.class);
+
+	@Autowired
+	private AuditService auditService;
+
+	/**
+	 * Store audit log of the specified access type.
+	 * 
+	 * @param request
+	 * @param affectedAppId
+	 * @param type
+	 * @param comment
+	 */
+	@RequestMapping(value = "/store", method = RequestMethod.GET, produces = "application/json")
+	public void auditLog(HttpServletRequest request, @RequestParam String affectedAppId, @RequestParam String type,
+			@RequestParam String comment) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "auditLog: appId {}, type {], comment {}", 
+				affectedAppId, type, comment);
+		String cd_type = null;
+		try {					
+			EPUser user = EPUserUtils.getUserSession(request);
+			/* Check type of Activity CD */
+			if (type.equals("app")) {
+				cd_type = AuditLog.CD_ACTIVITY_APP_ACCESS;
+			} else if (type.equals("tab")) {
+				cd_type = AuditLog.CD_ACTIVITY_TAB_ACCESS;
+			} else if (type.equals("functional")) {
+				cd_type = AuditLog.CD_ACTIVITY_FUNCTIONAL_ACCESS;
+			} else if (type.equals("leftMenu")) {
+				cd_type = AuditLog.CD_ACTIVITY_LEFT_MENU_ACCESS;
+			} else {
+				logger.error(EELFLoggerDelegate.errorLogger, "Storing auditLog failed! Activity CD type is not correct.");
+			}
+			/* Store the audit log only if it contains valid Activity CD */
+			if (cd_type != null) {
+				AuditLog auditLog = new AuditLog();
+				auditLog.setActivityCode(cd_type);
+				/*
+				 * Check affectedAppId and comment and see if these two values are
+				 * valid
+				 */
+				if (comment != null && !comment.equals("") && !comment.equals("undefined"))
+					auditLog.setComments(comment);
+				if (affectedAppId != null && !affectedAppId.equals("") && !affectedAppId.equals("undefined"))
+					auditLog.setAffectedRecordId(affectedAppId);
+				long userId = EPUserUtils.getUserId(request);
+				auditLog.setUserId(userId);
+				auditService.logActivity(auditLog, null);
+
+				// Log file
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());		
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				logger.info(EELFLoggerDelegate.auditLogger, EPLogUtil.formatAuditLogMessage("AuditLogController.auditLog", 
+						cd_type, user.getOrgUserId(), affectedAppId, comment));	
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "auditLog failed", e);
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BEPropertyReaderController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BEPropertyReaderController.java
new file mode 100644
index 00000000..a7b3f1a1
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BEPropertyReaderController.java
@@ -0,0 +1,46 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.controller.FusionBaseController;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.BEProperty;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+
+@RestController
+@RequestMapping("/portalApi/properties")
+public class BEPropertyReaderController extends FusionBaseController{
+	@RequestMapping(value = "/readProperty", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<BEProperty> readProperty(HttpServletRequest request, @RequestParam String key) {
+		try {
+			return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", new BEProperty(key, SystemProperties.getProperty(key)));
+		} catch (Exception e) {
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}		
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BasicAuthAccountController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BasicAuthAccountController.java
new file mode 100644
index 00000000..f23054bd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BasicAuthAccountController.java
@@ -0,0 +1,141 @@
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+import org.openecomp.portalapp.portal.domain.EPEndpoint;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.BasicAuthAccountService;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@SuppressWarnings("unchecked")
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class BasicAuthAccountController extends EPRestrictedBaseController{
+	
+	@Autowired
+	private BasicAuthAccountService basicAuthAccountService;
+
+	@Autowired
+	private AdminRolesService adminRolesService;
+
+	/**
+	 * Saves Basic Authentication account for external systems 
+	 * @param BasicAuthCredentials
+	 * @return Id of the newly created account
+	*/
+	
+	@RequestMapping(value = { "/portalApi/basicAuthAccount" }, method = RequestMethod.POST)
+	public PortalRestResponse<String> createBasicAuthAccount(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody BasicAuthCredentials newBasicAuthAccount) throws Exception {
+		
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (!adminRolesService.isSuperAdmin(user)){
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Authorization Required", "Admin Only Operation! ");
+		}
+		
+		if(newBasicAuthAccount == null){
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"newBasicAuthAccount cannot be null or empty");
+		}
+		long accountId = basicAuthAccountService.saveBasicAuthAccount(newBasicAuthAccount);
+		
+		List<Long> endpointIdList = new ArrayList<>();
+		try {
+			for(EPEndpoint ep: newBasicAuthAccount.getEndpoints()){
+				endpointIdList.add(basicAuthAccountService.saveEndpoints(ep));
+			}
+			for(Long endpointId: endpointIdList){
+				basicAuthAccountService.saveEndpointAccount(accountId, endpointId);
+			}
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+	
+	/**
+	 * Returns list of all  BasicAuthCredentials in the system
+	 * @return List<BasicAuthCredentials>
+	 */
+	
+	@RequestMapping(value = { "/portalApi/basicAuthAccount" }, method = RequestMethod.GET)
+	public PortalRestResponse<List<BasicAuthCredentials>> getBasicAuthAccount(HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (!adminRolesService.isSuperAdmin(user)){
+			return new PortalRestResponse<List<BasicAuthCredentials>>(PortalRestStatusEnum.ERROR, "UnAuthorized! Admin Only Operation", new ArrayList<>());
+		}
+
+		return new PortalRestResponse<List<BasicAuthCredentials>>(PortalRestStatusEnum.OK, "Success", basicAuthAccountService.getAccountData());
+	}
+	
+	/**
+	 * Updates an existing BasicAuthCredentials account
+	 */
+	
+	@RequestMapping(value = { "/portalApi/basicAuthAccount/{accountId}" }, method = RequestMethod.PUT)
+	public PortalRestResponse<String> updateAccount(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("accountId") long accountId, @RequestBody BasicAuthCredentials newBasicAuthAccount) throws Exception {
+		
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (!adminRolesService.isSuperAdmin(user)){
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Authorization Required", "Admin Only Operation! ");
+		}
+
+		if (newBasicAuthAccount == null) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"BasicAuthCredentials cannot be null or empty");
+		}
+		try {
+			basicAuthAccountService.updateBasicAuthAccount(accountId, newBasicAuthAccount);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+	
+	/**
+	 * deletes an existing BasicAuthCredentials account
+	 */
+
+	@RequestMapping(value = { "/portalApi/basicAuthAccount/{accountId}" }, method = RequestMethod.DELETE)
+	public PortalRestResponse<String> deleteAccount(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("accountId") long accountId) throws Exception {
+		
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (!adminRolesService.isSuperAdmin(user)){
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Authorization Required", "Admin Only Operation! ");
+		}
+
+		
+		try {
+			basicAuthAccountService.deleteEndpointAccout(accountId);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BasicAuthenticationController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BasicAuthenticationController.java
new file mode 100644
index 00000000..d9bdf3dc
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/BasicAuthenticationController.java
@@ -0,0 +1,28 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+/**
+ * Marker interface to indicate that requests to this controller present HTTP
+ * Basic Authentication credentials.
+ */
+public interface BasicAuthenticationController {
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/CommonWidgetController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/CommonWidgetController.java
new file mode 100644
index 00000000..68e32a16
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/CommonWidgetController.java
@@ -0,0 +1,79 @@
+/*
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import org.openecomp.portalapp.portal.controller.DashboardController.WidgetCategory;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.service.DashboardSearchService;
+import org.openecomp.portalapp.portal.transport.CommonWidgetMeta;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class CommonWidgetController implements BasicAuthenticationController{
+	
+	
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CommonWidgetController.class);
+	@Autowired
+	private DashboardSearchService searchService;
+	
+	/**
+	 * Validates the resource type parameter.
+	 * 
+	 * @param resourceType
+	 * @return True if known in the enum WidgetCategory, else false.
+	 */
+	private boolean isValidResourceType(String resourceType) {
+		if (resourceType == null)
+			return false;
+		for (WidgetCategory wc : WidgetCategory.values())
+			if (wc.name().equals(resourceType))
+				return true;
+		return false;
+	}
+	
+	/**
+	 * Gets all widgets of the specified resource type.
+	 * 
+	 * @param request
+	 * @param resourceType
+	 *            Request parameter.
+	 * @return Rest response wrapped around a CommonWidgetMeta object.
+	 */
+	@RequestMapping(value = "/widgetData", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<CommonWidgetMeta> getWidgetData(HttpServletRequest request,
+			@RequestParam String resourceType) {
+		if (!isValidResourceType(resourceType)){
+			logger.debug(EELFLoggerDelegate.debugLogger, "Unexpected resource type {}", resourceType);
+			return new PortalRestResponse<CommonWidgetMeta>(PortalRestStatusEnum.ERROR,
+					"Unexpected resource type " + resourceType, null);
+		}
+		return new PortalRestResponse<CommonWidgetMeta>(PortalRestStatusEnum.OK, "success",
+				searchService.getWidgetData(resourceType));
+	}
+		
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ConsulClientController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ConsulClientController.java
new file mode 100644
index 00000000..8db94849
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ConsulClientController.java
@@ -0,0 +1,90 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.service.ConsulHealthService;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import com.orbitz.consul.ConsulException;
+import com.orbitz.consul.model.health.ServiceHealth;
+
+import io.searchbox.client.config.exception.NoServerConfiguredException;
+
+@RestController
+@RequestMapping("/portalApi/consul")
+public class ConsulClientController extends EPRestrictedBaseController {
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ConsulClientController.class);
+
+	@Autowired
+	private ConsulHealthService consulHealthService;
+	//Get location of a healthy node running our service
+	@RequestMapping(value = { "/service/{service}" }, method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<String> getServiceLocation(HttpServletRequest request, HttpServletResponse response, @PathVariable("service") String service) {
+
+		try{
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Success!", consulHealthService.getServiceLocation(service));
+		}
+		catch(NoServerConfiguredException e){
+			logger.error(logger.errorLogger, "No healthy service exception!");
+			return new PortalRestResponse<String>(PortalRestStatusEnum.WARN, "Warning!", "No healthy service exception!");
+		}
+		catch(ConsulException e){
+			logger.error(logger.errorLogger, "Couldn't connect ot consul - Is consul running?");
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Error!", "Couldn't connect ot consul - Is consul running?");
+		}
+	}
+
+	@RequestMapping(value = { "/service/healthy/{service}" }, method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<ServiceHealth>> getAllHealthyNodes(HttpServletRequest request, HttpServletResponse response, @PathVariable("service") String service) {
+		try{
+			return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!", consulHealthService.getAllHealthyNodes(service));
+		}
+		catch(ConsulException e){
+			logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");
+			return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR,"Error!", new ArrayList<>());
+		}
+	}
+	
+	@RequestMapping(value = { "/service/all/{service}" }, method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<ServiceHealth>> getAllNodes(HttpServletRequest request, HttpServletResponse response, @PathVariable("service") String service) {
+		try{
+			return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!", consulHealthService.getAllNodes(service));
+		}
+		catch(ConsulException e){
+			logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");
+			return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR,"Error!", new ArrayList<>());
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/DashboardController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/DashboardController.java
new file mode 100644
index 00000000..290a5ffc
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/DashboardController.java
@@ -0,0 +1,385 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompAuditLog;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.ecomp.model.SearchResultItem;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.DashboardSearchService;
+import org.openecomp.portalapp.portal.transport.CommonWidget;
+import org.openecomp.portalapp.portal.transport.CommonWidgetMeta;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.domain.AuditLog;
+import org.openecomp.portalsdk.core.domain.support.CollaborateList;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.AuditService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Controller supplies data to Angular services on the dashboard page.
+ */
+@Configuration
+@RestController
+@RequestMapping("/portalApi/dashboard")
+public class DashboardController extends EPRestrictedBaseController {
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DashboardController.class);
+
+	@Autowired
+	private DashboardSearchService searchService;
+	@Autowired
+	private AuditService auditService;
+	
+	public enum WidgetCategory {
+		EVENTS, NEWS, IMPORTANTRESOURCES;
+	}
+
+	/**
+	 * Validates the resource type parameter.
+	 * 
+	 * @param resourceType
+	 * @return True if known in the enum WidgetCategory, else false.
+	 */
+	private boolean isValidResourceType(String resourceType) {
+		if (resourceType == null)
+			return false;
+		for (WidgetCategory wc : WidgetCategory.values())
+			if (wc.name().equals(resourceType))
+				return true;
+		return false;
+	}
+
+	/**
+	 * Gets all widgets of the specified resource type. 
+	 * In iteration 41 (when widget will utilized service onboarding), this method can be removed, instead we will use CommonWidgetController.java (basic auth based)
+	 * 
+	 * @param request
+	 * @param resourceType
+	 *            Request parameter.
+	 * @return Rest response wrapped around a CommonWidgetMeta object.
+	 */
+	@RequestMapping(value = "/widgetData", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<CommonWidgetMeta> getWidgetData(HttpServletRequest request,
+			@RequestParam String resourceType) {
+		if (!isValidResourceType(resourceType))
+			return new PortalRestResponse<CommonWidgetMeta>(PortalRestStatusEnum.ERROR,
+					"Unexpected resource type " + resourceType, null);
+		return new PortalRestResponse<CommonWidgetMeta>(PortalRestStatusEnum.OK, "success",
+				searchService.getWidgetData(resourceType));
+	}
+	
+	
+	/**
+	 * Saves a batch of events, news or resources.
+	 * 
+	 * @param commonWidgetMeta
+	 *            read from POST body.
+	 * @return Rest response wrapped around a String; e.g., "success" or "ERROR"
+	 */
+	@RequestMapping(value = "/widgetDataBulk", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> saveWidgetDataBulk(@RequestBody CommonWidgetMeta commonWidgetMeta) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "saveWidgetDataBulk: argument is {}", commonWidgetMeta);
+		if (commonWidgetMeta.getCategory() == null || commonWidgetMeta.getCategory().trim().equals(""))
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "ERROR",
+					"Category cannot be null or empty");
+		if (!isValidResourceType(commonWidgetMeta.getCategory()))
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR,
+					"Unexpected resource type " + commonWidgetMeta.getCategory(), null);
+		// validate dates
+		for (CommonWidget cw : commonWidgetMeta.getItems()) {
+			String err = validateCommonWidget(cw);
+			if (err != null)
+				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, err, null);
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+				searchService.saveWidgetDataBulk(commonWidgetMeta));
+	}
+
+	/**
+	 * Saves one: event, news or resource
+	 * 
+	 * @param commonWidget
+	 *            read from POST body
+	 * @return Rest response wrapped around a String; e.g., "success" or "ERROR"
+	 */
+	@RequestMapping(value = "/widgetData", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> saveWidgetData(@RequestBody CommonWidget commonWidget) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "saveWidgetData: argument is {}", commonWidget);
+		if (commonWidget.getCategory() == null || commonWidget.getCategory().trim().equals(""))
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "ERROR",
+					"Category cannot be null or empty");
+		String err = validateCommonWidget(commonWidget);
+		if (err != null)
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, err, null);
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+				searchService.saveWidgetData(commonWidget));
+	}
+
+	/**
+	 * Used by the validate function
+	 */
+	private final SimpleDateFormat yearMonthDayFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+	/**
+	 * Validates the content of a common widget.
+	 * 
+	 * @param cw
+	 * @return null on success; an error message if validation fails.
+	 * @throws Exception
+	 */
+	private String validateCommonWidget(CommonWidget cw) {
+		if (!isValidResourceType(cw.getCategory()))
+			return "Invalid category: " + cw.getCategory();
+		if (cw.getTitle() == null || cw.getTitle().trim().length() == 0)
+			return "Title is missing";
+		if (cw.getHref() == null || cw.getHref().trim().length() == 0)
+			return "HREF is missing";
+		if (!cw.getHref().toLowerCase().startsWith("http"))
+			return "HREF does not start with http";
+		if (cw.getSortOrder() == null)
+			return "Sort order is null";
+		if (WidgetCategory.EVENTS.name().equals(cw.getCategory())) {
+			if (cw.getEventDate() == null || cw.getEventDate().trim().length() == 0)
+				return "Date is missing";
+			try {
+				yearMonthDayFormat.setLenient(false);
+				Date date = yearMonthDayFormat.parse(cw.getEventDate());
+				if (date == null)
+					return "Failed to parse date " + cw.getEventDate();
+			} catch (ParseException ex) {
+				return ex.toString();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Deletes one: event, news or resource
+	 * 
+	 * @param commonWidget
+	 *            read from POST body
+	 * @return Rest response wrapped around a String; e.g., "success" or "ERROR"
+	 */
+	@RequestMapping(value = "/deleteData", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> deleteWidgetData(@RequestBody CommonWidget commonWidget) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "deleteWidgetData: argument is {}", commonWidget);
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+				searchService.deleteWidgetData(commonWidget));
+	}
+
+	/**
+	 * Searches all portal for the input string.
+	 * 
+	 * @param request
+	 * @param searchString
+	 * @return Rest response wrapped around a Map of String to List of Search
+	 *         Result Item.
+	 */
+	@EPAuditLog
+	@RequestMapping(value = "/search", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, List<SearchResultItem>>> searchPortal(HttpServletRequest request,
+			@RequestParam String searchString) {
+
+		if (searchString != null)
+			searchString = searchString.trim();
+		EPUser user = EPUserUtils.getUserSession(request);
+		try {
+			if (user == null) {
+				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,
+						"searchPortal: User object is null? - check logs",
+						new HashMap<String, List<SearchResultItem>>());
+			} else if (searchString == null || searchString.length() == 0) {
+				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "searchPortal: String string is null",
+						new HashMap<String, List<SearchResultItem>>());
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "searchPortal: user {}, search string '{}'",
+						user.getLoginId(), searchString);
+				Map<String, List<SearchResultItem>> results = searchService.searchResults(user.getLoginId(),
+						searchString);
+				/*Audit log the search*/
+				AuditLog auditLog = new AuditLog();
+				auditLog.setUserId(user.getId());
+				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_SEARCH);
+				auditLog.setComments(searchString);
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());		
+				auditService.logActivity(auditLog, null);
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				EcompPortalUtils.calculateDateTimeDifferenceForLog(MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+				logger.info(EELFLoggerDelegate.auditLogger, EPLogUtil.formatAuditLogMessage("DashboardController.PortalRestResponse", 
+						EcompAuditLog.CD_ACTIVITY_SEARCH, user.getOrgUserId(), null, searchString));	
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+				MDC.remove(SystemProperties.MDC_TIMER);
+				return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", results);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "searchPortal failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage() + " - check logs.",
+					new HashMap<String, List<SearchResultItem>>());
+		}
+	}
+
+	/**
+	 * Gets all active users.
+	 * 
+	 * TODO: should only the superuser be allowed to use this API?
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a list of String
+	 */
+	@RequestMapping(value = "/activeUsers", method = RequestMethod.GET, produces = "application/json")
+	public List<String> getActiveUsers(HttpServletRequest request) {
+		List<String> activeUsers = null;
+		List<String> onlineUsers = new ArrayList<>();
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			String userId = user.getOrgUserId();
+
+			activeUsers = searchService.getRelatedUsers(userId);
+			HashSet<String> usersSet = CollaborateList.getInstance().getAllUserName();
+			for (String users : activeUsers) {
+				if (usersSet.contains(users)) {
+					onlineUsers.add(users);
+				}
+			}
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getActiveUsers failed", e);
+		}
+		return onlineUsers;
+	}
+	
+	/**
+	 * Gets the refresh interval and duration of a cycle of continuous refreshing for the online users side panel, both in milliseconds.
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a number that is the number of milliseconds.
+	 */
+	@RequestMapping(value = "/onlineUserUpdateRate", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, String>> getOnlineUserUpdateRate(HttpServletRequest request) {
+		try {
+			String updateRate = SystemProperties.getProperty(EPCommonSystemProperties.ONLINE_USER_UPDATE_RATE);	
+			String updateDuration = SystemProperties.getProperty(EPCommonSystemProperties.ONLINE_USER_UPDATE_DURATION);				
+			Integer rateInMiliSec = Integer.valueOf(updateRate)*1000;
+			Integer durationInMiliSec = Integer.valueOf(updateDuration)*1000;
+			Map<String, String> results = new HashMap<String,String>();
+			results.put("onlineUserUpdateRate", String.valueOf(rateInMiliSec));
+			results.put("onlineUserUpdateDuration", String.valueOf(durationInMiliSec));			
+			return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", results);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getOnlineUserUpdateRate failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}		
+	}
+
+	/**
+	 * Gets the window width threshold for collapsing right menu from system.properties.
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a number that is the window width threshold to collapse right menu.
+	 */
+	@RequestMapping(value = "/windowWidthThresholdRightMenu", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, String>> getWindowWidthThresholdForRightMenu(HttpServletRequest request) {
+		try {
+			String windowWidthString = SystemProperties.getProperty(EPCommonSystemProperties.WINDOW_WIDTH_THRESHOLD_RIGHT_MENU);	
+			Integer windowWidth = Integer.valueOf(windowWidthString);
+			Map<String, String> results = new HashMap<String,String>();
+			results.put("windowWidth", String.valueOf(windowWidth));
+			return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", results);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getWindowWidthThresholdForRightMenu failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}		
+	}
+
+
+	/**
+	 * Gets the window width threshold for collapsing left menu from system.properties.
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a number that is the window width threshold to collapse the left menu.
+	 */
+	@RequestMapping(value = "/windowWidthThresholdLeftMenu", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, String>> getWindowWidthThresholdForLeftMenu(HttpServletRequest request) {
+		try {
+			String windowWidthString = SystemProperties.getProperty(EPCommonSystemProperties.WINDOW_WIDTH_THRESHOLD_LEFT_MENU);	
+			Integer windowWidth = Integer.valueOf(windowWidthString);
+			Map<String, String> results = new HashMap<String,String>();
+			results.put("windowWidth", String.valueOf(windowWidth));
+			return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", results);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getWindowWidthThresholdForLeftMenu failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}		
+	}
+	
+	/**
+	 * Gets only those users that are 'related' to the currently logged-in user.
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a List of String
+	 */
+	@RequestMapping(value = "/relatedUsers", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<String>> activeUsers(HttpServletRequest request) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		try {
+			if (user == null) {
+				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "User object is null? - check logs",
+						new ArrayList<>());
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "activeUsers: searching for user {}", user.getLoginId());
+				return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success",
+						searchService.getRelatedUsers(user.getLoginId()));
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "activeUsers failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage() + " - check logs.",
+					new ArrayList<>());
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/DashboardSearchResultController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/DashboardSearchResultController.java
new file mode 100644
index 00000000..fe31066d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/DashboardSearchResultController.java
@@ -0,0 +1,243 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.ecomp.model.SearchResultItem;
+import org.openecomp.portalapp.portal.service.DashboardSearchService;
+import org.openecomp.portalapp.portal.transport.CommonWidget;
+import org.openecomp.portalapp.portal.transport.CommonWidgetMeta;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.domain.support.CollaborateList;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/portalApi/search")
+public class DashboardSearchResultController extends EPRestrictedBaseController {
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DashboardSearchResultController.class);
+
+	@Autowired
+	private DashboardSearchService searchService;
+
+	/**
+	 * Gets all widgets by type: NEW or RESOURCE
+	 * 
+	 * @param request
+	 * @param resourceType
+	 *            Request parameter.
+	 * @return Rest response wrapped around a CommonWidgetMeta object.
+	 */
+	@RequestMapping(value = "/widgetData", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<CommonWidgetMeta> getWidgetData(HttpServletRequest request,
+			@RequestParam String resourceType) {
+		return new PortalRestResponse<CommonWidgetMeta>(PortalRestStatusEnum.OK, "success",
+				searchService.getWidgetData(resourceType));
+	}
+
+	/**
+	 * Saves all: news and resources
+	 * 
+	 * @param commonWidgetMeta
+	 *            read from POST body.
+	 * @return Rest response wrapped around a String; e.g., "success" or "ERROR"
+	 */
+	@RequestMapping(value = "/widgetDataBulk", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> saveWidgetDataBulk(@RequestBody CommonWidgetMeta commonWidgetMeta) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "saveWidgetDataBulk: argument is {}", commonWidgetMeta);
+		if (commonWidgetMeta.getCategory() == null || commonWidgetMeta.getCategory().trim().equals(""))
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "ERROR",
+					"Category cannot be null or empty");
+		// validate dates
+		for (CommonWidget cw : commonWidgetMeta.getItems()) {
+			String err = validateCommonWidget(cw);
+			if (err != null)
+				return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, err, null);
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+				searchService.saveWidgetDataBulk(commonWidgetMeta));
+	}
+
+	/**
+	 * Saves one: news or resource
+	 * 
+	 * @param commonWidget
+	 *            read from POST body
+	 * @return Rest response wrapped around a String; e.g., "success" or "ERROR"
+	 */
+	@RequestMapping(value = "/widgetData", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> saveWidgetData(@RequestBody CommonWidget commonWidget) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "saveWidgetData: argument is {}", commonWidget);
+		if (commonWidget.getCategory() == null || commonWidget.getCategory().trim().equals(""))
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "ERROR",
+					"Cateogry cannot be null or empty");
+		String err = validateCommonWidget(commonWidget);
+		if (err != null)
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, err, null);
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+				searchService.saveWidgetData(commonWidget));
+	}
+
+	/**
+	 * Used by the validate function
+	 */
+	private final SimpleDateFormat yearMonthDayFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+	/**
+	 * Validates the content of a common widget.
+	 * 
+	 * @param cw
+	 * @return null on success; an error message if validation fails.
+	 * @throws Exception
+	 */
+	private String validateCommonWidget(CommonWidget cw) {
+		try {
+			if (cw.getEventDate() != null && cw.getEventDate().trim().length() > 0)
+				yearMonthDayFormat.parse(cw.getEventDate());
+		} catch (ParseException ex) {
+			return ex.toString();
+		}
+		return null;
+	}
+
+	/**
+	 * Deletes one: news or resource
+	 * 
+	 * @param commonWidget
+	 *            read from POST body
+	 * @return Rest response wrapped around a String; e.g., "success" or "ERROR"
+	 */
+	@RequestMapping(value = "/deleteData", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> deleteWidgetData(@RequestBody CommonWidget commonWidget) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "deleteWidgetData: argument is {}", commonWidget);
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success",
+				searchService.deleteWidgetData(commonWidget));
+	}
+
+	/**
+	 * Searches all portal for the input string.
+	 * 
+	 * @param request
+	 * @param searchString
+	 * @return Rest response wrapped around a Map of String to List of Search
+	 *         Result Item.
+	 */
+	@RequestMapping(value = "/allPortal", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, List<SearchResultItem>>> searchPortal(HttpServletRequest request,
+			@RequestParam String searchString) {
+
+		EPUser user = EPUserUtils.getUserSession(request);
+		try {
+			if (user == null) {
+				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR,
+						"searchPortal: User object is null? - check logs",
+						new HashMap<String, List<SearchResultItem>>());
+			} else if (searchString == null || searchString.trim().length() == 0) {
+				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "searchPortal: String string is null",
+						new HashMap<String, List<SearchResultItem>>());
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "searchPortal: user {}, search string '{}'",
+						user.getLoginId(), searchString);
+				Map<String, List<SearchResultItem>> results = searchService.searchResults(user.getLoginId(),
+						searchString);
+				return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", results);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "searchPortal failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage() + " - check logs.",
+					new HashMap<String, List<SearchResultItem>>());
+		}
+	}
+
+	/**
+	 * Gets all active users.
+	 * 
+	 * TODO: should only the superuser be allowed to use this API?
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a list of String
+	 */
+	@RequestMapping(value = "/activeUsers", method = RequestMethod.GET, produces = "application/json")
+	public List<String> getActiveUsers(HttpServletRequest request) {
+		List<String> activeUsers = null;
+		List<String> onlineUsers = new ArrayList<>();
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			String userId = user.getOrgUserId();
+
+			activeUsers = searchService.getRelatedUsers(userId);
+			HashSet<String> usersSet = CollaborateList.getInstance().getAllUserName();
+			for (String users : activeUsers) {
+				if (usersSet.contains(users)) {
+					onlineUsers.add(users);
+				}
+			}
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getActiveUsers failed", e);
+		}
+		return onlineUsers;
+	}
+
+	/**
+	 * Gets only those users that are 'related' to the currently logged-in user.
+	 * 
+	 * @param request
+	 * @return Rest response wrapped around a List of String
+	 */
+	@RequestMapping(value = "/relatedUsers", method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<String>> activeUsers(HttpServletRequest request) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		try {
+			if (user == null) {
+				return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "User object is null? - check logs",
+						new ArrayList<>());
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "activeUsers: searching for user {}", user.getLoginId());
+				return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success",
+						searchService.getRelatedUsers(user.getLoginId()));
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "activeUsers failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.getMessage() + " - check logs.",
+					new ArrayList<>());
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ExternalAppsRestfulController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ExternalAppsRestfulController.java
new file mode 100644
index 00000000..41da3357
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ExternalAppsRestfulController.java
@@ -0,0 +1,206 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedRESTfulBaseController;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.EPLoginService;
+import org.openecomp.portalapp.portal.service.EPRoleService;
+import org.openecomp.portalapp.portal.service.FunctionalMenuService;
+import org.openecomp.portalapp.portal.service.UserNotificationService;
+import org.openecomp.portalapp.portal.transport.EpNotificationItem;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItemJson;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItem;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.crossapi.PortalAPIResponse;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API)
+@Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class ExternalAppsRestfulController extends EPRestrictedRESTfulBaseController {
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppsRestfulController.class);
+
+	@Autowired
+	private FunctionalMenuService functionalMenuService;
+
+	@Autowired
+	private EPLoginService epLoginService;
+
+	@Autowired
+	private AdminRolesService adminRolesService;
+
+	@Autowired
+	private UserNotificationService userNotificationService;
+
+	@Autowired
+	private EPRoleService epRoleService;
+
+	@ApiOperation(value = "Creates a Portal user notification for roles identified in the content from an external application.", response = PortalAPIResponse.class)
+	@RequestMapping(value = { "/publishNotification" }, method = RequestMethod.POST, produces = "application/json")
+	@ResponseBody
+	public PortalAPIResponse publishNotification(HttpServletRequest request,
+			@RequestBody EpNotificationItem notificationItem) throws Exception {
+		String appKey = request.getHeader("uebkey");
+		EPApp app = findEpApp(appKey);
+		List<Long> postRoleIds = new ArrayList<Long>();
+		for (Long roleId : notificationItem.getRoleIds()) {
+			EPRole role = epRoleService.getRole(app.getId(), roleId);
+			if (role != null)
+				postRoleIds.add(role.getId());
+		}
+
+		// --- recreate the user notification object with the POrtal Role Ids
+		EpNotificationItem postItem = new EpNotificationItem();
+		postItem.setRoleIds(postRoleIds);
+		postItem.setIsForAllRoles("N");
+		postItem.setIsForOnlineUsers("N");
+		postItem.setActiveYn("Y");
+		postItem.setPriority(notificationItem.getPriority());
+		postItem.setMsgHeader(notificationItem.getMsgHeader());
+		postItem.setMsgDescription(notificationItem.getMsgDescription());
+		postItem.setStartTime(notificationItem.getStartTime());
+		postItem.setEndTime(notificationItem.getEndTime());
+		postItem.setCreatedDate(Calendar.getInstance().getTime());
+		// default creator to 1 for now
+		postItem.setCreatorId(PortalConstants.DEFAULT_NOTIFICATION_CREATOR);
+		// ----
+
+		try {
+			userNotificationService.saveNotification(postItem);
+		} catch (Exception e) {
+			return new PortalAPIResponse(false, e.getMessage());
+		}
+
+		PortalAPIResponse response = new PortalAPIResponse(true, "success");
+		return response;
+	}
+
+	private EPApp findEpApp(String uebKey) {
+		List<?> list = null;
+		StringBuffer criteria = new StringBuffer();
+		criteria.append(" where ueb_key = '" + uebKey + "'");
+		list = getDataAccessService().getList(EPApp.class, criteria.toString(), null, null);
+		return (list == null || list.size() == 0) ? null : (EPApp) list.get(0);
+	}
+
+	@ApiOperation(value = "Gets favorite items within the functional menu for the current user.", response = FavoritesFunctionalMenuItemJson.class, responseContainer="List")
+	@RequestMapping(value = { "/getFavorites" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+		String loginId = "";
+		String userAgent = "";
+		List<FavoritesFunctionalMenuItemJson> favorites = null;
+
+		loginId = request.getHeader(EPCommonSystemProperties.MDC_LOGIN_ID);
+		userAgent = MDC.get(EPCommonSystemProperties.PARTNER_NAME);
+
+		EPUser epUser = epLoginService.findUserWithoutPwd(loginId);
+		logger.info(EELFLoggerDelegate.errorLogger,
+				"getFavorites request was received from " + userAgent + " for the user " + loginId + ".");
+		if (epUser == null || epUser.getId() == null) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"No User record found for the LoginId '" + loginId + "' in the database.");
+			throw new Exception("Received null for Login-Id.");
+		} else {
+			favorites = functionalMenuService.getFavoriteItems(epUser.getId());
+			FieldsValidator fieldsValidator = new FieldsValidator();
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+
+			EcompPortalUtils.logAndSerializeObject(logger, "/getFavorites", "result = ", favorites);
+		}
+
+		return favorites;
+	}
+
+	@ApiOperation(value = "Gets functional menu items appropriate for the current user.", response = FunctionalMenuItem.class, responseContainer="List")
+	@RequestMapping(value = {
+			"/functionalMenuItemsForUser" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getFunctionalMenuItemsForUser(HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+		String loginId = "";
+		String userAgent = "";
+		List<FunctionalMenuItem> fnMenuItems = null;
+
+		loginId = request.getHeader("LoginId");
+		userAgent = MDC.get(EPCommonSystemProperties.PARTNER_NAME);
+
+		EPUser epUser = epLoginService.findUserWithoutPwd(loginId);
+		logger.info(EELFLoggerDelegate.errorLogger, "getFunctionalMenuItemsForUser request was received from "
+				+ userAgent + " for the user " + loginId + ".");
+		if (epUser == null || epUser.getId() == null) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"No User record found for the LoginId '" + loginId + "' in the database.");
+			throw new Exception("Received null for Login-Id.");
+		} else if (adminRolesService.isSuperAdmin(epUser)) {
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"FunctionalMenuHandler: SuperUser, about to call getFunctionalMenuItems()");
+			fnMenuItems = functionalMenuService.getFunctionalMenuItems();
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"getMenuItemsForAuthUser: about to call getFunctionalMenuItemsForUser()");
+			fnMenuItems = functionalMenuService.getFunctionalMenuItemsForUser(epUser.getOrgUserId());
+		}
+
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		response.setStatus(fieldsValidator.httpStatusCode.intValue());
+
+		EcompPortalUtils.logAndSerializeObject(logger, "/functionalMenuItemsForUser", "result = ", fnMenuItems);
+
+		return fnMenuItems;
+	}
+
+	@ExceptionHandler(Exception.class)
+	protected void handleBadRequests(Exception e, HttpServletResponse response) throws IOException {
+		logger.warn(EELFLoggerDelegate.errorLogger, "Handling bad request", e);
+		response.sendError(HttpStatus.BAD_REQUEST.value(), e.getMessage());
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/FunctionalMenuController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/FunctionalMenuController.java
new file mode 100644
index 00000000..de71766d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/FunctionalMenuController.java
@@ -0,0 +1,555 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cxf.transport.http.HTTPException;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.UserProfileService;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.SharedContext;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.EPAuditService;
+import org.openecomp.portalapp.portal.service.FunctionalMenuService;
+import org.openecomp.portalapp.portal.service.SearchService;
+import org.openecomp.portalapp.portal.service.SharedContextService;
+import org.openecomp.portalapp.portal.transport.BusinessCardApplicationRole;
+import org.openecomp.portalapp.portal.transport.BusinessCardApplicationRolesList;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItemJson;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItemWithRoles;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+/**
+ * Supports menus at the top of the Portal app landing page.
+ */
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class FunctionalMenuController extends EPRestrictedBaseController {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FunctionalMenuController.class);
+
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	FunctionalMenuService functionalMenuService;
+	@Autowired
+	SharedContextService sharedContextService;
+	@Autowired
+	UserProfileService service;
+	@Autowired
+	SearchService searchService;
+	@Autowired
+	EPAuditService epAuditService;
+
+	/**
+	 * RESTful service method to fetch all the FunctionalMenuItems.
+	 * 
+	 * @return List of FunctionalMenuItem objects
+	 */
+	@RequestMapping(value = { "/portalApi/functionalMenu" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getMenuItems(HttpServletRequest request, HttpServletResponse response) {
+		// TODO: should only the superuser be allowed to use this API?
+		List<FunctionalMenuItem> menuItems = null;
+		try {
+			menuItems = functionalMenuService.getFunctionalMenuItems();
+			functionalMenuService.assignHelpURLs(menuItems);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenu", "result =", menuItems);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling functionalMenu. Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		return menuItems;
+	}
+
+	/**
+	 * RESTful service method to fetch all the FunctionalMenuItems, both active
+	 * and inactive, for the EditFunctionalMenu feature. Can only be accessed by
+	 * the portal admin.
+	 * 
+	 * @return List of FunctionalMenuItem objects
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuForEditing" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getMenuItemsForEditing(HttpServletRequest request, HttpServletResponse response) {
+		// TODO: should only the superuser be allowed to use this API?
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<FunctionalMenuItem> menuItems = null;
+		try {
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getFunctionalMenuItemDetails");
+			} else {
+				menuItems = functionalMenuService.getFunctionalMenuItems(true);
+			}
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuForEditing", "result =", menuItems);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling functionalMenuForEditing. Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+		return menuItems;
+	}
+	
+	/**
+	 * RESTful service method to fetch all the FunctionalMenuItems,  active
+	 *, for the Functional menu in notification Tree feature.
+	 * 
+	 * @return List of FunctionalMenuItem objects
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuForNotificationTree" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getMenuItemsForNotifications(HttpServletRequest request, HttpServletResponse response) {
+		// TODO: should only the superuser be allowed to use this API?
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<FunctionalMenuItem> menuItems = null;
+		try {
+			menuItems = functionalMenuService.getFunctionalMenuItemsForNotificationTree(true);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuForNotificationTree", "result =", menuItems);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling functionalMenuForNotifications. Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+		return menuItems;
+	}
+
+	/**
+	 * RESTful service method to fetch all FunctionalMenuItems associated with
+	 * an application.
+	 * 
+	 * @return List of FunctionalMenuItem objects
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuForApp/{appId}" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getMenuItemsForApp(HttpServletRequest request, @PathVariable("appId") Integer appId)
+			throws HTTPException {
+		// TODO: should only the superuser be allowed to use this API?
+		List<FunctionalMenuItem> menuItems = null;
+		try {
+			menuItems = functionalMenuService.getFunctionalMenuItemsForApp(appId);
+			functionalMenuService.assignHelpURLs(menuItems);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuForApp/" + appId, "result =", menuItems);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling functionalMenuForApp. Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+		return menuItems;
+	}
+
+	/**
+	 * RESTful service method to fetch all FunctionalMenuItems associated with
+	 * the applications and roles that a user has access to.
+	 * 
+	 * @return List of FunctionalMenuItem objects
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuForUser/{orgUserId}" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getMenuItemsForUser(HttpServletRequest request,
+			@PathVariable("orgUserId") String orgUserId) throws HTTPException {
+		// TODO: should only the superuser be allowed to use this API?
+		List<FunctionalMenuItem> menuItems = null;
+		try {
+			menuItems = functionalMenuService.getFunctionalMenuItemsForUser(orgUserId);
+			functionalMenuService.assignHelpURLs(menuItems);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuForUser/" + orgUserId, "result =", menuItems);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling functionalMenuForUser. Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+
+		return menuItems;
+	}
+
+	/**
+	 * RESTful service method to fetch all FunctionalMenuItems associated with
+	 * the applications and roles that the authenticated user has access to.
+	 * 
+	 * @return List of FunctionalMenuItem objects
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuForAuthUser" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuItem> getMenuItemsForAuthUser(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<FunctionalMenuItem> menuItems = null;
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getMenuItemsForAuthUser");
+			} else if (adminRolesService.isSuperAdmin(user)) {
+				menuItems = functionalMenuService.getFunctionalMenuItems();
+			} else {
+				// calculate the menu items
+				String orgUserId = user.getOrgUserId();
+				menuItems = functionalMenuService.getFunctionalMenuItemsForUser(orgUserId);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuForUser/" + orgUserId, "result =",
+						menuItems);
+			}
+			functionalMenuService.assignHelpURLs(menuItems);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling getMenuItemsForAuthUser. Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+		return menuItems;
+	}
+
+	/**
+	 * RESTful service method to fetch the details for a functional menu item.
+	 * Requirement: you must be the Ecomp portal super admin user.
+	 * 
+	 * @return FunctionalMenuItem object
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuItemDetails/{menuId}" }, method = RequestMethod.GET, produces = "application/json")
+	public FunctionalMenuItem getFunctionalMenuItemDetails(HttpServletRequest request,
+			@PathVariable("menuId") Integer menuId, HttpServletResponse response) throws HTTPException {
+		// TODO: return FunctionalMenuItemJson
+		// TODO: modify FunctionalMenuItem to not include the transient fields
+		FunctionalMenuItem menuItem = null;
+		try {
+			EPUser user = EPUserUtils.getUserSession(request);
+			if (!adminRolesService.isSuperAdmin(user)) {
+				EcompPortalUtils.setBadPermissions(user, response, "getFunctionalMenuItemDetails");
+			} else {
+				menuItem = functionalMenuService.getFunctionalMenuItemDetails(menuId);
+				EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuItemDetails/" + menuId, "result =",
+						menuItem);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while calling functionalMenuItemDetails. Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+
+		return menuItem;
+	}
+
+	/**
+	 * RESTful service method to create a new menu item.
+	 * 
+	 * Requirement: you must be the Ecomp portal super admin user.
+	 */
+	@RequestMapping(value = { "/portalApi/functionalMenuItem" }, method = RequestMethod.POST)
+	public FieldsValidator createFunctionalMenuItem(HttpServletRequest request,
+			@RequestBody FunctionalMenuItemWithRoles menuItemJson, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		if (!adminRolesService.isSuperAdmin(user)) {
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"FunctionalMenuController.createFunctionalMenuItem bad permissions");
+			EcompPortalUtils.setBadPermissions(user, response, "createFunctionalMenuItem");
+		} else {
+			fieldsValidator = functionalMenuService.createFunctionalMenuItem(menuItemJson);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuItem", "POST result =",
+					response.getStatus());
+		}
+
+		return fieldsValidator;
+	}
+
+	/**
+	 * RESTful service method to update an existing menu item
+	 * 
+	 * Requirement: you must be the Ecomp portal super admin user.
+	 * 
+	 * @return FieldsValidator
+	 */
+	@RequestMapping(value = { "/portalApi/functionalMenuItem" }, method = RequestMethod.PUT)
+	public FieldsValidator editFunctionalMenuItem(HttpServletRequest request,
+			@RequestBody FunctionalMenuItemWithRoles menuItemJson, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "editFunctionalMenuItem");
+		} else {
+			fieldsValidator = functionalMenuService.editFunctionalMenuItem(menuItemJson);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuItem", "PUT result =",
+					response.getStatus());
+		}
+
+		return fieldsValidator;
+	}
+
+	/**
+	 * RESTful service method to delete a menu item
+	 * 
+	 * @return FieldsValidator
+	 */
+	@RequestMapping(value = { "/portalApi/functionalMenuItem/{menuId}" }, method = RequestMethod.DELETE)
+	public FieldsValidator deleteFunctionalMenuItem(HttpServletRequest request, @PathVariable("menuId") Long menuId,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "deleteFunctionalMenuItem");
+		} else {
+			fieldsValidator = functionalMenuService.deleteFunctionalMenuItem(menuId);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuItem", "DELETE result =",
+					response.getStatus());
+		}
+
+		return fieldsValidator;
+	}
+
+	/**
+	 * RESTful service to regenerate table
+	 * 
+	 * @param request
+	 * @param response
+	 * 
+	 * @return FieldsValidator
+	 */
+	@RequestMapping(value = { "/portalApi/regenerateFunctionalMenuAncestors" }, method = RequestMethod.GET)
+	public FieldsValidator regenerateAncestorTable(HttpServletRequest request, HttpServletResponse response) {
+		// TODO: should only the superuser be allowed to use this API?
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "deleteFunctionalMenuItem");
+		} else {
+			fieldsValidator = functionalMenuService.regenerateAncestorTable();
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/regenerateAncestorTable", "GET result =",
+					response.getStatus());
+		}
+
+		return fieldsValidator;
+	}
+
+	/**
+	 * RESful service to set a favorite item.
+	 * 
+	 * @return FieldsValidator
+	 */
+	@RequestMapping(value = { "/portalApi/setFavoriteItem" }, method = RequestMethod.POST)
+	public FieldsValidator addFavoriteItem(HttpServletRequest request,
+			@RequestBody FavoritesFunctionalMenuItem menuItemJson, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		menuItemJson.userId = user.getId();
+		fieldsValidator = functionalMenuService.setFavoriteItem(menuItemJson);
+		response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/setFavoriteItem", "Post result =", response.getStatus());
+
+		return fieldsValidator;
+	}
+
+	/**
+	 * RESTful service to get favorites for the current user as identified in
+	 * the session
+	 * 
+	 * @return List of FavoritesFunctionalMenuItemJson
+	 */
+	@RequestMapping(value = {
+			"/portalApi/getFavoriteItems" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FavoritesFunctionalMenuItemJson> getFavoritesForUser(HttpServletRequest request,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<FavoritesFunctionalMenuItemJson> favorites = functionalMenuService.getFavoriteItems(user.getId());
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/getFavoriteItems", "GET result =", response.getStatus());
+		return favorites;
+	}
+
+	/**
+	 * RESTful service to delete a favorite menu item for the current user as
+	 * identified in the session.
+	 * 
+	 * @return FieldsValidator
+	 */
+	@RequestMapping(value = { "/portalApi/removeFavoriteItem/{menuId}" }, method = RequestMethod.DELETE)
+	public FieldsValidator deleteFavoriteItem(HttpServletRequest request, @PathVariable("menuId") Long menuId,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		Long userId = user.getId();
+		fieldsValidator = functionalMenuService.removeFavoriteItem(userId, menuId);
+		response.setStatus(fieldsValidator.httpStatusCode.intValue());
+		EcompPortalUtils.logAndSerializeObject(logger, "/deleteFavoriteItem", "DELETE result =", response.getStatus());
+
+		return fieldsValidator;
+	}
+
+	/**
+	 * RESTful service to get user information: user's first and last names, ATT
+	 * UID, email and last-login. (Actually has nothing to do with the real
+	 * functional menu.) First attempts to get the information from the Tomcat
+	 * session (i.e., the CSP cookie); if that fails, calls the shared context
+	 * service to read the information from the database. Gives back what it
+	 * found, any of which may be null, as a JSON collection.
+	 * 
+	 * @return JSON collection of key-value pairs shown below.
+	 */
+	@RequestMapping(value = {
+			"/portalApi/functionalMenuStaticInfo" }, method = RequestMethod.GET, produces = "application/json")
+	public String getFunctionalMenuStaticInfo(HttpServletRequest request, HttpServletResponse response) {
+
+		// Get user details from session
+		logger.debug(EELFLoggerDelegate.debugLogger, "getFunctionalMenuStaticInfo: getting user info");
+		String fnMenuStaticResponse = null;
+		try {			
+			String orgUserIdStr = null, firstNameStr = null, lastNameStr = null, emailStr = null, lastLogin = null;
+			EPUser user = EPUserUtils.getUserSession(request);
+			firstNameStr = user.getFirstName();
+			lastNameStr = user.getLastName();
+			orgUserIdStr = user.getOrgUserId();
+			emailStr = user.getEmail();
+			if (emailStr == null || emailStr.equals("")) {
+				EPUser userResult = searchService.searchUserByUserId(orgUserIdStr);
+				emailStr = userResult.getEmail();
+			}
+			SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy hh:mm:ssZ");
+			Date lastLoginDate = user.getLastLoginDate();
+			if (lastLoginDate == null) {
+				// should never happen
+				logger.error(EELFLoggerDelegate.errorLogger, "getFunctionalMenuStaticInfo: no last login in session");
+				lastLogin = "no last login available";
+			}
+			else {
+				lastLogin = sdf.format(lastLoginDate);
+			}
+			
+			// If any item is missing from session, try the Shared Context
+			// service.
+			SharedContext orgUserIdSC = null, firstNameSC = null, lastNameSC = null, emailSC = null;
+			String sessionId = request.getSession().getId();
+			if (firstNameStr == null)
+				firstNameSC = sharedContextService.getSharedContext(sessionId, EPCommonSystemProperties.USER_FIRST_NAME);
+			if (lastNameStr == null)
+				lastNameSC = sharedContextService.getSharedContext(sessionId, EPCommonSystemProperties.USER_LAST_NAME);
+			if (emailStr == null)
+				emailSC = sharedContextService.getSharedContext(sessionId, EPCommonSystemProperties.USER_EMAIL);
+			if (orgUserIdStr == null)
+				orgUserIdSC = sharedContextService.getSharedContext(sessionId, EPCommonSystemProperties.USER_ORG_USERID);
+
+			// Build the response
+			Map<String, String> map = new HashMap<String, String>();
+			map.put("firstName",
+					firstNameStr != null ? firstNameStr : (firstNameSC != null ? firstNameSC.getCvalue() : null));
+			map.put("lastName",
+					lastNameStr != null ? lastNameStr : (lastNameSC != null ? lastNameSC.getCvalue() : null));
+			map.put("email", emailStr != null ? emailStr : (emailSC != null ? emailSC.getCvalue() : null));
+			map.put("userId", orgUserIdStr != null ? orgUserIdStr : (orgUserIdSC != null ? orgUserIdSC.getCvalue() : null));
+			map.put("last_login", lastLogin);
+			JSONObject j = new JSONObject(map);
+			fnMenuStaticResponse = j.toString();
+			// Be chatty in the log
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/functionalMenuStaticInfo", "GET result =",
+					fnMenuStaticResponse);
+		} catch (Exception e) {
+			// Should never happen.
+			logger.error(EELFLoggerDelegate.errorLogger, "getFunctionalMenuStaticInfo failed", e);
+			// Return a real error?
+			// fnMenuStaticResponse = "{ \"status\": \"error\", \"message\": \""
+			// + e.toString() + "\" }";
+			// But the angular controller expects null on error.
+		}
+		return fnMenuStaticResponse;
+	}
+	
+	private Comparator<BusinessCardApplicationRole> getUserAppRolesComparator = new Comparator<BusinessCardApplicationRole>() {
+		public int compare(BusinessCardApplicationRole o1, BusinessCardApplicationRole o2) {
+			return o1.getAppName().compareTo(o2.getAppName());
+		}
+	};
+
+	@RequestMapping(value = {
+			"/portalApi/userApplicationRoles" }, method = RequestMethod.GET, produces = "application/json")
+	public List<BusinessCardApplicationRolesList> getAppList(HttpServletRequest request,@RequestParam("userId") String userId) throws IOException {
+
+		
+		List<BusinessCardApplicationRolesList> AppRoles = null;
+		try {
+			List<BusinessCardApplicationRole> userAppRoleList = functionalMenuService.getUserAppRolesList(userId);
+			
+			Collections.sort(userAppRoleList, getUserAppRolesComparator);
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userApplicationRoles", "result =", userAppRoleList);
+			
+			 AppRoles = new ArrayList<BusinessCardApplicationRolesList>();	   
+			for(BusinessCardApplicationRole userAppRole: userAppRoleList)
+			{    
+				  boolean found = false;
+			      List<String> roles = null;
+			     
+				for(BusinessCardApplicationRolesList app :AppRoles)
+				{	
+					if(app.getAppName().equals(userAppRole.getAppName()))
+					{
+						roles= app.getRoleNames();
+						roles.add(userAppRole.getRoleName());
+						app.setRoleNames(roles);
+						found = true;	
+						break;	
+					}
+				}
+				
+				if(!found)
+				{
+				roles = new ArrayList<String>();	
+				roles.add(userAppRole.getRoleName());
+				AppRoles.add(new BusinessCardApplicationRolesList(userAppRole.getAppName(), roles));
+				}	
+				
+				Collections.sort(roles);
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppList failed", e);
+		}
+
+	return  AppRoles;
+
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/GetAccessController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/GetAccessController.java
new file mode 100644
index 00000000..7856dc43
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/GetAccessController.java
@@ -0,0 +1,73 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.controller.EPUnRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.GetAccessResult;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.GetAccessService;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class GetAccessController extends EPUnRestrictedBaseController {
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(GetAccessController.class);
+
+	@Autowired
+	GetAccessService getAccessService;
+
+	/**
+	 * Sorts the list by ECOMP function name.
+	 */
+	private Comparator<GetAccessResult> getAccessComparator = new Comparator<GetAccessResult>() {
+		public int compare(GetAccessResult o1, GetAccessResult o2) {
+			return o1.getAppName().compareTo(o2.getAppName());
+		}
+	};
+	
+	@RequestMapping(value = { "/portalApi/getAppList" }, method = RequestMethod.GET, produces = "application/json")
+	public List<GetAccessResult> getAppList(HttpServletRequest request) throws IOException {
+		List<GetAccessResult> appsList = null;
+		EPUser user = EPUserUtils.getUserSession(request);
+		appsList = getAccessService.getAppAccessList(user);
+		Collections.sort(appsList, getAccessComparator);
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/getAppList", "result =", appsList);
+		return appsList;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/HealthCheckController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/HealthCheckController.java
new file mode 100644
index 00000000..84731af4
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/HealthCheckController.java
@@ -0,0 +1,235 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.MDC;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.controller.EPUnRestrictedBaseController;
+import org.openecomp.portalapp.portal.listener.HealthMonitor;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import com.google.gson.Gson;
+
+/*
+ * This controller checks the health status and returns JSON response.
+ * It does not require authentication or session.
+ */
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class HealthCheckController extends EPUnRestrictedBaseController {
+	
+	private class HealthStatus {
+		public int statusCode;
+		@SuppressWarnings("unused")
+		public String body;
+
+		public HealthStatus(int code, String body) {
+			this.statusCode = code;
+			this.body = body;
+		}
+	}
+
+	private class HealthStatusInfo {
+		HealthStatusInfo(String healthCheckComponent) {
+			this.healthCheckComponent = healthCheckComponent;
+			this.healthCheckStatus = statusUp; // Default value
+			this.version = "";
+			this.description = statusOk; // Default value
+			this.hostName = "";
+			this.ipAddress = "";
+			this.dbClusterStatus = "";
+			this.dbPermissions = "";
+		}
+
+		@SuppressWarnings("unused")
+		public String healthCheckComponent;
+		@SuppressWarnings("unused")
+		public String healthCheckStatus;
+		@SuppressWarnings("unused")
+		public String version;
+		@SuppressWarnings("unused")
+		public String description;
+		@SuppressWarnings("unused")
+		public String hostName;
+		@SuppressWarnings("unused")
+		public String ipAddress;
+		@SuppressWarnings("unused")
+		public String dbClusterStatus;
+		@SuppressWarnings("unused")
+		public String dbPermissions;
+	}
+
+	private final String statusUp = "UP";
+	private final String statusDown = "DOWN";
+	private final String statusOk = "OK";
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HealthCheckController.class);
+	
+	@RequestMapping(value = { "/portalApi/healthCheck" }, method = RequestMethod.GET, produces = "application/json")
+	public HealthStatus healthCheck(HttpServletRequest request, HttpServletResponse response) {
+		HealthStatus healthStatus = new HealthStatus(500, "");
+
+		// Return the status as 500 if it suspended due to manual fail over
+		if (HealthMonitor.isSuspended) {
+			healthStatus.body = "Suspended";
+			response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			MDC.put(EPCommonSystemProperties.RESPONSE_CODE, Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+			return healthStatus;
+		}
+
+		try {
+			boolean overallStatus = true;
+
+			List<HealthStatusInfo> statusCollection = new ArrayList<HealthStatusInfo>();
+
+			HealthStatusInfo beInfo = new HealthStatusInfo("BE");
+			beInfo.hostName = EcompPortalUtils.getMyHostName();
+			beInfo.ipAddress = EcompPortalUtils.getMyIpAdddress();
+			if (!HealthMonitor.isBackEndUp()) {
+				overallStatus = false;
+				beInfo.healthCheckStatus = statusDown;
+				beInfo.description = "Check the logs for more details";
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHealthCheckError);
+			}
+			statusCollection.add(beInfo);
+
+			HealthStatusInfo feInfo = new HealthStatusInfo("FE");
+			if (!HealthMonitor.isFrontEndUp()) {
+				overallStatus = false;
+				feInfo.healthCheckStatus = statusDown;
+				feInfo.description = "Check the logs for more details";
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.FeHealthCheckError);
+			}
+			statusCollection.add(feInfo);
+
+			HealthStatusInfo dbInfo = new HealthStatusInfo("DB");
+			if (!HealthMonitor.isDatabaseUp()) {
+				overallStatus = false;
+				dbInfo.healthCheckStatus = statusDown;
+				dbInfo.description = "Check the logs for more details";
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
+			}
+					
+			if (!HealthMonitor.isClusterStatusOk()) {
+				dbInfo.dbClusterStatus = "Problem, check the logs for more details";
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
+			}
+			else {
+				dbInfo.dbClusterStatus = statusOk;
+			}
+			
+			if (!HealthMonitor.isDatabasePermissionsOk()) {
+				dbInfo.dbPermissions = "Problem, check the logs for more details";
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
+			}
+			else {
+				dbInfo.dbPermissions = statusOk;
+			}
+			statusCollection.add(dbInfo);
+
+			HealthStatusInfo uebInfo = new HealthStatusInfo("UEB");
+			if (!HealthMonitor.isUebUp()) {
+				//As per test case review meeting, UEB is considered as critical as DB. Hence commenting
+				//overallStatus = false;
+				uebInfo.healthCheckStatus = statusDown;
+				uebInfo.description = "Check the logs for more details";
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebConnectionError);
+			}
+			statusCollection.add(uebInfo);
+
+			String json = "";
+			try {
+				json = new Gson().toJson(statusCollection);
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput);
+			}
+			logger.info(EELFLoggerDelegate.debugLogger, json);
+
+			if (overallStatus) {
+				healthStatus = new HealthStatus(200, json);
+			} else {
+				healthStatus = new HealthStatus(500, json);
+				response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			}
+			MDC.put(EPCommonSystemProperties.RESPONSE_CODE, Integer.toString(healthStatus.statusCode));
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing the healthcheck. Details: "
+					+ EcompPortalUtils.getStackTrace(e));
+		}
+		
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/healthCheck", "GET result =", response.getStatus());
+		
+		return healthStatus;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/healthCheckSuspend" }, method = RequestMethod.GET, produces = "application/json")
+	public HealthStatus healthCheckSuspend(HttpServletRequest request, HttpServletResponse response) {
+		HealthStatus healthStatus = new HealthStatus(500, "Suspended for manual failover mechanism");
+
+		HealthMonitor.isSuspended = true;
+		healthStatus.statusCode = 200;
+		
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/healthCheckSuspend", "GET result =",
+																		response.getStatus());
+		
+		return healthStatus;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/healthCheckResume" }, method = RequestMethod.GET, produces = "application/json")
+	public HealthStatus healthCheckResume(HttpServletRequest request, HttpServletResponse response) {
+		HealthStatus healthStatus = new HealthStatus(500, "Resumed from manual failover mechanism");
+
+		HealthMonitor.isSuspended = false;
+		healthStatus.statusCode = 200;
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/healthCheckResume", "GET result =",
+																			response.getStatus());
+		return healthStatus;
+	}
+	
+	
+
+	@RequestMapping(value = {
+			"/portalApi/ping" }, method = RequestMethod.GET, produces = "application/json")
+	public HealthStatus ping(HttpServletRequest request, HttpServletResponse response) {
+		HealthStatus healthStatus = new HealthStatus(200, "OK");	
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/ping", "GET result =",
+				response.getStatus());
+		
+		return healthStatus;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ManifestController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ManifestController.java
new file mode 100644
index 00000000..7b4d51f5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/ManifestController.java
@@ -0,0 +1,90 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.Attributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.ManifestService;
+
+/**
+ * This controller responds to a request for the web application manifest,
+ * returning a JSON with the information that was created at build time.
+ * 
+ * Manifest entries have names with hyphens, which means Javascript code can't
+ * simply use the shorthand object.key; instead use object['key'].
+ */
+@RestController
+@Configuration("manifestPortalController")
+@EnableAspectJAutoProxy
+@RequestMapping("/")
+@EPAuditLog
+public class ManifestController extends RestrictedBaseController {
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ManifestController.class);
+
+	@Autowired
+	ManifestService manifestService;
+
+	/**
+	 * Gets the webapp manifest contents as a JSON object.
+	 * 
+	 * @param request
+	 * @return A map of key-value pairs. On success:
+	 * 
+	 *         <pre>
+	 * { "manifest" : { "key1": "value1", "key2": "value2" } }
+	 *         </pre>
+	 * 
+	 *         On failure:
+	 * 
+	 *         <pre>
+	 * { "error": "message" }
+	 *         </pre>
+	 */
+	@RequestMapping(value = { "/portalApi/manifest" }, method = RequestMethod.GET, produces = "application/json")
+	@ResponseBody
+	public Map<String, Object> getManifest(HttpServletRequest request) {
+		Map<String, Object> response = new HashMap<String, Object>();
+		try {
+			Attributes attributes = manifestService.getWebappManifest();
+			response.put("manifest", attributes);
+		} catch (Exception ex) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getManifest: failed to read manifest", ex);
+			response.put("error", "failed to get manifest: " + ex.toString());
+		}
+		return response;
+	}
+
+}
+\ No newline at end of file
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/MicroserviceController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/MicroserviceController.java
new file mode 100644
index 00000000..82d70ecd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/MicroserviceController.java
@@ -0,0 +1,141 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.MicroserviceData;
+import org.openecomp.portalapp.portal.domain.WidgetCatalog;
+import org.openecomp.portalapp.portal.domain.WidgetServiceHeaders;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.ConsulHealthService;
+import org.openecomp.portalapp.portal.service.MicroserviceService;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+@SuppressWarnings("unchecked")
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class MicroserviceController extends EPRestrictedBaseController {
+	
+	private static final String HTTPS = "https://";
+	
+	String whatService = "widgets-service";
+	RestTemplate template = new RestTemplate();
+
+	@Autowired
+	private ConsulHealthService consulHealthService;
+
+	@Autowired
+	private MicroserviceService microserviceService;
+	
+	@RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.POST)
+	public PortalRestResponse<String> createMicroservice(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody MicroserviceData newServiceData) throws Exception {
+		if (newServiceData == null) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"MicroserviceData cannot be null or empty");
+		}
+		long serviceId = microserviceService.saveMicroservice(newServiceData);
+
+		try {
+			microserviceService.saveServiceParameters(serviceId, newServiceData.getParameterList());
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices" }, method = RequestMethod.GET)
+	public List<MicroserviceData> getMicroservice(HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		List<MicroserviceData> list = microserviceService.getMicroserviceData();
+		return list;
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.PUT)
+	public PortalRestResponse<String> updateMicroservice(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("serviceId") long serviceId, @RequestBody MicroserviceData newServiceData) throws Exception {
+
+		if (newServiceData == null) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"MicroserviceData cannot be null or empty");
+		}
+		try {
+			microserviceService.updateMicroservice(serviceId, newServiceData);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+	
+	@RequestMapping(value = { "/portalApi/microservices/{serviceId}" }, method = RequestMethod.DELETE)
+	public PortalRestResponse<String> deleteMicroservice(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("serviceId") long serviceId) throws Exception {
+		try {
+			ParameterizedTypeReference<List<WidgetCatalog>> typeRef = new ParameterizedTypeReference<List<WidgetCatalog>>() {
+			};
+			// If this service is assoicated with widgets, cannnot be deleted
+			ResponseEntity<List<WidgetCatalog>> ans = (ResponseEntity<List<WidgetCatalog>>) template.exchange(
+					HTTPS + consulHealthService.getServiceLocation(whatService)
+							+ "/widget/microservices/widgetCatalog/service/" + serviceId,
+					HttpMethod.GET, new HttpEntity(WidgetServiceHeaders.getInstance()), typeRef);
+			List<WidgetCatalog> widgets = ans.getBody();
+			if(widgets.size() == 0)
+				microserviceService.deleteMicroservice(serviceId);
+			else{
+				StringBuilder sb = new StringBuilder();
+				for(int i = 0; i < widgets.size(); i++){
+					sb.append("'" + widgets.get(i).getName() + "' ");
+					if(i < (widgets.size()-1)){
+						sb.append(",");
+					}
+				}
+				return new PortalRestResponse<String>(PortalRestStatusEnum.WARN, "SOME WIDGETS ASSOICATE WITH THIS SERVICE", sb.toString());
+			}
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/MicroserviceProxyController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/MicroserviceProxyController.java
new file mode 100644
index 00000000..6724d4c6
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/MicroserviceProxyController.java
@@ -0,0 +1,108 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPUnRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.WidgetParameterResult;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.MicroserviceProxyService;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.HttpClientErrorException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@SuppressWarnings("unchecked")
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class MicroserviceProxyController extends EPUnRestrictedBaseController {
+
+	@Autowired
+	private MicroserviceProxyService microserviceProxyService;
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MicroserviceProxyController.class);
+
+	@RequestMapping(value = { "/portalApi/microservice/proxy/{serviceId}" }, method = {
+			RequestMethod.GET }, produces = "application/json")
+	public String getMicroserviceProxy(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("serviceId") long serviceId) throws Exception {
+		EPUser user = EPUserUtils.getUserSession(request);
+		String answer = "";
+		try{
+			answer = microserviceProxyService.proxyToDestination(serviceId, user, request);
+		}catch(HttpClientErrorException e){
+			//Check whether the error message is valid JSON format
+			boolean valid = true;
+			ObjectMapper objectMapper = new ObjectMapper();
+		    try{ 
+		        objectMapper.readTree(e.getResponseBodyAsString());
+		    } catch(JsonProcessingException exception){
+		        valid = false;
+		    }
+		    if(valid)
+		    	return e.getResponseBodyAsString();
+		    else
+		    	return "{\"error\":\""+ e.getResponseBodyAsString() +"\"}";
+		}
+		return answer;		
+	}
+	
+	@RequestMapping(value = { "/portalApi/microservice/proxy/parameter/{widgetId}" }, method = {
+			RequestMethod.GET }, produces = "application/json")
+	public String getMicroserviceProxyByWidgetId(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws Exception {
+		EPUser user = EPUserUtils.getUserSession(request);
+		String answer = "";
+		try{
+			answer = microserviceProxyService.proxyToDestinationByWidgetId(widgetId, user, request);
+		}catch(HttpClientErrorException e){
+			//Check whether the error message is valid JSON format
+			boolean valid = true;
+			ObjectMapper objectMapper = new ObjectMapper();
+		    try{ 
+		        objectMapper.readTree(e.getResponseBodyAsString());
+		    } catch(JsonProcessingException exception){
+		        valid = false;
+		    }
+		    if(valid)
+		    	return e.getResponseBodyAsString();
+		    else
+		    	return "{\"error\":\""+ e.getResponseBodyAsString() +"\"}";
+		}
+		return answer;		
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java
new file mode 100644
index 00000000..2499ec66
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/PortalAdminController.java
@@ -0,0 +1,200 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.domain.AuditLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.AuditService;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.PortalAdminService;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.PortalAdmin;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class PortalAdminController extends EPRestrictedBaseController {
+	@Autowired
+	PortalAdminService portalAdminService;
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	AuditService auditService;
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PortalAdminController.class);
+
+	@RequestMapping(value = { "/portalApi/portalAdmins" }, method = RequestMethod.GET, produces = "application/json")
+	public List<PortalAdmin> getPortalAdmins(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<PortalAdmin> portalAdmins = null;
+		if (user == null) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.getPortalAdmins, null user");
+			EcompPortalUtils.setBadPermissions(user, response, "getPortalAdmins");
+		} else if (!adminRolesService.isSuperAdmin(user)) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.getPortalAdmins, bad permissions");
+			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
+		} else {
+			// return the list of portal admins
+			portalAdmins = portalAdminService.getPortalAdmins();
+			logger.debug(EELFLoggerDelegate.debugLogger, "portalAdmins: called getPortalAdmins()");
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/getPortalAdmins", "result =", portalAdmins);
+		}
+
+		return portalAdmins;
+	}
+
+	/**
+	 * RESTful service method to create a new portal admin. Requirement: you
+	 * must be the Ecomp portal super admin user.
+	 */
+
+	@RequestMapping(value = { "/portalApi/portalAdmin" }, method = RequestMethod.POST)
+	public FieldsValidator createPortalAdmin(HttpServletRequest request, @RequestBody String sbcid,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		FieldsValidator fieldsValidator = null;
+		if (user == null) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.createPortalAdmin, null user");
+			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
+		} else if (!adminRolesService.isSuperAdmin(user)) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "PortalAdminController.createPortalAdmin bad permissions");
+			EcompPortalUtils.setBadPermissions(user, response, "createPortalAdmin");
+		} else {
+			fieldsValidator = portalAdminService.createPortalAdmin(sbcid);
+			int statusCode = fieldsValidator.httpStatusCode.intValue();
+			response.setStatus(statusCode);
+			if (statusCode == 200) {
+				AuditLog auditLog = new AuditLog();
+				auditLog.setUserId(user.getId());
+				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_ADD_PORTAL_ADMIN);
+				auditLog.setAffectedRecordId(sbcid);
+				auditService.logActivity(auditLog, null);
+
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				logger.info(EELFLoggerDelegate.auditLogger,
+						EPLogUtil.formatAuditLogMessage("PortalAdminController.createPortalAdmin",
+								EcompAuditLog.CD_ACTIVITY_ADD_PORTAL_ADMIN, user.getOrgUserId(), sbcid,
+								"A new Portal Admin has been added"));
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+			}
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalAdmin", "POST result =", response.getStatus());
+
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = { "/portalApi/portalAdmin/{userInfo}" }, method = RequestMethod.DELETE)
+	public FieldsValidator deletePortalAdmin(HttpServletRequest request, @PathVariable("userInfo") String userInfo,
+			 HttpServletResponse response) {
+		int userIdIdx = userInfo.indexOf("-");
+		Long userId = null;
+		String sbcid = null;
+		FieldsValidator fieldsValidator = null;
+		try{
+			if(userIdIdx==-1){
+				logger.error(EELFLoggerDelegate.errorLogger,"deletePortalAdmin missing userId");
+				return fieldsValidator;
+			}else{
+				String userIdStr = userInfo.substring(0, userIdIdx);
+				userId = Long.valueOf(userIdStr);
+				sbcid = userInfo.substring(userIdIdx+1, userInfo.length());
+			}
+		}catch(Exception e){
+			logger.error(EELFLoggerDelegate.errorLogger,"deletePortalAdmin error while parsing the userInfo",e);
+		}
+		EPUser user = EPUserUtils.getUserSession(request);
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "deletePortalAdmin");
+		} else {
+			fieldsValidator = portalAdminService.deletePortalAdmin(userId);
+			int statusCode = fieldsValidator.httpStatusCode.intValue();
+			response.setStatus(statusCode);
+			if (statusCode == 200) {
+				AuditLog auditLog = new AuditLog();
+				auditLog.setUserId(user.getId());
+				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_DELETE_PORTAL_ADMIN);
+				auditLog.setAffectedRecordId(sbcid);
+				auditService.logActivity(auditLog, null);
+
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				logger.info(EELFLoggerDelegate.auditLogger,
+						EPLogUtil.formatAuditLogMessage("PortalAdminController.deletePortalAdmin",
+								EcompAuditLog.CD_ACTIVITY_DELETE_PORTAL_ADMIN, user.getOrgUserId(), sbcid,
+								"A Portal Admin has been deleted"));
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+			}
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalAdmin", "DELETE result =", response.getStatus());
+
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/adminAppsRoles/{appId}" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EPRole> getRolesByApp(HttpServletRequest request, @PathVariable("appId") Long appId,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EPRole> rolesByApp = null;
+
+		try {
+			if (user == null) {
+				EcompPortalUtils.setBadPermissions(user, response, "getUserApps");
+			} else {
+				rolesByApp = adminRolesService.getRolesByApp(user, appId);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while performing getRolesByApp operation, Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+
+		return rolesByApp;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java
new file mode 100644
index 00000000..d567269f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/RoleManageController.java
@@ -0,0 +1,166 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.controller.core.RoleController;
+import org.openecomp.portalapp.controller.core.RoleFunctionListController;
+import org.openecomp.portalapp.controller.core.RoleListController;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+/**
+ * Proxies REST calls to role-management functions that arrive on paths
+ * /portalApi/* over to controller methods provided by the SDK-Core library.
+ * Those controller methods are mounted on paths not exposed by the Portal FE.
+ */
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class RoleManageController extends EPRestrictedBaseController {
+
+	@Autowired
+	private RoleController roleController;
+
+	@Autowired
+	private RoleListController roleListController;
+
+	@Autowired
+	private RoleFunctionListController roleFunctionListController;
+
+	/**
+	 * Calls an SDK-Core library method that gets the available roles and writes
+	 * them to the request object. Portal specifies a Hibernate mappings from
+	 * the Role class to the fn_role_v view, which ensures that only Portal
+	 * (app_id is null) roles are fetched.
+	 * 
+	 * Any method declared void (no return value) or returning null causes the
+	 * audit log aspect method to declare failure. TODO: should return a JSON
+	 * string.
+	 * 
+	 * @param request
+	 * @param response
+	 */
+	@RequestMapping(value = { "/portalApi/get_roles" }, method = RequestMethod.GET)
+	public void getRoles(HttpServletRequest request, HttpServletResponse response) {
+		getRoleListController().getRoles(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role_list/toggleRole" }, method = RequestMethod.POST)
+	public PortalRestResponse<String> toggleRole(HttpServletRequest request, HttpServletResponse response) {
+		PortalRestResponse<String> portalRestResponse = null;
+		try{
+			getRoleListController().toggleRole(request, response);
+			portalRestResponse = new PortalRestResponse<String>(PortalRestStatusEnum.OK, "success", null);
+		}catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "failure", e.getMessage());
+		}
+		return portalRestResponse;		
+	}
+
+	@RequestMapping(value = { "/portalApi/role_list/removeRole" }, method = RequestMethod.POST)
+	public ModelAndView removeRole(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return getRoleListController().removeRole(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role/saveRole" }, method = RequestMethod.POST)
+	public ModelAndView saveRole(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return getRoleController().saveRole(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role/removeRoleFunction" }, method = RequestMethod.POST)
+	public ModelAndView removeRoleRoleFunction(HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		return getRoleController().removeRoleFunction(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role/addRoleFunction" }, method = RequestMethod.POST)
+	public ModelAndView addRoleRoRoleFunction(HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		return getRoleController().addRoleFunction(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role/removeChildRole" }, method = RequestMethod.POST)
+	public ModelAndView removeChildRole(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return getRoleController().removeChildRole(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role/addChildRole" }, method = RequestMethod.POST)
+	public ModelAndView addChildRole(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		return getRoleController().addChildRole(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/get_role" }, method = RequestMethod.GET)
+	public void getRole(HttpServletRequest request, HttpServletResponse response) {
+		getRoleController().getRole(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/get_role_functions" }, method = RequestMethod.GET)
+	public void getRoleFunctionList(HttpServletRequest request, HttpServletResponse response) {
+		getRoleFunctionListController().getRoleFunctionList(request, response);
+	}
+
+	@RequestMapping(value = { "/portalApi/role_function_list/saveRoleFunction" }, method = RequestMethod.POST)
+	public void saveRoleFunction(HttpServletRequest request, HttpServletResponse response, @RequestBody String roleFunc) throws Exception {
+		getRoleFunctionListController().saveRoleFunction(request, response, roleFunc);
+	}
+
+	@RequestMapping(value = { "/portalApi/role_function_list/removeRoleFunction" }, method = RequestMethod.POST)
+	public void removeRoleFunction(HttpServletRequest request, HttpServletResponse response, @RequestBody String roleFunc) throws Exception {
+		getRoleFunctionListController().removeRoleFunction(request, response, roleFunc);
+	}
+
+	public RoleListController getRoleListController() {
+		return roleListController;
+	}
+
+	public void setRoleListController(RoleListController roleListController) {
+		this.roleListController = roleListController;
+	}
+
+	public RoleController getRoleController() {
+		return roleController;
+	}
+
+	public void setRoleController(RoleController roleController) {
+		this.roleController = roleController;
+	}
+
+	public RoleFunctionListController getRoleFunctionListController() {
+		return roleFunctionListController;
+	}
+
+	public void setRoleFunctionListController(RoleFunctionListController roleFunctionListController) {
+		this.roleFunctionListController = roleFunctionListController;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java
new file mode 100644
index 00000000..a59a4579
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/SharedContextRestController.java
@@ -0,0 +1,343 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedRESTfulBaseController;
+import org.openecomp.portalapp.portal.domain.SharedContext;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.SharedContextService;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * The shared-context feature allows onboarded applications to share data among
+ * themselves easily for a given session. It basically implements a Java map:
+ * put or get a key-value pair within a map identified by a session ID.
+ * 
+ * This REST endpoint listens on the Portal app server and answers requests made
+ * by back-end application servers. Reads and writes values to the database
+ * using a Hibernate service to ensure all servers in a high-availability
+ * cluster see the same data.
+ */
+@Configuration
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API + "/context")
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class SharedContextRestController extends EPRestrictedRESTfulBaseController {
+
+	/**
+	 * Model for a one-element JSON object returned by many methods. 
+	 */
+	class SharedContextJsonResponse {
+		String response;
+	}
+	
+	/**
+	 * Access to the database
+	 */
+	@Autowired
+	private SharedContextService contextService;
+
+	/**
+	 * Logger for debug etc.
+	 */
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SharedContextRestController.class);
+
+	/**
+	 * Reusable JSON (de)serializer
+	 */
+	private final ObjectMapper mapper = new ObjectMapper();
+
+	/**
+	 * Gets a value for the specified context and key (RESTful service method).
+	 * 
+	 * @param ctxtId
+	 *            ID that identifies the context, usually the ECOMP Portal
+	 *            session key.
+	 * @param ckey
+	 *            Key for the key-value pair to fetch
+	 * @return JSON with shared context object; response=null if not found.
+	 */
+	@ApiOperation(value = "Gets a value for the specified context and key.", response = SharedContext.class)
+	@RequestMapping(value = { "/get" }, method = RequestMethod.GET, produces = "application/json")
+	public String getContext(HttpServletRequest request, @RequestParam String context_id, @RequestParam String ckey)
+			throws Exception {
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "getContext for ID " + context_id + ", key " + ckey);
+		if (context_id == null || ckey == null)
+			throw new Exception("Received null for context_id and/or ckey");
+
+		SharedContext context = contextService.getSharedContext(context_id, ckey);
+		String jsonResponse = "";
+		if (context == null)
+			jsonResponse = convertResponseToJSON(context);
+		else
+			jsonResponse = mapper.writeValueAsString(context);
+
+		return jsonResponse;
+	}
+
+	/**
+	 * Gets user information for the specified context (RESTful service method).
+	 * 
+	 * @param ctxtId
+	 *            ID that identifies the context, usually the ECOMP Portal
+	 *            session key.
+	 * 
+	 * @return List of shared-context objects as JSON; should have user's first
+	 *         name, last name and email address; null if none found
+	 */
+	@ApiOperation(value = "Gets user information for the specified context.", response = SharedContext.class, responseContainer = "List")
+	@RequestMapping(value = { "/get_user" }, method = RequestMethod.GET, produces = "application/json")
+	public String getUserContext(HttpServletRequest request, @RequestParam String context_id) throws Exception {
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "getUserContext for ID " + context_id);
+		if (context_id == null)
+			throw new Exception("Received null for context_id");
+
+		List<SharedContext> listSharedContext = new ArrayList<SharedContext>();
+		SharedContext firstNameContext = contextService.getSharedContext(context_id,
+				EPCommonSystemProperties.USER_FIRST_NAME);
+		SharedContext lastNameContext = contextService.getSharedContext(context_id,
+				EPCommonSystemProperties.USER_LAST_NAME);
+		SharedContext emailContext = contextService.getSharedContext(context_id, EPCommonSystemProperties.USER_EMAIL);
+		SharedContext attuidContext = contextService.getSharedContext(context_id,
+				EPCommonSystemProperties.USER_ORG_USERID);
+		if (firstNameContext != null)
+			listSharedContext.add(firstNameContext);
+		if (lastNameContext != null)
+			listSharedContext.add(lastNameContext);
+		if (emailContext != null)
+			listSharedContext.add(emailContext);
+		if (attuidContext != null)
+			listSharedContext.add(attuidContext);
+		String jsonResponse = convertResponseToJSON(listSharedContext);
+		return jsonResponse;
+	}
+
+	/**
+	 * Tests for presence of the specified key in the specified context (RESTful
+	 * service method).
+	 * 
+	 * @param context_id
+	 *            ID that identifies the context, usually the ECOMP Portal
+	 *            session key.
+	 * @param ckey
+	 *            Key for the key-value pair to test
+	 * @return JSON with result indicating whether the context and key were
+	 *         found.
+	 */
+	@ApiOperation(value = "Tests for presence of the specified key in the specified context.", response = SharedContextJsonResponse.class)
+	@RequestMapping(value = { "/check" }, method = RequestMethod.GET, produces = "application/json")
+	public String checkContext(HttpServletRequest request, @RequestParam String context_id, @RequestParam String ckey)
+			throws Exception {
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "checkContext for " + context_id + ", key " + ckey);
+		if (context_id == null || ckey == null)
+			throw new Exception("Received null for contextId and/or key");
+
+		String response = null;
+		SharedContext context = contextService.getSharedContext(context_id, ckey);
+		if (context != null)
+			response = "exists";
+
+		String jsonResponse = convertResponseToJSON(response);
+		return jsonResponse;
+	}
+
+	/**
+	 * Removes the specified key in the specified context (RESTful service
+	 * method).
+	 * 
+	 * @param context_id
+	 *            ID that identifies the context, usually the ECOMP Portal
+	 *            session key.
+	 * @param ckey
+	 *            Key for the key-value pair to remove
+	 * @return JSON with result indicating whether the context and key were
+	 *         found.
+	 */
+	@ApiOperation(value = "Removes the specified key in the specified context.", response = SharedContextJsonResponse.class)
+	@RequestMapping(value = { "/remove" }, method = RequestMethod.GET, produces = "application/json")
+	public String removeContext(HttpServletRequest request, @RequestParam String context_id, @RequestParam String ckey)
+			throws Exception {
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "removeContext for " + context_id + ", key " + ckey);
+		if (context_id == null || ckey == null)
+			throw new Exception("Received null for contextId and/or key");
+
+		SharedContext context = contextService.getSharedContext(context_id, ckey);
+		String response = null;
+		if (context != null) {
+			contextService.deleteSharedContext(context);
+			response = "removed";
+		}
+
+		String jsonResponse = convertResponseToJSON(response);
+		return jsonResponse;
+	}
+
+	/**
+	 * Clears all key-value pairs in the specified context (RESTful service
+	 * method).
+	 * 
+	 * @param context_id
+	 *            ID that identifies the context, usually the ECOMP Portal
+	 *            session key.
+	 * @return JSON with result indicating the number of key-value pairs
+	 *         removed.
+	 */
+	@ApiOperation(value = "Clears all key-value pairs in the specified context.", response = SharedContextJsonResponse.class)
+	@RequestMapping(value = { "/clear" }, method = RequestMethod.GET, produces = "application/json")
+	public String clearContext(HttpServletRequest request, @RequestParam String context_id) throws Exception {
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "clearContext for " + context_id);
+		if (context_id == null)
+			throw new Exception("clearContext: Received null for contextId");
+
+		int count = contextService.deleteSharedContexts(context_id);
+		String jsonResponse = convertResponseToJSON(Integer.toString(count));
+		return jsonResponse;
+	}
+
+	/**
+	 * Sets a context value for the specified context and key (RESTful service
+	 * method). Creates the context if no context with the specified ID-key pair
+	 * exists, overwrites the value if it exists already.
+	 * 
+	 * @param userJson
+	 *            JSON block with these tag-value pairs:
+	 *            <UL>
+	 *            <LI>context_id: ID that identifies the context
+	 *            <LI>ckey: Key for the key-value pair to store
+	 *            <LI>cvalue: Value to store
+	 *            </UL>
+	 * @return JSON with result indicating whether the value was added (key not
+	 *         previously known) or replaced (key previously known).
+	 */
+	@ApiOperation(value = "Sets a context value for the specified context and key. Creates the context if no context with the specified ID-key pair exists, overwrites the value if it exists already.", response = SharedContextJsonResponse.class)
+	@RequestMapping(value = { "/set" }, method = RequestMethod.POST, produces = "application/json")
+	public String setContext(HttpServletRequest request, @RequestBody String userJson) throws Exception {
+
+		@SuppressWarnings("unchecked")
+		Map<String, Object> userData = mapper.readValue(userJson, Map.class);
+		// Use column names as JSON tags
+		final String contextId = (String) userData.get("context_id");
+		final String key = (String) userData.get("ckey");
+		final String value = (String) userData.get("cvalue");
+		if (contextId == null || key == null)
+			throw new Exception("setContext: received null for contextId and/or key");
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "setContext: ID " + contextId + ", key " + key + "->" + value);
+		String response = null;
+		SharedContext existing = contextService.getSharedContext(contextId, key);
+		if (existing == null) {
+			contextService.addSharedContext(contextId, key, value);
+		} else {
+			existing.setCvalue(value);
+			contextService.saveSharedContext(existing);
+		}
+		response = existing == null ? "added" : "replaced";
+		String jsonResponse = convertResponseToJSON(response);
+		return jsonResponse;
+	}
+
+	/**
+	 * Creates a two-element JSON object tagged "response".
+	 * 
+	 * @param responseBody
+	 * @return JSON object as String
+	 * @throws JsonProcessingException
+	 */
+	private String convertResponseToJSON(String responseBody) throws JsonProcessingException {
+		Map<String, String> responseMap = new HashMap<String, String>();
+		responseMap.put("response", responseBody);
+		String response = mapper.writeValueAsString(responseMap);
+		return response;
+	}
+
+	/**
+	 * Converts a list of SharedContext objects to a JSON array.
+	 * 
+	 * @param contextList
+	 * @return JSON array as String
+	 * @throws JsonProcessingException
+	 */
+	private String convertResponseToJSON(List<SharedContext> contextList) throws JsonProcessingException {
+		String jsonArray = mapper.writeValueAsString(contextList);
+		return jsonArray;
+	}
+
+	/**
+	 * Creates a JSON object with the content of the shared context; null is ok.
+	 * 
+	 * @param responseBody
+	 * @return tag "response" with collection of context object's fields
+	 * @throws JsonProcessingException
+	 */
+	private String convertResponseToJSON(SharedContext context) throws JsonProcessingException {
+		Map<String, Object> responseMap = new HashMap<String, Object>();
+		responseMap.put("response", context);
+		String responseBody = mapper.writeValueAsString(responseMap);
+		return responseBody;
+	}
+
+	/**
+	 * Handles any exception thrown by a method in this controller.
+	 * 
+	 * @param e
+	 *            Exception
+	 * @param response
+	 *            HttpServletResponse
+	 * @throws IOException
+	 */
+	@ExceptionHandler(Exception.class)
+	protected void handleBadRequests(Exception e, HttpServletResponse response) throws IOException {
+		logger.error(EELFLoggerDelegate.errorLogger, "handleBadRequest caught exception", e);
+		response.sendError(HttpStatus.BAD_REQUEST.value(), e.getMessage());
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java
new file mode 100644
index 00000000..0dd344d7
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/TicketEventController.java
@@ -0,0 +1,179 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.UserNotificationService;
+import org.openecomp.portalapp.portal.transport.EpNotificationItem;
+import org.openecomp.portalapp.portal.transport.EpRoleNotificationItem;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * Receives messages from the Collaboration Bus (C-BUS) notification and event
+ * brokering tool. Creates notifications for ECOMP Portal users.
+ */
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API)
+@Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class TicketEventController implements BasicAuthenticationController {
+
+	@Autowired
+	private UserNotificationService userNotificationService;
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(TicketEventController.class);
+
+	public boolean isAuxRESTfulCall() {
+		return true;
+	}
+
+	private final ObjectMapper mapper = new ObjectMapper();
+
+	@ApiOperation(value = "Accepts messages from external ticketing systems and creates notifications for Portal users.", response = PortalRestResponse.class)
+	@RequestMapping(value = { "/ticketevent" }, method = RequestMethod.POST)
+	public PortalRestResponse<String> handleRequest(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody String ticketEventJson) throws Exception {
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "Ticket Event notification" + ticketEventJson);
+		PortalRestResponse<String> portalResponse = new PortalRestResponse<>();
+		try {
+			JsonNode ticketEventNotif = mapper.readTree(ticketEventJson);
+
+			// Reject request if required fields are missing.
+			String error = validateTicketEventMessage(ticketEventNotif);
+			if (error != null) {
+				portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+				portalResponse.setMessage(error);
+				response.setStatus(400);
+				return portalResponse;
+			}
+
+			EpNotificationItem epItem = new EpNotificationItem();
+			epItem.setCreatedDate(new Date());
+			epItem.setIsForOnlineUsers("Y");
+			epItem.setIsForAllRoles("N");
+			epItem.setActiveYn("Y");
+			//JsonNode application = ticketEventNotif.get("application");
+			JsonNode event = ticketEventNotif.get("event");
+			JsonNode header = event.get("header");
+			JsonNode body = event.get("body");
+			epItem.setMsgDescription(body.toString());
+			Long eventDate = body.get("eventDate").asLong();
+
+			String assetID = body.get("assetID").asText();
+			epItem.setMsgHeader(assetID);
+			String eventSource = header.get("eventSource").asText();
+			epItem.setMsgSource(eventSource);
+			epItem.setStartTime(new Date(eventDate));
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(epItem.getStartTime());
+			int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
+			calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth + 30);
+			epItem.setEndTime(calendar.getTime());
+			String severityString=  (body.get("severity").toString()).substring(1, 2);
+			Long  severity=Long.parseLong(severityString);
+			epItem.setPriority(severity);
+			epItem.setCreatorId(null);
+			Set<EpRoleNotificationItem> roles = new HashSet<>();
+			JsonNode SubscriberInfo = ticketEventNotif.get("SubscriberInfo");
+			JsonNode userList = SubscriberInfo.get("UserList");
+			String UserIds[] = userList.toString().replace("[", "").replace("]", "").trim().replace("\"", "")
+					.split(",");
+			List<EPUser> users = userNotificationService.getUsersByOrgIds(Arrays.asList(UserIds));
+			for (String userId : UserIds) {
+				EpRoleNotificationItem roleNotifItem = new EpRoleNotificationItem();
+				for (EPUser user : users) {
+					if (user.getOrgUserId().equals(userId)) {
+						roleNotifItem.setRecvUserId(user.getId().intValue());
+						roles.add(roleNotifItem);
+						break;
+					}
+				}
+
+			}
+			epItem.setRoles(roles);
+			userNotificationService.saveNotification(epItem);
+
+			portalResponse.setStatus(PortalRestStatusEnum.OK);
+			portalResponse.setMessage("processEventNotification: notification created");
+			portalResponse.setResponse("NotificationId is :" + epItem.notificationId);
+		} catch (Exception ex) {
+			portalResponse.setStatus(PortalRestStatusEnum.ERROR);
+			response.setStatus(400);
+			portalResponse.setMessage(ex.toString());
+		}
+		return portalResponse;
+	}
+
+	/**
+	 * Validates that mandatory fields are present.
+	 * 
+	 * @param ticketEventNotif
+	 * @return Error message if a problem is found; null if all is well.
+	 */
+	private String validateTicketEventMessage(JsonNode ticketEventNotif) {
+		JsonNode application = ticketEventNotif.get("application");
+		JsonNode event = ticketEventNotif.get("event");
+		JsonNode header = event.get("header");
+		JsonNode body = event.get("body");
+		JsonNode SubscriberInfo = ticketEventNotif.get("SubscriberInfo");
+		if (application == null)
+			return "application is mandatory";
+		if (body == null)
+			return "body is mandatory";
+		if (body.get("assetID") == null)
+			return "Asset Id is mandatory";
+		if (body.get("eventDate") == null)
+			return "Event Date is mandatory";
+		if (header.get("eventSource") == null)
+			return "Message Source is mandatory";
+		if (SubscriberInfo.get("UserList") == null)
+			return "At least one user Id is mandatory";
+		return null;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/UserNotificationController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/UserNotificationController.java
new file mode 100644
index 00000000..777fb91d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/UserNotificationController.java
@@ -0,0 +1,216 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompAppRole;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.FunctionalMenuService;
+import org.openecomp.portalapp.portal.service.UserNotificationService;
+import org.openecomp.portalapp.portal.transport.EpNotificationItem;
+import org.openecomp.portalapp.portal.transport.EpNotificationItemVO;
+import org.openecomp.portalapp.portal.transport.EpRoleNotificationItem;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuRole;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class UserNotificationController extends EPRestrictedBaseController {
+
+	@Autowired
+	FunctionalMenuService functionalMenuService;
+
+	@Autowired
+	UserNotificationService userNotificationService;
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserNotificationController.class);
+
+	@RequestMapping(value = {
+			"/portalApi/getFunctionalMenuRole" }, method = RequestMethod.GET, produces = "application/json")
+	public List<FunctionalMenuRole> getMenuIdRoleId(HttpServletRequest request, HttpServletResponse response) {
+		// EPUser user = EPUserUtils.getUserSession(request);
+		List<FunctionalMenuRole> menuRoleList = null;
+		menuRoleList = functionalMenuService.getFunctionalMenuRole();
+		return menuRoleList;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/getNotifications" }, method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<List<EpNotificationItem>> getNotifications(HttpServletRequest request,
+			HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		PortalRestResponse<List<EpNotificationItem>> portalRestResponse = null;
+		try {
+			List<EpNotificationItem> notificationList = userNotificationService.getNotifications(user.getId());
+			portalRestResponse = new PortalRestResponse<List<EpNotificationItem>>(PortalRestStatusEnum.OK, "success",
+					notificationList);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAllAppsAndContacts failed", e);
+			portalRestResponse = new PortalRestResponse<List<EpNotificationItem>>(PortalRestStatusEnum.ERROR,
+					e.getMessage(), null);
+		}
+		return portalRestResponse;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/getAdminNotifications" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EpNotificationItemVO> getAdminNotifications(HttpServletRequest request, HttpServletResponse response) {
+		List<EpNotificationItemVO> adminNotificationList = null;
+		adminNotificationList = userNotificationService.getAdminNotificationVOS();
+		return adminNotificationList;
+	}
+
+	@RequestMapping(value = "/portalApi/saveNotification", method = RequestMethod.POST, produces = "application/json")
+	public PortalRestResponse<String> save(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody EpNotificationItem notificationItem) {
+
+		if (notificationItem == null || notificationItem.getMsgHeader() == null)
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"Notification Header cannot be null or empty");
+		if (notificationItem.getEndTime().compareTo(notificationItem.getStartTime()) < 0) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"End Time should be greater than  start time");
+		}
+
+		if ((notificationItem.getIsForAllRoles() == "N") && notificationItem.getRoleIds().isEmpty()) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE",
+					"No Roles Ids Exist for the selected Roles");
+		}
+
+		Long creatorId = UserUtils.getUserIdAsLong(request);
+		notificationItem.setCreatorId(creatorId);
+
+		// Front-end date picker does not accept a time value, so all
+		// values are the start of the chosen day in the local time zone.
+		// Move the end time value to the very end of the chosen day.
+		// Avoid Calendar.getDefault() which uses the server's locale.
+		Long endTime = notificationItem.getEndTime().getTime();
+		endTime += (23 * 3600 + 59 * 60 + 59) * 1000;
+		notificationItem.getEndTime().setTime(endTime);
+
+		try {
+			userNotificationService.saveNotification(notificationItem);
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/notificationUpdateRate" }, method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, String>> getNotificationUpdateRate(HttpServletRequest request) {
+		try {
+			String updateRate = SystemProperties.getProperty(EPCommonSystemProperties.NOTIFICATION_UPDATE_RATE);
+			String updateDuration = SystemProperties.getProperty(EPCommonSystemProperties.NOTIFICATION_UPDATE_DURATION);
+			Integer rateInMiliSec = Integer.valueOf(updateRate) * 1000;
+			Integer durationInMiliSec = Integer.valueOf(updateDuration) * 1000;
+			Map<String, String> results = new HashMap<String, String>();
+			results.put("updateRate", String.valueOf(rateInMiliSec));
+			results.put("updateDuration", String.valueOf(durationInMiliSec));
+			return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", results);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getNotificationUpdateRate failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/notificationRead" }, method = RequestMethod.GET, produces = "application/json")
+	public PortalRestResponse<Map<String, String>> notificationRead(
+			@RequestParam("notificationId") String notificationID, HttpServletRequest request) {
+		try {
+			userNotificationService.setNotificationRead(Long.parseLong(notificationID), UserUtils.getUserId(request));
+			return new PortalRestResponse<>(PortalRestStatusEnum.OK, "success", null);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "notificationRead failed", e);
+			return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, e.toString(), null);
+		}
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/getNotificationHistory" }, method = RequestMethod.GET, produces = "application/json")
+	public List<EpNotificationItemVO> getNotificationHistory(HttpServletRequest request, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EpNotificationItemVO> notificationList = null;
+		notificationList = userNotificationService.getNotificationHistoryVO(user.getId());
+		return notificationList;
+	}
+
+	@RequestMapping(value = { "/portalApi/notificationRole/{notificationId}/roles" }, method = {
+			RequestMethod.GET }, produces = "application/json")
+	public List<Integer> testGetRoles(HttpServletRequest request, @PathVariable("notificationId") Long notificationId) {
+		List<EpRoleNotificationItem> NotifRoles = userNotificationService.getNotificationRoles(notificationId);
+		ArrayList<Integer> rolesList = new ArrayList<Integer>();
+		for (EpRoleNotificationItem notifRole : NotifRoles) {
+			rolesList.add(notifRole.roleId);
+		}
+		return rolesList;
+	}
+
+	@RequestMapping(value = { "/portalApi/getNotificationAppRoles" }, method = {
+			RequestMethod.GET }, produces = "application/json")
+	public List<EcompAppRole> getNotificationAppRoles(HttpServletRequest request, HttpServletResponse response) {
+		List<EcompAppRole> epAppRoleList = null;
+		try {
+			epAppRoleList = userNotificationService.getAppRoleList();
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while performing UserNofiticationController.getNotificationAppRoles. Details: ",
+					e);
+		}
+		return epAppRoleList;
+	}
+	
+	@RequestMapping(value = {
+			"/portalApi/getMessageRecipients" }, method = RequestMethod.GET, produces = "application/json")
+	public List<String> getMessageRecipients(@RequestParam("notificationId") Long notificationID) {
+		// EPUser user = EPUserUtils.getUserSession(request);
+		List<String> messageUserRecipients = null;
+		messageUserRecipients = userNotificationService.getMessageRecipients(notificationID);
+		return messageUserRecipients;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/UserRolesController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/UserRolesController.java
new file mode 100644
index 00000000..719b7d45
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/UserRolesController.java
@@ -0,0 +1,435 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cxf.transport.http.HTTPException;
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserAppCatalogRoles;
+import org.openecomp.portalapp.portal.domain.EcompAuditLog;
+import org.openecomp.portalapp.portal.domain.ExternalSystemAccess;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.AdminRolesService;
+import org.openecomp.portalapp.portal.service.ApplicationsRestClientService;
+import org.openecomp.portalapp.portal.service.SearchService;
+import org.openecomp.portalapp.portal.service.UserRolesService;
+import org.openecomp.portalapp.portal.transport.AppNameIdIsAdmin;
+import org.openecomp.portalapp.portal.transport.AppWithRolesForUser;
+import org.openecomp.portalapp.portal.transport.AppsListWithAdminRole;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.RoleInAppForUser;
+import org.openecomp.portalapp.portal.transport.UserApplicationRoles;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.domain.AuditLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.restful.domain.EcompRole;
+import org.openecomp.portalsdk.core.service.AuditService;
+import org.openecomp.portalsdk.core.service.RoleService;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class UserRolesController extends EPRestrictedBaseController {
+
+	@Autowired
+	SearchService searchService;
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	UserRolesService userRolesService;
+	@Autowired
+	ApplicationsRestClientService applicationsRestClientService;
+	@Autowired
+	RoleService roleService;
+	@Autowired
+	AuditService auditService;
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserRolesController.class);
+	
+	static final String FAILURE = "failure";
+
+	/**
+	 * RESTful service method to fetch users in the WebPhone external service
+	 * 
+	 * @return array of found users as json
+	 */
+	@RequestMapping(value = { "/portalApi/queryUsers" }, method = RequestMethod.GET, produces = "application/json")
+	public String getPhoneBookSearchResult(HttpServletRequest request, @RequestParam("search") String searchString, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		String searchResult = null;
+		if (!adminRolesService.isSuperAdmin(user) && !adminRolesService.isAccountAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "getPhoneBookSearchResult");
+		} else {
+			searchString = searchString.trim();
+			if (searchString.length() > 2) {
+				searchResult = searchService.searchUsersInPhoneBook(searchString);
+			} else {
+				logger.info(EELFLoggerDelegate.errorLogger, "getPhoneBookSearchResult - too short search string: " + searchString);
+			}
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/queryUsers", "result =", searchResult);
+		
+		return searchResult;
+	}
+
+	/**
+	 * RESTful service method to fetch applications where user is admin
+	 * 
+	 * @return for GET: array of all applications with boolean isAdmin=true/false for each application
+	 */
+	@RequestMapping(value = { "/portalApi/adminAppsRoles" }, method = { RequestMethod.GET }, produces = "application/json")
+	public AppsListWithAdminRole getAppsWithAdminRoleStateForUser(HttpServletRequest request, @RequestParam("user") String orgUserId,
+			HttpServletResponse response) {
+		
+		EPUser user = EPUserUtils.getUserSession(request);
+		AppsListWithAdminRole result = null;
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "getAppsWithAdminRoleStateForUser");
+		} else {
+			if (EcompPortalUtils.legitimateUserId(orgUserId)) {
+				result = adminRolesService.getAppsWithAdminRoleStateForUser(orgUserId);
+			} else {
+				logger.info(EELFLoggerDelegate.errorLogger, "getAppsWithAdminRoleStateForUser - parms error, no Organization User ID");
+				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+			}
+		}
+
+		StringBuilder adminAppRoles = new StringBuilder();
+		if(result != null && result.appsRoles.size() >= 1) {
+			adminAppRoles.append("User '" + result.orgUserId + "' has admin role to the apps = {");
+			for(AppNameIdIsAdmin adminAppRole : result.appsRoles) {
+				if (adminAppRole.isAdmin) {
+					adminAppRoles.append(adminAppRole.appName + ", ");
+				}
+			}
+			adminAppRoles.append("}.");
+		} else {
+			adminAppRoles.append("User '" + result.orgUserId + "' has no Apps with Admin Role.");
+		}
+		logger.info(EELFLoggerDelegate.errorLogger, adminAppRoles.toString());
+		
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/adminAppsRoles", "get result =", result);
+
+		return result;
+	}
+
+	@RequestMapping(value = { "/portalApi/adminAppsRoles" }, method = { RequestMethod.PUT }, produces = "application/json")
+	public FieldsValidator putAppsWithAdminRoleStateForUser(HttpServletRequest request, @RequestBody AppsListWithAdminRole newAppsListWithAdminRoles,
+			HttpServletResponse response) {
+		
+		//newAppsListWithAdminRoles.appsRoles
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		StringBuilder newAppRoles = new StringBuilder();
+		if(newAppsListWithAdminRoles != null && newAppsListWithAdminRoles.appsRoles.size() >= 1) {
+			newAppRoles.append("User '" + newAppsListWithAdminRoles.orgUserId + "' has admin role to the apps = { ");
+			for(AppNameIdIsAdmin adminAppRole : newAppsListWithAdminRoles.appsRoles) {
+				if (adminAppRole.isAdmin) {
+					newAppRoles.append(adminAppRole.appName + " ,");
+				}
+			}
+			newAppRoles.deleteCharAt(newAppRoles.length()-1);
+			newAppRoles.append("}.");
+		} else {
+			newAppRoles.append("User '" + newAppsListWithAdminRoles.orgUserId + "' has no Apps with Admin Role.");
+		}
+		logger.info(EELFLoggerDelegate.errorLogger, newAppRoles.toString());
+			
+		EPUser user = EPUserUtils.getUserSession(request);
+		boolean changesApplied = false;
+		
+		if (!adminRolesService.isSuperAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "putAppsWithAdminRoleStateForUser");
+		} else {
+			changesApplied = adminRolesService.setAppsWithAdminRoleStateForUser(newAppsListWithAdminRoles);
+			AuditLog auditLog = new AuditLog();
+			auditLog.setUserId(user.getId());
+			auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN);
+			auditLog.setAffectedRecordId(newAppsListWithAdminRoles.orgUserId);
+			auditLog.setComments(newAppRoles.toString());
+			auditService.logActivity(auditLog, null);
+
+			MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());		
+			MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+			logger.info(EELFLoggerDelegate.auditLogger, EPLogUtil.formatAuditLogMessage("UserRolesController.putAppsWithAdminRoleStateForUser", 
+					EcompAuditLog.CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN, user.getOrgUserId(), newAppsListWithAdminRoles.orgUserId, newAppRoles.toString()));			
+			MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+			MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+		}
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/adminAppsRoles", "put result =", changesApplied);
+		
+		return fieldsValidator;
+	}
+
+	@RequestMapping(value = { "/portalApi/userAppRoles" }, method = { RequestMethod.GET }, produces = "application/json")
+	public List<RoleInAppForUser> getAppRolesForUser(HttpServletRequest request, @RequestParam("user") String orgUserId, @RequestParam("app") Long appid, HttpServletResponse response) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<RoleInAppForUser> result = null;
+		String feErrorString = "";
+		if (!adminRolesService.isAccountAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "getAppRolesForUser");
+			feErrorString = EcompPortalUtils.getFEErrorString(true, response.getStatus());
+		} else {
+			if (EcompPortalUtils.legitimateUserId(orgUserId)) {
+				result = userRolesService.getAppRolesForUser(appid, orgUserId);
+				int responseCode = EcompPortalUtils.getExternalAppResponseCode();
+				if (responseCode != 0 && responseCode != 200) {
+					// external error
+					response.setStatus(responseCode);
+					feErrorString = EcompPortalUtils.getFEErrorString(false, responseCode);
+				} else if (result == null) {
+					// If the result is null, there was an internal ecomp error in the service call.
+					response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+					feErrorString = EcompPortalUtils.getFEErrorString(true, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+				}
+			} else {
+				logger.info(EELFLoggerDelegate.errorLogger, "getAppRolesForUser - no Organization User ID");
+				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+				feErrorString = EcompPortalUtils.getFEErrorString(true, HttpServletResponse.SC_BAD_REQUEST);
+			}
+		}
+		
+		StringBuilder sbUserApps = new StringBuilder();
+		if (result!=null && result.size()>=1) {
+			sbUserApps.append("User '" + orgUserId + "' has Roles={");
+			for(RoleInAppForUser appRole : result) {
+				if (appRole.isApplied) {
+					sbUserApps.append(appRole.roleName + ", ");
+				}
+			}
+			sbUserApps.append("} assigned to the appId '" + appid + "'.");
+		} else {
+			//Not sure creating an empty object will make any difference
+			//but would like to give it a shot for defect #DE221057
+			if (result==null) {
+				result = new ArrayList<RoleInAppForUser>();
+			}
+			sbUserApps.append("User '" + orgUserId + "' and appid " + appid + " has no roles");
+		}
+		logger.info(EELFLoggerDelegate.errorLogger, sbUserApps.toString());
+		
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppRoles", "get result =", result);
+		if (feErrorString != "") {
+			logger.debug(EELFLoggerDelegate.debugLogger, "LR: FEErrorString to header: "+feErrorString);
+
+			response.addHeader("FEErrorString", feErrorString);
+			response.addHeader("Access-Control-Expose-Headers", "FEErrorString");
+		}
+		return result;
+	}
+
+	@RequestMapping(value = { "/portalApi/userAppRoles" }, method = { RequestMethod.PUT }, produces = "application/json")
+	public FieldsValidator putAppWithUserRoleStateForUser(HttpServletRequest request, @RequestBody AppWithRolesForUser newAppRolesForUser,
+			HttpServletResponse response) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		StringBuilder sbUserApps = new StringBuilder();
+		if (newAppRolesForUser!=null) {
+			sbUserApps.append("User '" + newAppRolesForUser.orgUserId);
+			if (newAppRolesForUser.appRoles!=null && newAppRolesForUser.appRoles.size()>=1) {
+				sbUserApps.append("' has roles = { ");
+				for(RoleInAppForUser appRole : newAppRolesForUser.appRoles) {
+						if (appRole.isApplied) {
+							sbUserApps.append(appRole.roleName + " ,");
+						}
+				}
+				sbUserApps.deleteCharAt(sbUserApps.length()-1);
+				sbUserApps.append("} assigned for the app " + newAppRolesForUser.appId);
+			} else {
+				sbUserApps.append("' has no roles assigned for app " + newAppRolesForUser.appId);
+			}
+		}
+		logger.info(EELFLoggerDelegate.applicationLogger, "putAppWithUserRoleStateForUser: {}", sbUserApps.toString());
+		
+		EPUser user = EPUserUtils.getUserSession(request);
+		boolean changesApplied = false;
+		if (!adminRolesService.isAccountAdmin(user)) {
+			EcompPortalUtils.setBadPermissions(user, response, "putAppWithUserRoleStateForUser");
+		} else {
+			changesApplied = userRolesService.setAppWithUserRoleStateForUser(user, newAppRolesForUser);
+			if (changesApplied){
+				logger.info(EELFLoggerDelegate.applicationLogger, "putAppWithUserRoleStateForUser: succeeded for app {}, user {}", 
+						newAppRolesForUser.appId, newAppRolesForUser.orgUserId);
+				AuditLog auditLog = new AuditLog();
+				auditLog.setUserId(user.getId());
+				auditLog.setActivityCode(EcompAuditLog.CD_ACTIVITY_UPDATE_USER);
+				auditLog.setAffectedRecordId(newAppRolesForUser.orgUserId);
+				auditLog.setComments(sbUserApps.toString());
+				MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());		
+				auditService.logActivity(auditLog, null);
+				MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+				logger.info(EELFLoggerDelegate.auditLogger, EPLogUtil.formatAuditLogMessage("UserRolesController.putAppWithUserRoleStateForUser", 
+						EcompAuditLog.CD_ACTIVITY_UPDATE_USER, user.getOrgUserId(), newAppRolesForUser.orgUserId, sbUserApps.toString()));
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+				MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+			} else {
+				logger.error(EELFLoggerDelegate.errorLogger, "putAppWithUserRoleStateForUser: failed for app {}, user {}", 
+						newAppRolesForUser.appId, newAppRolesForUser.orgUserId);
+			}
+		}
+
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userAppRoles", "put result =", changesApplied);
+		return fieldsValidator;
+	}
+	
+	@RequestMapping(value = { "/portalApi/updateRemoteUserProfile" }, method = { RequestMethod.GET }, produces = "application/json")
+	public PortalRestResponse<String> updateRemoteUserProfile(HttpServletRequest request,HttpServletResponse response) {
+		
+		String updateRemoteUserFlag = FAILURE;
+		try {
+			//saveNewUser = userService.saveNewUser(newUser);
+			String orgUserId = request.getParameter("loginId");
+			Long appId = Long.parseLong(request.getParameter("appId"));
+			userRolesService.updateRemoteUserProfile(orgUserId, appId);
+			
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.OK, updateRemoteUserFlag, e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, updateRemoteUserFlag, "");
+		
+	}
+
+	@RequestMapping(value = { "/portalApi/app/{appId}/users" }, method = { RequestMethod.GET }, produces = "application/json")
+	public List<UserApplicationRoles> getUsersFromAppEndpoint(HttpServletRequest request, @PathVariable("appId") Long appId) throws HTTPException {
+		try {
+			logger.debug(EELFLoggerDelegate.debugLogger, "/portalApi/app/{}/users was invoked", appId);
+			List<UserApplicationRoles> appUsers = userRolesService.getUsersFromAppEndpoint(appId);
+			return appUsers;
+		} catch(Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing UserRolesController.getUsersFromAppEndpoint. Details: " + EcompPortalUtils.getStackTrace(e));
+			return new ArrayList<UserApplicationRoles>();
+		}
+	}
+
+	@RequestMapping(value = { "/portalApi/app/{appId}/roles" }, method = { RequestMethod.GET }, produces = "application/json")
+	public List<EcompRole> testGetRoles(HttpServletRequest request, @PathVariable("appId") Long appId) throws HTTPException {
+		EcompRole[] appRoles = applicationsRestClientService.get(EcompRole[].class, appId, "/roles");
+		List<EcompRole> rolesList = Arrays.asList(appRoles);
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/app/{appId}/roles", "response for appId=" + appId, rolesList);
+		
+		return rolesList;
+	}
+
+	@RequestMapping(value = { "/portalApi/admin/import/app/{appId}/roles" }, method = { RequestMethod.GET }, produces = "application/json")
+	public List<EPRole> importRolesFromRemoteApplication(HttpServletRequest request, @PathVariable("appId") Long appId) throws HTTPException {
+		List<EPRole> rolesList = userRolesService.importRolesFromRemoteApplication(appId);
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/admin/import/app/{appId}/roles", "response for appId=" + appId, rolesList);
+		
+		return rolesList;
+	}
+
+	@RequestMapping(value = { "/portalApi/app/{appId}/user/{orgUserId}/roles" }, method = { RequestMethod.GET }, produces = "application/json")
+	public EcompRole testGetRoles(HttpServletRequest request, @PathVariable("appId") Long appId, @PathVariable("orgUserId") String orgUserId) throws Exception {
+		if (!EcompPortalUtils.legitimateUserId(orgUserId)) {
+			String msg = "Error /user/<user>/roles not legitimate orgUserId = " + orgUserId;
+			logger.error(EELFLoggerDelegate.errorLogger, msg);
+			throw new Exception(msg);
+		}
+		EcompRole[] roles = applicationsRestClientService.get(EcompRole[].class, appId, String.format("/user/%s/roles", orgUserId));
+		if (roles.length != 1) {
+			String msg = "Error /user/<user>/roles returned array. expected size 1 recieved size = " + roles.length;
+			logger.error(EELFLoggerDelegate.errorLogger, msg);
+			throw new Exception(msg);
+		}
+		
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/app/{appId}/user/{orgUserId}/roles", "response for appId='" + appId + "' and orgUserId='" + orgUserId + "'", roles[0]);
+		return roles[0];
+	}
+	
+	@RequestMapping(value = { "/portalApi/saveUserAppRoles" }, method = { RequestMethod.PUT }, produces = "application/json")
+	public FieldsValidator putAppWithUserRoleRequest(HttpServletRequest request, @RequestBody AppWithRolesForUser newAppRolesForUser,
+			HttpServletResponse response) {
+		FieldsValidator fieldsValidator = null;
+		try {
+			
+			EPUser user = EPUserUtils.getUserSession(request);
+			fieldsValidator = userRolesService.putUserAppRolesRequest(newAppRolesForUser, user);
+			response.setStatus(fieldsValidator.httpStatusCode.intValue());
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putAppWithUserRoleRequest failed", e);
+
+		}
+		// return fieldsValidator;
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/saveUserAppRoles", "PUT result =",
+				response.getStatus());
+		return fieldsValidator;
+	}
+	
+	@RequestMapping(value = { "/portalApi/appCatalogRoles" }, method = {
+			RequestMethod.GET }, produces = "application/json")
+	public List<EPUserAppCatalogRoles> getUserAppCatalogRoles(HttpServletRequest request,
+			@RequestParam("appName") String appName) {
+		EPUser user = EPUserUtils.getUserSession(request);
+		List<EPUserAppCatalogRoles> userAppRoleList = null;
+		try {
+			userAppRoleList = userRolesService.getUserAppCatalogRoles(user, appName);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "putUserWidgetsSortPref failed", e);
+
+		}
+		Collections.sort(userAppRoleList, getUserAppCatalogRolesComparator);
+		EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/userApplicationRoles", "result =", userAppRoleList);
+
+		return userAppRoleList;
+
+	}
+	private Comparator<EPUserAppCatalogRoles> getUserAppCatalogRolesComparator = new Comparator<EPUserAppCatalogRoles>() {
+		public int compare(EPUserAppCatalogRoles o1, EPUserAppCatalogRoles o2) {
+			return o1.getRolename().compareTo(o2.getRolename());
+		}
+	};
+	
+	@RequestMapping(value = "/portalApi/externalRequestAccessSystem", method = RequestMethod.GET, produces = "application/json")
+	public ExternalSystemAccess readExternalRequestAccess(HttpServletRequest request) {
+		ExternalSystemAccess result = null;
+		try {		
+			result = userRolesService.getExternalRequestAccess();
+			EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/externalRequestAccessSystem", "GET result =", result);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,"readExternalRequestAccess failed: " + e.getMessage());
+		}	
+		return result;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java
new file mode 100644
index 00000000..f1d77a3f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WebAnalyticsExtAppController.java
@@ -0,0 +1,157 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.io.IOUtils;
+import org.openecomp.portalapp.controller.EPRestrictedRESTfulBaseController;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EcompAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.AppsCacheService;
+import org.openecomp.portalapp.portal.transport.Analytics;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.crossapi.PortalAPIResponse;
+import org.openecomp.portalsdk.core.service.AuditService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(PortalConstants.REST_AUX_API)
+@Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class WebAnalyticsExtAppController extends EPRestrictedRESTfulBaseController{
+	
+	private static final String APP_KEY = "uebkey";
+	
+	@Autowired
+	AuditService auditService;
+	
+	@Autowired
+	AppsCacheService appCacheService;
+	
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WebAnalyticsExtAppController.class);
+
+	protected boolean isAuxRESTfulCall() {
+		return true;
+	}
+
+	/*
+	 * Answers requests from partner applications for a file that is expected to
+	 * contain javascript to support web analytics.
+	 * 
+	 * @param request
+	 * @return
+	 * @throws Exception
+	 */
+	@ApiOperation(value = "Gets javascript with functions that support gathering and reporting web analytics.", response = String.class)
+	@RequestMapping(value = { "/analytics" }, method = RequestMethod.GET, produces = "application/javascript")
+	public String getAnalyticsScript(HttpServletRequest request) throws Exception {
+		String responseText = "";
+		final String fileName = "analytics.txt";
+		InputStream analyticsFileStream = null;
+		try {
+			analyticsFileStream = this.getClass().getClassLoader().getResourceAsStream(fileName);
+			responseText = IOUtils.toString(analyticsFileStream, StandardCharsets.UTF_8.name());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Error reading contents of the file " + fileName, e);
+		} finally {
+			if (analyticsFileStream != null)
+				analyticsFileStream.close();
+		}
+
+		String feURLContext = SystemProperties.getProperty("frontend_url");
+		String feURL = feURLContext.substring(0, feURLContext.lastIndexOf('/'));
+
+		responseText = responseText.replace("PORTAL_ENV_URL", feURL);
+		return responseText;
+	}
+
+	/**
+	 * Accepts data from partner applications with web analytics data.
+	 * 
+	 * @param request
+	 * @param analyticsMap
+	 * @param response
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = { "/storeAnalytics" }, method = RequestMethod.POST, produces = "application/json")
+	@ResponseBody
+	@ApiOperation(value = "Accepts data from partner applications with web analytics data.", response = PortalAPIResponse.class)
+	public PortalAPIResponse storeAnalyticsScript(HttpServletRequest request, @RequestBody Analytics analyticsMap) throws Exception {	
+		try{
+		MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());		
+		MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP,EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+		String appName = "";
+		try {
+			
+			String appKeyValue = request.getHeader(APP_KEY);
+			if(appKeyValue == null || appKeyValue.equals("")) {
+				logger.error(EELFLoggerDelegate.errorLogger, " App Key unavailable; Proceeding with null app name");
+			} else {	
+				EPApp appRecord = appCacheService.getAppForAnalytics(appKeyValue); 
+				if(appRecord == null){
+					logger.error(EELFLoggerDelegate.errorLogger, " App could not be found for the key "+ appKeyValue);
+				}
+				else appName = appRecord.getName();
+				
+			}
+		
+		} catch(Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, " Error retrieving Application to capture app name for analytics; Proceeding with empty app name");
+		}
+		
+		
+		
+		logger.info(EELFLoggerDelegate.auditLogger, EPLogUtil.formatStoreAnalyticsAuditLogMessage(analyticsMap.getUserId(),appName, "WebAnalyticsExtAppController.postWebAnalyticsData", 
+				EcompAuditLog.CD_ACTIVITY_STORE_ANALYTICS, analyticsMap.getAction(),analyticsMap.getPage(),analyticsMap.getFunction(),analyticsMap.getType()));			
+		MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+		MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+		
+		PortalAPIResponse response = new PortalAPIResponse(true, "success");
+		return response;
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "storeAnalytics failed", e);
+			PortalAPIResponse response = new PortalAPIResponse(true, "error");
+			return response;
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WidgetsCatalogController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WidgetsCatalogController.java
new file mode 100644
index 00000000..f69a6484
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WidgetsCatalogController.java
@@ -0,0 +1,376 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.EPRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.MicroserviceData;
+import org.openecomp.portalapp.portal.domain.MicroserviceParameter;
+import org.openecomp.portalapp.portal.domain.WidgetCatalog;
+import org.openecomp.portalapp.portal.domain.WidgetCatalogParameter;
+import org.openecomp.portalapp.portal.domain.WidgetParameterResult;
+import org.openecomp.portalapp.portal.domain.WidgetServiceHeaders;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.ConsulHealthService;
+import org.openecomp.portalapp.portal.service.MicroserviceService;
+import org.openecomp.portalapp.portal.service.WidgetParameterService;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+@SuppressWarnings("unchecked")
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class WidgetsCatalogController extends EPRestrictedBaseController {
+	
+	private static final String HTTPS = "https://";
+	
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetsCatalogController.class);
+	RestTemplate template = new RestTemplate();
+	String whatService = "widgets-service";
+
+	@Autowired
+	private ConsulHealthService consulHealthService;
+
+	@Autowired
+	private MicroserviceService microserviceService;
+
+	@Autowired
+	private WidgetParameterService widgetParameterService;
+
+	@Bean
+	public CommonsMultipartResolver multipartResolver() {
+		return new CommonsMultipartResolver();
+	}
+
+	static {
+		// for localhost testing only
+		javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier(new javax.net.ssl.HostnameVerifier() {
+
+			public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
+				if (hostname.equals("localhost")) {
+					return true;
+				}
+				return false;
+			}
+		});
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/widgetCatalog/{loginName}" }, method = RequestMethod.GET)
+	public List<WidgetCatalog> getUserWidgetCatalog(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("loginName") String loginName) throws RestClientException, Exception {
+		List<WidgetCatalog> widgets = new ArrayList<>();
+		try {
+			ResponseEntity<ArrayList> ans = template.exchange(
+					HTTPS + consulHealthService.getServiceLocation(whatService)
+							+ "/widget/microservices/widgetCatalog/" + loginName,
+					HttpMethod.GET, new HttpEntity(WidgetServiceHeaders.getInstance()), ArrayList.class);
+			widgets = ans.getBody();
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserWidgetCatalog failed", e);
+			// returning null because null help check on the UI if there was a
+			// communication problem with Microservice.
+			return null;
+		}
+		return widgets;
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/widgetCatalog" }, method = RequestMethod.GET)
+	public List<WidgetCatalog> getWidgetCatalog(HttpServletRequest request, HttpServletResponse response)
+			throws RestClientException, Exception {
+		List<WidgetCatalog> widgets = new ArrayList<>();
+		try {
+			ResponseEntity<ArrayList> ans = template.exchange(
+					HTTPS + consulHealthService.getServiceLocation(whatService)
+							+ "/widget/microservices/widgetCatalog",
+					HttpMethod.GET, new HttpEntity(WidgetServiceHeaders.getInstance()), ArrayList.class);
+			widgets = ans.getBody();
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getWidgetCatalog failed", e);
+			// returning null because null help check on the UI if there was a
+			// communication problem with Microservice.
+			return null;
+		}
+		return widgets;
+	}
+
+	@RequestMapping(value = {
+			"/portalApi/microservices/widgetCatalog/{widgetId}" }, method = RequestMethod.PUT, produces = "application/json")
+	public void updateWidgetCatalog(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody WidgetCatalog newWidgetCatalog, @PathVariable("widgetId") long widgetId)
+			throws RestClientException, Exception {
+		template.exchange(
+				HTTPS + consulHealthService.getServiceLocation(whatService)
+						+ "/widget/microservices/widgetCatalog/" + widgetId,
+				HttpMethod.PUT, new HttpEntity(newWidgetCatalog, WidgetServiceHeaders.getInstance()), String.class);
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/widgetCatalog/{widgetId}" }, method = RequestMethod.DELETE)
+	public void deleteOnboardingWidget(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+		template.exchange(
+				HTTPS + consulHealthService.getServiceLocation(whatService)
+						+ "/widget/microservices/widgetCatalog/" + widgetId,
+				HttpMethod.DELETE, new HttpEntity(WidgetServiceHeaders.getInstance()), String.class);
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/widgetCatalog/{widgetId}" }, method = RequestMethod.POST)
+	public String updateWidgetCatalogWithFiles(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+		MultipartHttpServletRequest mRequest;
+		MultiValueMap<String, Object> multipartRequest = new LinkedMultiValueMap<>();
+		String fileName;
+		String tmp_folder = "/tmp/";
+		String respond = null;
+		FileOutputStream fo = null;
+		try {
+			mRequest = (MultipartHttpServletRequest) request;
+			MultipartFile mFile = mRequest.getFile("file");
+			fileName = mFile.getOriginalFilename();
+			fo = new FileOutputStream(tmp_folder + fileName);
+			fo.write(mFile.getBytes());
+
+			HttpHeaders header = new HttpHeaders();
+			header.setContentType(MediaType.MULTIPART_FORM_DATA);
+			multipartRequest.add("file", new FileSystemResource(tmp_folder + fileName));
+			multipartRequest.add("widget", request.getParameter("newWidget"));
+			respond = template.postForObject(
+					HTTPS + consulHealthService.getServiceLocation(whatService)
+							+ "/widget/microservices/widgetCatalog/" + widgetId,
+					new HttpEntity<>(multipartRequest, WidgetServiceHeaders.getInstance()), String.class);
+			File f = new File(tmp_folder + fileName);
+			f.delete();
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "updateWidgetCatalogWithFiles failed", e);
+		} finally {
+			try {
+				if (fo != null)
+					fo.close();
+			} catch (IOException e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "updateWidgetCatalogWithFiles failed 2", e);
+			}
+		}
+		return respond;
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/widgetCatalog" }, method = RequestMethod.POST)
+	public String createWidgetCatalog(HttpServletRequest request, HttpServletResponse response)
+			throws RestClientException, Exception {
+		MultipartHttpServletRequest mRequest;
+		MultiValueMap<String, Object> multipartRequest = new LinkedMultiValueMap<>();
+		String fileName;
+		String tmp_folder = "/tmp/";
+		String respond = null;
+		FileOutputStream fo = null;
+		try {
+			mRequest = (MultipartHttpServletRequest) request;
+			MultipartFile mFile = mRequest.getFile("file");
+			fileName = mFile.getOriginalFilename();
+			fo = new FileOutputStream(tmp_folder + fileName);
+			fo.write(mFile.getBytes());
+
+			HttpHeaders header = new HttpHeaders();
+			header.setContentType(MediaType.MULTIPART_FORM_DATA);
+			multipartRequest.add("file", new FileSystemResource(tmp_folder + fileName));
+			multipartRequest.add("widget", request.getParameter("newWidget"));
+
+			respond = template.postForObject(
+					HTTPS + consulHealthService.getServiceLocation(whatService)
+							+ "/widget/microservices/widgetCatalog",
+					new HttpEntity<>(multipartRequest, WidgetServiceHeaders.getInstance()), String.class);
+			File f = new File(tmp_folder + fileName);
+			f.delete();
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "createWidgetCatalog failed", e);
+		} finally {
+			try {
+				if (fo != null)
+					fo.close();
+			} catch (IOException e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "createWidgetCatalog failed 2", e);
+			}
+		}
+		return respond;
+	}
+
+	@RequestMapping(value = "/portalApi/microservices/{widgetId}/framework.js", method = RequestMethod.GET)
+	public String getWidgetFramework(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+		return template.getForObject(HTTPS + consulHealthService.getServiceLocation(whatService)
+				+ "/widget/microservices/" + widgetId + "/framework.js", String.class,
+				WidgetServiceHeaders.getInstance());
+	}
+
+	@RequestMapping(value = "/portalApi/microservices/{widgetId}/controller.js", method = RequestMethod.GET)
+	public String getWidgetController(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+		return template.getForObject(HTTPS + consulHealthService.getServiceLocation(whatService)
+				+ "/widget/microservices/" + widgetId + "/controller.js", String.class,
+				WidgetServiceHeaders.getInstance());
+	}
+
+	@RequestMapping(value = "/portalApi/microservices/{widgetId}/style.css", method = RequestMethod.GET)
+	public String getWidgetCSS(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+		return template.getForObject(HTTPS + consulHealthService.getServiceLocation(whatService)
+				+ "/widget/microservices/" + widgetId + "/styles.css", String.class,
+				WidgetServiceHeaders.getInstance());
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/parameters/{widgetId}" }, method = RequestMethod.GET)
+	public PortalRestResponse<List<WidgetParameterResult>> getWidgetParameterResult(HttpServletRequest request,
+			HttpServletResponse response, @PathVariable("widgetId") long widgetId) throws Exception {
+		EPUser user = EPUserUtils.getUserSession(request);
+
+		List<WidgetParameterResult> list = new ArrayList<>();
+		Long serviceId = template.exchange(
+				HTTPS + consulHealthService.getServiceLocation(whatService)
+						+ "/widget/microservices/widgetCatalog/parameters/" + widgetId,
+				HttpMethod.GET, new HttpEntity(WidgetServiceHeaders.getInstance()), Long.class).getBody();
+		if (serviceId == null) {
+			// return ok/sucess and no service parameter for this widget
+			return new PortalRestResponse<List<WidgetParameterResult>>(PortalRestStatusEnum.WARN,
+					"No service parameters for this widget", list);
+		} else {
+			List<MicroserviceParameter> defaultParam = microserviceService.getParametersById(serviceId);
+			for (MicroserviceParameter param : defaultParam) {
+				WidgetParameterResult user_result = new WidgetParameterResult();
+				user_result.setParam_id(param.getId());
+				user_result.setDefault_value(param.getPara_value());
+				user_result.setParam_key(param.getPara_key());
+				WidgetCatalogParameter userValue = widgetParameterService.getUserParamById(widgetId, user.getId(),
+						param.getId());
+				if (userValue == null)
+					user_result.setUser_value(param.getPara_value());
+				else {
+					user_result.setUser_value(userValue.getUser_value());
+				}
+				list.add(user_result);
+			}
+		}
+		return new PortalRestResponse<List<WidgetParameterResult>>(PortalRestStatusEnum.OK, "SUCCESS", list);
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/services/{paramId}" }, method = RequestMethod.GET)
+	public List<WidgetCatalogParameter> getUserParameterById(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("paramId") long paramId) throws Exception {
+		List<WidgetCatalogParameter> list = widgetParameterService.getUserParameterById(paramId);
+		return list;
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/services/{paramId}" }, method = RequestMethod.DELETE)
+	public void deleteUserParameterById(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("paramId") long paramId) throws Exception {
+		widgetParameterService.deleteUserParameterById(paramId);
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/download/{widgetId}" }, method = RequestMethod.GET)
+	public void doDownload(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+	
+		ServletContext context = request.getServletContext();
+		byte[] byteFile = template.exchange(HTTPS + consulHealthService.getServiceLocation(whatService) + "/widget/microservices/download/" + widgetId,
+				HttpMethod.GET, new HttpEntity(WidgetServiceHeaders.getInstance()), byte[].class).getBody();
+		String fileLocation = widgetId + ".zip";
+		FileOutputStream stream = new FileOutputStream(fileLocation);
+		stream.write(byteFile);
+		stream.close();
+
+		File downloadFile = new File(fileLocation);
+		FileInputStream inputStream = new FileInputStream(downloadFile);
+		String mimeType = context.getMimeType(downloadFile.getPath());
+		if (mimeType == null) {
+			mimeType = "application/octet-stream";
+		}
+
+		response.setContentType(mimeType);
+		response.setContentLength((int) downloadFile.length());
+		String headerKey = "Content-Disposition";
+		String headerValue = String.format("attachment; filename=\"%s\"", downloadFile.getName());
+		downloadFile.delete();
+		response.setHeader(headerKey, headerValue);
+
+		OutputStream outStream = response.getOutputStream();
+		byte[] buffer = new byte[32 * 1024];
+		int bytesRead = -1;
+		while ((bytesRead = inputStream.read(buffer)) != -1) {
+			outStream.write(buffer, 0, bytesRead);
+		}
+
+		inputStream.close();
+		outStream.close();
+	}
+
+	@RequestMapping(value = { "/portalApi/microservices/parameters" }, method = RequestMethod.POST)
+	public PortalRestResponse<String> saveWidgetParameter(HttpServletRequest request, HttpServletResponse response,
+			@RequestBody WidgetCatalogParameter widgetParameters) throws Exception {
+		EPUser user = EPUserUtils.getUserSession(request);
+		widgetParameters.setUserId(user.getId());
+		try {
+			WidgetCatalogParameter oldParam = widgetParameterService.getUserParamById(widgetParameters.getWidgetId(),
+					widgetParameters.getUserId(), widgetParameters.getParamId());
+			if (oldParam != null) {
+				widgetParameters.setId(oldParam.getId());
+			}
+			widgetParameterService.saveUserParameter(widgetParameters);
+
+		} catch (Exception e) {
+			return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+		}
+		return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WidgetsCatalogMarkupController.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WidgetsCatalogMarkupController.java
new file mode 100644
index 00000000..78499ef8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/controller/WidgetsCatalogMarkupController.java
@@ -0,0 +1,83 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.controller;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.controller.EPUnRestrictedBaseController;
+import org.openecomp.portalapp.portal.domain.WidgetServiceHeaders;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.service.ConsulHealthService;
+
+@SuppressWarnings("unchecked")
+@RestController
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class WidgetsCatalogMarkupController extends EPUnRestrictedBaseController {
+	
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetsCatalogMarkupController.class);
+	RestTemplate template = new RestTemplate();
+	String whatService = "widgets-service";
+
+	
+	@Autowired
+	private ConsulHealthService consulHealthService;
+
+	@Bean
+	public CommonsMultipartResolver multipartResolver() {
+		return new CommonsMultipartResolver();
+	}
+	
+	static {
+	    //for localhost testing only
+	    javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier(
+	    new javax.net.ssl.HostnameVerifier(){
+
+	        public boolean verify(String hostname,
+	                javax.net.ssl.SSLSession sslSession) {
+	            if (hostname.equals("localhost")) {
+	                return true;
+	            }
+	            return false;
+	        }
+	    });
+	}	
+
+
+	@RequestMapping(value = "/portalApi/microservices/markup/{widgetId}", method = RequestMethod.GET)
+	public String getWidgetMarkup(HttpServletRequest request, HttpServletResponse response,
+			@PathVariable("widgetId") long widgetId) throws RestClientException, Exception {
+		return template.getForObject("https://" + consulHealthService.getServiceLocation(whatService) + "/widget/microservices/markup/" + widgetId, String.class,
+				WidgetServiceHeaders.getInstance());
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AdminUserApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AdminUserApp.java
new file mode 100644
index 00000000..ecf0b684
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AdminUserApp.java
@@ -0,0 +1,88 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class AdminUserApp implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="USER_ID")
+	private Long user_Id;
+	
+	@Column(name="FIRST_NAME")
+	private String firstName;
+	
+	@Column(name="LAST_NAME")
+	private String lastName;
+	
+	@Column(name="ORG_USER_ID")
+	private String orgUserId;
+
+	@Id
+	@Column(name="APP_ID")
+	private Long appId; 
+	
+	@Column(name="APP_NAME")
+	private String appName; 
+	
+	public Long getAppId() {
+		return appId;
+	}
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+	public Long getUser_Id() {
+		return user_Id;
+	}
+	public void setUserId(Long user_Id) {
+		this.user_Id = user_Id;
+	}
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+	public String getAppName() {
+		return appName;
+	}
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AdminUserApplications.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AdminUserApplications.java
new file mode 100644
index 00000000..c90be671
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AdminUserApplications.java
@@ -0,0 +1,96 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AdminUserApplications {
+	private List<Application> apps = new ArrayList<Application>();
+	
+	private Long user_Id;
+	private String firstName;
+	private String lastName;
+	private String orgUserId;
+	
+	public AdminUserApplications(AdminUserApp app) {
+		setUser_Id(app.getUser_Id());
+		setOrgUserId(app.getOrgUserId());
+		setFirstName(app.getFirstName());
+		setLastName(app.getLastName());
+		
+		addApp(app.getAppId(), app.getAppName());
+	}
+	public Long getUser_Id() {
+		return user_Id;
+	}
+	public void setUser_Id(Long user_Id) {
+		this.user_Id = user_Id;
+	}
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+	public List<Application> getApps() {
+		return apps;
+	}
+	public void setApps(List<Application> apps) {
+		this.apps = apps;
+	}
+	public void addApp(Long otherAppId, String otherAppName) {
+		apps.add(new Application(otherAppId, otherAppName));
+	}
+
+	public class Application {
+		private Long appId; 
+		private String appName; 
+		
+		public Application(Long otherAppId, String otherAppName) {
+			setAppId(otherAppId);
+			setAppName(otherAppName);
+		}
+		public Long getAppId() {
+			return appId;
+		}
+		public void setAppId(Long appId) {
+			this.appId = appId;
+		}
+		public String getAppName() {
+			return appName;
+		}
+		public void setAppName(String appName) {
+			this.appName = appName;
+		}
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/App.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/App.java
new file mode 100644
index 00000000..21068513
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/App.java
@@ -0,0 +1,62 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+//@Entity
+//@Table(name = "FN_APP")
+public class App implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+
+	//@Id
+	//@Column(name = "APP_ID")
+	//@GeneratedValue(strategy=GenerationType.AUTO)
+	private Long appId;
+	
+	//@Column(name = "APP_Name")
+	private String appName;
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+	
+
+	
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppContactUs.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppContactUs.java
new file mode 100644
index 00000000..d399c825
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppContactUs.java
@@ -0,0 +1,86 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+/**
+ * Models rows in the fn_app_contact_us table added for 1610.1.
+ */
+public class AppContactUs extends DomainVo {
+
+	private static final long serialVersionUID = -2742197830465055134L;
+
+	private EPApp app;
+	private String description;
+	private String contactEmail;
+	private String contactName;
+	private String url;
+	private String activeYN;
+
+	public EPApp getApp() {
+		return app;
+	}
+
+	public void setApp(EPApp app) {
+		this.app = app;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getContactEmail() {
+		return contactEmail;
+	}
+
+	public void setContactEmail(String contactEmail) {
+		this.contactEmail = contactEmail;
+	}
+
+	public String getContactName() {
+		return contactName;
+	}
+
+	public void setContactName(String contactName) {
+		this.contactName = contactName;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getActiveYN() {
+		return activeYN;
+	}
+
+	public void setActiveYN(String activeYN) {
+		this.activeYN = activeYN;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppIdAndNameTransportModel.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppIdAndNameTransportModel.java
new file mode 100644
index 00000000..1440973e
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppIdAndNameTransportModel.java
@@ -0,0 +1,63 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class AppIdAndNameTransportModel implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="APP_ID")
+	private Long id;
+	
+	@Column(name="APP_NAME")
+	private String name;
+
+	@Column(name="APP_TYPE")
+	private Integer appType;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public Boolean isRestrictedApp() {
+		return (this.appType == 2 ? true : false);
+	}
+
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppsResponse.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppsResponse.java
new file mode 100644
index 00000000..4935a22c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/AppsResponse.java
@@ -0,0 +1,76 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+public class AppsResponse {
+	
+	public AppsResponse(Long id, String name, Boolean restrictedApp, Boolean enabled) {
+		this.index = id;
+		this.title = this.value = name;
+		this.restrictedApp = restrictedApp;
+		this.enabled = enabled;
+	}
+
+	public Long getIndex() {
+		return index;
+	}
+
+	public void setIndex(Long index) {
+		this.index = index;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	// Hide the implementation of restricted and normal app from the front end.
+	// The json sent and received will include restrictedApp but not appType.
+	
+	public void setRestrictedApp(Boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+	
+	public Boolean getEnabled() {
+		return enabled;
+	}
+	
+	public void setEnabled(Boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	private Long index;
+	private String title;
+	private String value;
+	public Boolean restrictedApp;
+	public Boolean enabled;
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/BEProperty.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/BEProperty.java
new file mode 100644
index 00000000..e877641b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/BEProperty.java
@@ -0,0 +1,43 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+public class BEProperty {
+	private String key;
+	private String value;
+	
+	public BEProperty(String key, String value){
+		this.key = key;
+		this.value = value;
+	}
+	
+	public String getKey() {
+		return key;
+	}
+	public void setKey(String key) {
+		this.key = key;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/BasicAuthCredentials.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/BasicAuthCredentials.java
new file mode 100644
index 00000000..359945ce
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/BasicAuthCredentials.java
@@ -0,0 +1,95 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.List;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class BasicAuthCredentials extends DomainVo {
+	
+	private static final long serialVersionUID = 1L;
+
+	public BasicAuthCredentials() {
+
+	}
+	
+	private Long id;
+	private String applicationName;
+	private String username;
+	private String password;
+	private String isActive;
+	private List<EPEndpoint> endpoints;
+	
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getApplicationName() {
+		return applicationName;
+	}
+
+	public void setApplicationName(String applicationName) {
+		this.applicationName = applicationName;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getIsActive() {
+		return isActive;
+	}
+
+	public void setIsActive(String isActive) {
+		this.isActive = isActive;
+	}
+	
+	public List<EPEndpoint> getEndpoints() {
+		return endpoints;
+	}
+
+	public void setEndpoints(List<EPEndpoint> endpoints) {
+		this.endpoints = endpoints;
+	}
+
+	@Override
+	public String toString() {
+		return "BasicAuthCredentials [id=" + id + ", applicationName=" + applicationName + ", username=" + username
+				+ ", password=" + password + ", isActive=" + isActive + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java
new file mode 100644
index 00000000..1ba9e2d7
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPApp.java
@@ -0,0 +1,292 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import javax.persistence.Lob;
+
+import org.apache.commons.lang.StringUtils;
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+/**
+ * Model for all columns in the fn_app table.
+ */
+public class EPApp extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+
+	private String name;
+	private String imageUrl;
+	private String description;
+	private String notes;
+	private String url;
+	private String alternateUrl;
+	private String appRestEndpoint;
+	private String mlAppName;
+	private String mlAppAdminId;
+	private Long motsId;
+	private String username;
+	private String appPassword;
+	@Lob
+	private byte[] thumbnail;
+	private Boolean open;
+	private Boolean enabled;
+	private String uebTopicName;
+	private String uebKey;
+	private String uebSecret;
+	private Integer appType;
+
+	private AppContactUs contactUs;
+
+	public EPApp() {
+		// Attention!!!
+		// We set here all default values. We also place protection
+		// into setters for fields with default values.
+		// If we don't use such protection we are able to place null
+		// to these fields and save such fields into DB even if DB has
+		// default values for these fields.
+		this.name = "";
+		this.mlAppName = "";
+		this.mlAppAdminId = "";
+		this.username = "";
+		this.appPassword = "";
+		this.open = new Boolean(false);
+		this.enabled = new Boolean(true);
+		this.uebTopicName = "";
+		this.uebKey = "";
+		this.uebSecret = "";
+		this.appType = 1;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		if (StringUtils.isEmpty(name)) {
+			name = "";
+		}
+		this.name = name;
+	}
+
+	public String getImageUrl() {
+		return imageUrl;
+	}
+
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
+
+	public byte[] getThumbnail() {
+		return this.thumbnail;
+	}
+
+	public void setThumbnail(byte[] thumbnail) {
+		this.thumbnail = thumbnail;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getNotes() {
+		return notes;
+	}
+
+	public void setNotes(String notes) {
+		this.notes = notes;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getAlternateUrl() {
+		return alternateUrl;
+	}
+
+	public void setAlternateUrl(String alternateUrl) {
+		this.alternateUrl = alternateUrl;
+	}
+
+	public String getAppRestEndpoint() {
+		return appRestEndpoint;
+	}
+
+	public void setAppRestEndpoint(String appRestEndpoint) {
+		this.appRestEndpoint = appRestEndpoint;
+	}
+
+	public String getMlAppName() {
+		return mlAppName;
+	}
+
+	public void setMlAppName(String mlAppName) {
+		if (StringUtils.isEmpty(mlAppName)) {
+			mlAppName = "";
+		}
+		this.mlAppName = mlAppName;
+	}
+
+	public String getMlAppAdminId() {
+		return mlAppAdminId;
+	}
+
+	public void setMlAppAdminId(String mlAppAdminId) {
+		if (StringUtils.isEmpty(mlAppAdminId)) {
+			mlAppAdminId = "";
+		}
+		this.mlAppAdminId = mlAppAdminId;
+	}
+
+	public Long getMotsId() {
+		return motsId;
+	}
+
+	public void setMotsId(Long motsId) {
+		this.motsId = motsId;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getAppPassword() {
+		return appPassword;
+	}
+
+	public void setAppPassword(String appPassword) {
+		if (StringUtils.isEmpty(appPassword)) {
+			appPassword = "";
+		}
+		this.appPassword = appPassword;
+	}
+
+	public Boolean getOpen() {
+		return open;
+	}
+
+	public void setOpen(Boolean open) {
+		if (open == null) {
+			open = new Boolean(false);
+		}
+		this.open = open;
+	}
+
+	public Boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(Boolean enabled) {
+		if (enabled == null) {
+			enabled = new Boolean(true);
+		}
+		this.enabled = enabled;
+	}
+
+	public Integer getAppType() {
+		return appType;
+	}
+
+	public void setAppType(Integer appType) {
+		if (appType == null) {
+			appType = new Integer(1);
+		}
+		this.appType = appType;
+	}
+
+	public void setRestrictedApp(Boolean restrictedApp) {
+		Integer result = 1;
+		if (restrictedApp) {
+			result = 2;
+		}
+		this.appType = result;
+	}
+
+	public Boolean isRestrictedApp() {
+		return (this.appType == 2 ? true : false);
+	}
+
+	public int compareTo(Object obj) {
+		Long c1 = getId();
+		Long c2 = ((EPApp) obj).getId();
+
+		return c1.compareTo(c2);
+	}
+
+	public String getUebTopicName() {
+		return this.uebTopicName;
+	}
+
+	public void setUebTopicName(String topicName) {
+		if (StringUtils.isEmpty(topicName)) {
+			this.uebTopicName = "";
+		}
+		this.uebTopicName = topicName;
+	}
+
+	public String getUebKey() {
+		return this.uebKey;
+	}
+
+	public void setUebKey(String uebKey) {
+		if (StringUtils.isEmpty(uebKey)) {
+			this.uebKey = "";
+		}
+		this.uebKey = uebKey;
+	}
+
+	public String getUebSecret() {
+		return this.uebSecret;
+	}
+
+	public void setUebSecret(String uebSecret) {
+		if (StringUtils.isEmpty(uebSecret)) {
+			this.uebSecret = "";
+		}
+		this.uebSecret = uebSecret;
+	}
+
+	public AppContactUs getContactUs() {
+		return contactUs;
+	}
+
+	public void setContactUs(AppContactUs contactUs) {
+		this.contactUs = contactUs;
+	}
+
+	@Override
+	public String toString() {
+		String str = "[" + getId() + ":" + getName() + "]";
+		return str;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPEndpoint.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPEndpoint.java
new file mode 100644
index 00000000..85e390e6
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPEndpoint.java
@@ -0,0 +1,37 @@
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class EPEndpoint extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+
+	public EPEndpoint() {
+
+	}
+
+	private Long id;
+	private String name;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return "EPEndpoint [id=" + id + ", name=" + name + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPEndpointAccount.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPEndpointAccount.java
new file mode 100644
index 00000000..3d7dbd1f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPEndpointAccount.java
@@ -0,0 +1,46 @@
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class EPEndpointAccount extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+
+	public EPEndpointAccount() {
+
+	}
+
+	private Long id;
+	private Long ep_id;
+	private Long account_id;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getEp_id() {
+		return ep_id;
+	}
+
+	public void setEp_id(Long ep_id) {
+		this.ep_id = ep_id;
+	}
+
+	public Long getAccount_id() {
+		return account_id;
+	}
+
+	public void setAccount_id(Long account_id) {
+		this.account_id = account_id;
+	}
+
+	@Override
+	public String toString() {
+		return "EPEndpointAccount [id=" + id + ", ep_id=" + ep_id + ", account_id=" + account_id + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPRole.java
new file mode 100644
index 00000000..ea70982a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPRole.java
@@ -0,0 +1,202 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.openecomp.portalsdk.core.domain.RoleFunction;
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class EPRole extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+	private String  name;
+    private boolean active;
+    private Integer priority;
+    
+    // ECOMP will identify the specific remote application role id by appID;appRoleId among all the application roles it persists.
+    private Long appId;     // used by ECOMP only 
+    private Long appRoleId; // used by ECOMP only
+
+    private SortedSet<RoleFunction>     roleFunctions = new TreeSet<RoleFunction>();
+    
+    private SortedSet<EPRole> childRoles = new TreeSet<EPRole>();
+    
+    @JsonIgnore
+    private SortedSet<EPRole> parentRoles = new TreeSet<EPRole>();
+
+    public EPRole() {}
+
+    public String getName() {
+        return name;
+    }
+
+    public boolean getActive() {
+        return active;
+    }
+
+    public SortedSet<RoleFunction> getRoleFunctions() {
+        return roleFunctions;
+    }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public SortedSet<EPRole> getChildRoles() {
+        return childRoles;
+    }
+
+    public SortedSet<EPRole> getParentRoles() {
+        return parentRoles;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setActive(boolean active) {
+        this.active = active;
+    }
+
+    public void setRoleFunctions(SortedSet<RoleFunction> roleFunctions) {
+        this.roleFunctions = roleFunctions;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public void setChildRoles(SortedSet<EPRole> childRoles) {
+        this.childRoles = childRoles;
+    }
+
+    public void setParentRoles(SortedSet<EPRole> parentRoles) {
+        this.parentRoles = parentRoles;
+    }
+
+    public void addRoleFunction(RoleFunction roleFunction) {
+        this.roleFunctions.add(roleFunction);
+    }
+
+    public void addChildRole(EPRole role) {
+        this.childRoles.add(role);
+    }
+
+    public void addParentRole(EPRole role) {
+        this.parentRoles.add(role);
+    }
+
+    public String getEditUrl() {
+        return "/role.htm?role_id=" + getId();    	
+    }
+    
+	public String getToggleActiveImage() {
+		return "/static/fusion/images/" + (getActive() ? "active.png" : "inactive.png" );
+	}
+
+	public String getToggleActiveAltText() {
+		return getActive() ? "Click to Deactivate Role" : "Click to Activate Role";
+	}
+    
+    public void removeChildRole(Long roleId) {
+      Iterator<EPRole> i = this.childRoles.iterator();
+
+      while (i.hasNext()) {
+        EPRole childRole = (EPRole)i.next();
+        if (childRole.getId().equals(roleId)) {
+          this.childRoles.remove(childRole);
+          break;
+        }
+      }
+    }
+
+    public void removeParentRole(Long roleId) {
+        Iterator<EPRole> i = this.parentRoles.iterator();
+
+        while (i.hasNext()) {
+          EPRole parentRole = (EPRole)i.next();
+          if (parentRole.getId().equals(roleId)) {
+            this.parentRoles.remove(parentRole);
+            break;
+          }
+        }
+      }
+
+    public void removeRoleFunction(String roleFunctionCd) {
+      Iterator<RoleFunction> i = this.roleFunctions.iterator();
+
+      while (i.hasNext()) {
+        RoleFunction roleFunction = (RoleFunction)i.next();
+        if (roleFunction.getCode().equals(roleFunctionCd)) {
+          this.roleFunctions.remove(roleFunction);
+          break;
+        }
+      }
+    }
+
+    public int compareTo(Object obj){
+    	EPRole other = (EPRole)obj;
+
+    	if(this.appId == null)
+    		if(other.getAppId() == null)
+    			return compareByName(other); //equal
+    		else
+    			return -1; 
+    	else // this.appId != null
+    		if(other.getAppId() == null)
+    			return 1;  // appId != null, but others is null
+    		else{
+    			int appIdCompareResult = appId.compareTo(other.getAppId());
+    			return appIdCompareResult == 0? compareByName(other) : appIdCompareResult;
+    		}
+    }
+
+	private int compareByName(EPRole other) {
+		String c1 = getName();
+    	String c2 = other.getName();
+
+    	return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
+	}
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public Long getAppRoleId() {
+		return appRoleId;
+	}
+
+	public void setAppRoleId(Long appRoleId) {
+		this.appRoleId = appRoleId;
+	}
+	
+	@Override
+	public String toString() {
+		return "[Id = " + id + ", name = " + name + "]";
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUser.java
new file mode 100644
index 00000000..3a52ffc3
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUser.java
@@ -0,0 +1,650 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.openecomp.portalapp.portal.utils.PortalConstants;
+import org.openecomp.portalsdk.core.domain.User;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class EPUser extends User {
+	    
+	    private Long   orgId;
+	    private Long   managerId;
+	    private String firstName;
+	    private String middleInitial;
+	    private String lastName;
+	    private String phone;
+	    private String fax;
+	    private String cellular;
+	    private String email;
+	    private Long   addressId;
+	    private String alertMethodCd;
+	    private String hrid;
+	    private String orgUserId;
+	    private String orgCode;
+	    private String address1;
+	    private String address2;
+	    private String city;
+	    private String state;
+	    private String zipCode;
+	    private String country;
+	    private String orgManagerUserId;
+	    private String locationClli;
+	    private String businessCountryCode;
+	    private String businessCountryName;
+	    private String businessUnit;
+	    private String businessUnitName;
+	    private String department;
+	    private String departmentName;
+	    private String companyCode;
+	    private String company;
+	    private String zipCodeSuffix;
+	    private String jobTitle;
+	    private String commandChain;
+	    private String siloStatus;
+	    private String costCenter;
+	    private String financialLocCode;
+	    
+	    
+	  
+	    private String loginId;
+	    private String loginPwd;
+	    private Date   lastLoginDate;
+	    private boolean active;
+	    private boolean internal;
+	    private Long    selectedProfileId;
+	    private Long timeZoneId;
+	    private boolean online;
+	    private String chatId;
+	
+	    private static final long serialVersionUID = 1L;
+
+	    private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPUser.class);
+		private static final String ECOMP_PORTAL_NAME = "ECOMP";
+		private boolean isGuest = false;
+		
+		private SortedSet<EPUserApp> userApps = new TreeSet<EPUserApp>();
+		private SortedSet<EPRole> pseudoRoles = new TreeSet<EPRole>();
+
+	    public EPUser() {}
+
+	    public Long getAddressId() {
+	        return addressId;
+	    }
+
+	    public String getAlertMethodCd() {
+	        return alertMethodCd;
+	    }
+
+	    public String getCellular() {
+	        return cellular;
+	    }
+
+	    public String getEmail() {
+	        return email;
+	    }
+
+	    public String getFax() {
+	        return fax;
+	    }
+
+	    public String getFirstName() {
+	        return firstName;
+	    }
+
+	    public String getHrid() {
+	        return hrid;
+	    }
+
+	    public Date getLastLoginDate() {
+	        return lastLoginDate;
+	    }
+
+	    public String getLastName() {
+	        return lastName;
+	    }
+
+	    @JsonIgnore
+	    public String getFullName() {
+	        return getFirstName() + " " + getLastName();	
+	    }
+	    
+	    public String getLoginId() {
+	        return loginId;
+	    }
+
+	    public String getLoginPwd() {
+	        return loginPwd;
+	    }
+
+	    public Long getManagerId() {
+	        return managerId;
+	    }
+
+	    public String getMiddleInitial() {
+	        return middleInitial;
+	    }
+
+	    public String getOrgCode() {
+	        return orgCode;
+	    }
+
+	    public Long getOrgId() {
+	        return orgId;
+	    }
+
+	    public String getPhone() {
+	        return phone;
+	    }
+
+	    public String getOrgUserId() {
+	        return orgUserId;
+	    }
+
+	    public boolean getActive() {
+	        return active;
+	    }
+
+	    public boolean getInternal() {
+	        return internal;
+	    }
+
+	    public String getAddress1() {
+	        return address1;
+	    }
+
+	    public String getAddress2() {
+	        return address2;
+	    }
+
+	    public String getCity() {
+	        return city;
+	    }
+
+	    public String getCountry() {
+	        return country;
+	    }
+
+	    public String getState() {
+	        return state;
+	    }
+
+	    public String getZipCode() {
+	        return zipCode;
+	    }
+
+	    public String getBusinessCountryCode() {
+	        return businessCountryCode;
+	    }
+
+	    public String getCommandChain() {
+	        return commandChain;
+	    }
+
+	    public String getCompany() {
+	        return company;
+	    }
+
+	    public String getCompanyCode() {
+	        return companyCode;
+	    }
+
+	    public String getDepartment() {
+	        return department;
+	    }
+
+	    public String getJobTitle() {
+	        return jobTitle;
+	    }
+
+	    public String getLocationClli() {
+	        return locationClli;
+	    }
+
+	    public String getOrgManagerUserId() {
+	        return orgManagerUserId;
+	    }
+
+	    public String getZipCodeSuffix() {
+	        return zipCodeSuffix;
+	    }
+
+	    public String getBusinessCountryName() {
+	        return businessCountryName;
+	    }
+
+	    public Long getSelectedProfileId() {
+	        return selectedProfileId;
+	    }
+
+	    public void setAddressId(Long addressId) {
+	        this.addressId = addressId;
+	    }
+
+	    public void setAlertMethodCd(String alertMethodCd) {
+	        this.alertMethodCd = alertMethodCd;
+	    }
+
+	    public void setCellular(String cellular) {
+	        this.cellular = cellular;
+	    }
+
+	    public void setEmail(String email) {
+	        this.email = email;
+	    }
+
+	    public void setFax(String fax) {
+	        this.fax = fax;
+	    }
+
+	    public void setFirstName(String firstName) {
+	        this.firstName = firstName;
+	    }
+
+	    public void setHrid(String hrid) {
+	        this.hrid = hrid;
+	    }
+
+	    public void setLastLoginDate(Date lastLoginDate) {
+	        this.lastLoginDate = lastLoginDate;
+	    }
+
+	    public void setLastName(String lastName) {
+	        this.lastName = lastName;
+	    }
+
+	    public void setLoginId(String loginId) {
+	        this.loginId = loginId;
+	    }
+
+	    public void setLoginPwd(String loginPwd) {
+	        this.loginPwd = loginPwd;
+	    }
+
+	    public void setManagerId(Long managerId) {
+	        this.managerId = managerId;
+	    }
+
+	    public void setMiddleInitial(String middleInitial) {
+	        this.middleInitial = middleInitial;
+	    }
+
+	    public void setOrgCode(String orgCode) {
+	        this.orgCode = orgCode;
+	    }
+
+	    public void setOrgId(Long orgId) {
+	        this.orgId = orgId;
+	    }
+
+	    public void setPhone(String phone) {
+	        this.phone = phone;
+	    }
+
+	    public void setOrgUserId(String orgUserId) {
+	        this.orgUserId = orgUserId;
+	    }
+
+	    public void setActive(boolean active) {
+	        this.active = active;
+	    }
+
+	    public void setInternal(boolean internal) {
+	        this.internal = internal;
+	    }
+
+	    public void setAddress1(String address1) {
+	        this.address1 = address1;
+	    }
+
+	    public void setAddress2(String address2) {
+	        this.address2 = address2;
+	    }
+
+	    public void setCity(String city) {
+	        this.city = city;
+	    }
+
+	    public void setCountry(String country) {
+	        this.country = country;
+	    }
+
+	    public void setState(String state) {
+	        this.state = state;
+	    }
+
+	    public void setZipCode(String zipCode) {
+	        this.zipCode = zipCode;
+	    }
+
+	    public void setBusinessCountryCode(String businessCountryCode) {
+	        this.businessCountryCode = businessCountryCode;
+	    }
+
+	    public void setCommandChain(String commandChain) {
+	        this.commandChain = commandChain;
+	    }
+
+	    public void setCompany(String company) {
+	        this.company = company;
+	    }
+
+	    public void setCompanyCode(String companyCode) {
+	        this.companyCode = companyCode;
+	    }
+
+	    public void setDepartment(String department) {
+	        this.department = department;
+	    }
+
+	    public void setJobTitle(String jobTitle) {
+	        this.jobTitle = jobTitle;
+	    }
+
+	    public void setLocationClli(String locationClli) {
+	        this.locationClli = locationClli;
+	    }
+
+	    public void setOrgManagerUserId(String orgManagerUserId) {
+	        this.orgManagerUserId = orgManagerUserId;
+	    }
+
+	    public void setZipCodeSuffix(String zipCodeSuffix) {
+	        this.zipCodeSuffix = zipCodeSuffix;
+	    }
+
+	    public void setBusinessCountryName(String businessCountryName) {
+	        this.businessCountryName = businessCountryName;
+	    }
+
+	    public SortedSet<EPRole> getPseudoRoles() {
+			return pseudoRoles;
+		}
+	    
+	    public void setPseudoRoles(SortedSet<EPRole> pseudoRoles) {
+	        this.pseudoRoles = pseudoRoles;
+	    }
+
+	    public void setSelectedProfileId(Long selectedProfileId) {
+	        this.selectedProfileId = selectedProfileId;
+	    }
+	    
+		public Long getTimeZoneId() {
+			return timeZoneId;
+		}
+
+		public void setTimeZoneId(Long timeZoneId) {
+			this.timeZoneId = timeZoneId;
+		}
+
+		public String getBusinessUnit() {
+			return businessUnit;
+		}
+
+		public void setBusinessUnit(String businessUnit) {
+			this.businessUnit = businessUnit;
+		}
+
+		public String getSiloStatus() {
+			return siloStatus;
+		}
+
+		public void setSiloStatus(String siloStatus) {
+			this.siloStatus = siloStatus;
+		}
+
+		public String getCostCenter() {
+			return costCenter;
+		}
+
+		public void setCostCenter(String costCenter) {
+			this.costCenter = costCenter;
+		}
+
+		public String getFinancialLocCode() {
+			return financialLocCode;
+		}
+
+		public void setFinancialLocCode(String financialLocCode) {
+			this.financialLocCode = financialLocCode;
+		}
+		
+		public String getBusinessUnitName() {
+			return businessUnitName;
+		}
+
+		public void setBusinessUnitName(String businessUnitName) {
+			this.businessUnitName = businessUnitName;
+		}
+
+		public String getDepartmentName() {
+			return departmentName;
+		}
+
+		public void setDepartmentName(String departmentName) {
+			this.departmentName = departmentName;
+		}
+
+		public int compareTo(Object obj){
+	      EPUser user = (EPUser)obj;
+
+	      String c1 = getLastName() + getFirstName() + getMiddleInitial();
+	      String c2 = user.getLastName() + user.getFirstName() + user.getMiddleInitial();
+
+	      return c1.compareTo(c2);
+	    }
+
+		public boolean isOnline() {
+			return online;
+		}
+
+		public void setOnline(boolean online) {
+			this.online = online;
+		}
+
+		public String getChatId() {
+			return chatId;
+		}
+
+		public void setChatId(String chatId) {
+			this.chatId = chatId;
+		}
+
+		
+	public void setPseudoEPRoles(SortedSet<EPRole> pseudoRoles) {
+		this.pseudoRoles = pseudoRoles;
+	}
+	
+	public SortedSet<EPUserApp> getEPUserApps() {
+		return userApps;
+	}
+
+	public void setEPUserApps(SortedSet<EPUserApp> userApps) {
+		this.userApps = userApps;
+	}
+
+	public void addUserApp(EPUserApp userApp) {
+		userApps.add(userApp);
+	}
+	
+	public void addAppRoles(EPApp app, SortedSet<EPRole> roles) {
+		if (roles != null) {
+			// add all
+			SortedSet<EPUserApp> userApps = new TreeSet<EPUserApp>();
+			// this.userApps.removeAll(this.userApps);
+			Iterator<EPRole> itr = roles.iterator();
+			while (itr.hasNext()) {
+				EPRole role = (EPRole) itr.next();
+				EPUserApp userApp = new EPUserApp();
+				userApp.setUserId(this.id);
+				userApp.setApp(app);
+				userApp.setRole(role);
+				userApps.add(userApp);
+			}
+			setEPUserApps(userApps);
+		} else {
+			// remove all
+			setEPUserApps(null);
+		}
+
+	}
+
+	public SortedSet<EPRole> getAppEPRoles(EPApp app) {
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - app = {}", app.getName());
+		
+		SortedSet<EPRole> roles = new TreeSet<EPRole>();
+		SortedSet<EPUserApp> userAppRoles = getEPUserApps();
+		
+		logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - userApps = ", userAppRoles.size());
+
+		Iterator<EPUserApp> userAppRolesIterator = userAppRoles.iterator();
+		EPUserApp userAppRole = null;
+		// getting default app
+		while (userAppRolesIterator.hasNext()) {
+			EPUserApp tempUserApp = (EPUserApp) userAppRolesIterator.next();
+			if (tempUserApp.getApp().getId().equals(app.getId())) {
+
+				logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - for user {}, found application {}", this.getFullName(), app.getName());
+				
+				userAppRole = tempUserApp;
+				
+				EPRole role = userAppRole.getRole();
+				if(role.getActive()){
+					logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - Role {} is active - adding for user {} and app {}", role.getName(), this.getFullName(), app.getName());
+					roles.add((EPRole) role);
+				}
+				else{
+					logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - Role {} is NOT active - NOT adding for user {} and app {}", role.getName(), this.getFullName(), app.getName());
+				}				
+			}
+		}
+		logger.debug(EELFLoggerDelegate.debugLogger, "In EPUser.getAppEPRoles() - roles = ", roles.size());
+
+		return roles;
+	}
+
+	
+	/**
+	 * Attention! Not for use in ECOMP
+	 */
+	public SortedSet<EPRole> getAppRoles(EPApp app) {
+		SortedSet<EPRole> roles = new TreeSet<EPRole>();
+		SortedSet<EPUserApp> apps = getEPUserApps();
+		Iterator<EPUserApp> appsItr = apps.iterator();
+		EPUserApp userApp = null;
+		// getting default app
+		while (appsItr.hasNext()) {
+			EPUserApp tempUserApp = (EPUserApp) appsItr.next();
+			if (tempUserApp.getApp().getId().equals(app.getId())) {
+				userApp = tempUserApp;
+				roles.add((EPRole) userApp.getRole());
+			}
+		}
+		return roles;
+	}
+
+	
+
+	/**
+	 * Attention! Not for use in ECOMP
+	 */
+	public SortedSet<EPRole> getEPRoles() {
+		EPApp app = new EPApp();
+		app.setId(new Long(PortalConstants.PORTAL_APP_ID));
+		app.setName(ECOMP_PORTAL_NAME);
+		return getAppEPRoles(app);
+	}
+
+	/**
+	 * Attention! Not for use in ECOMP
+	 */
+	public void setEPRoles(SortedSet<EPRole> roles) {
+		EPApp app = new EPApp();
+		app.setId(new Long(PortalConstants.PORTAL_APP_ID));
+		app.setName(ECOMP_PORTAL_NAME);
+		addAppRoles(app, roles);
+	}
+
+	/**
+	 * Attention! Not for use in ECOMP
+	 */
+	public void removeEPRole(Long roleId) {
+		SortedSet<EPUserApp> apps = getEPUserApps();
+		Iterator<EPUserApp> appsItr = apps.iterator();
+		// getting default app
+		while (appsItr.hasNext()) {
+			EPUserApp tempUserApp = (EPUserApp) appsItr.next();
+			if (tempUserApp.equals(new Long(PortalConstants.PORTAL_APP_ID)) && tempUserApp.getRole().getId().equals(roleId)) {
+				appsItr.remove();
+			}
+		}
+	}
+
+	/**
+	 * Attention! Not for use in ECOMP
+	 */
+	public void addEPRole(EPRole role) {
+		if (role != null) {
+			SortedSet<EPRole> roles = getEPRoles();
+			if (roles == null) {
+				roles = new TreeSet<EPRole>();
+			}
+			roles.add(role);
+			setEPRoles(roles);
+		}
+	}
+	
+	public boolean isGuest() {
+		return isGuest;
+	}
+
+	public void setGuest(boolean isGuest) {
+		this.isGuest = isGuest;
+	}
+
+	@Override
+	public String toString() {
+		return "EPUser [orgId=" + orgId + ", managerId=" + managerId + ", firstName=" + firstName + ", middleInitial="
+				+ middleInitial + ", lastName=" + lastName + ", phone=" + phone + ", fax=" + fax + ", cellular="
+				+ cellular + ", email=" + email + ", addressId=" + addressId + ", alertMethodCd=" + alertMethodCd
+				+ ", hrid=" + hrid + ", orgUserId=" + orgUserId + ", orgCode=" + orgCode + ", address1=" + address1
+				+ ", address2=" + address2 + ", city=" + city + ", state=" + state + ", zipCode=" + zipCode
+				+ ", country=" + country + ", orgManagerUserId=" + orgManagerUserId + ", locationClli=" + locationClli
+				+ ", businessCountryCode=" + businessCountryCode + ", businessCountryName=" + businessCountryName
+				+ ", businessUnit=" + businessUnit + ", businessUnitName=" + businessUnitName + ", department="
+				+ department + ", departmentName=" + departmentName + ", companyCode=" + companyCode + ", company="
+				+ company + ", zipCodeSuffix=" + zipCodeSuffix + ", jobTitle=" + jobTitle + ", commandChain="
+				+ commandChain + ", siloStatus=" + siloStatus + ", costCenter=" + costCenter + ", financialLocCode="
+				+ financialLocCode + ", loginId=" + loginId + ", loginPwd=" + loginPwd + ", lastLoginDate="
+				+ lastLoginDate + ", active=" + active + ", internal=" + internal + ", selectedProfileId="
+				+ selectedProfileId + ", timeZoneId=" + timeZoneId + ", online=" + online + ", chatId=" + chatId
+				+ ", isGuest=" + isGuest + ", userApps=" + userApps + ", pseudoRoles=" + pseudoRoles + "]";
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserApp.java
new file mode 100644
index 00000000..9ed62d8b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserApp.java
@@ -0,0 +1,119 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+
+@SuppressWarnings("rawtypes")
+public class EPUserApp implements java.io.Serializable, Comparable {
+
+	private static final long serialVersionUID = 1L;
+	
+	private Long userId;
+	private EPApp app;
+	private EPRole role;
+	private Short priority;
+	
+	public EPUserApp() {
+	}
+	
+	public Long getAppId() {
+		return this.getApp().getId();
+	}
+	
+	public Long getRoleId() {
+		return (role == null) ? null : role.getId();
+	}
+	
+	public Long getAppRoleId() {
+		return (role.getAppRoleId() == null) ? null : role.getAppRoleId();
+	}
+		
+	@Override 
+	public String toString() {
+		String str = "[u: "+getUserId()+"; a: "+getAppId()+", r: "+getRoleId()+"; appRoleId: "+getAppRoleId()+"]";
+		return str;
+	}
+	
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long id) {
+		this.userId = id;
+	}
+
+	public EPApp getApp() {
+		return app;
+	}
+
+	public void setApp(EPApp app) {
+		this.app = app;
+	}
+
+	public EPRole getRole() {
+		return role;
+	}
+
+	public void setRole(EPRole role) {
+		this.role = role;
+	}
+		
+	public Short getPriority() {
+		return this.priority;
+	}
+
+	public void setPriority(Short priority) {
+		this.priority = priority;
+	}
+
+	public boolean equals(Object other) {
+		if ((this == other))
+			return true;
+		if ((other == null))
+			return false;
+		if (!(other instanceof EPUserApp))
+			return false;
+		EPUserApp castOther = (EPUserApp) other;
+
+		return (this.getUserId().equals(castOther.getUserId()))
+				&& (this.getApp().getId().equals(castOther.getApp().getId()))
+				&& (this.getRole().getId().equals(castOther.getRole().getId()))
+				&& ((this.priority==null && castOther.getPriority()==null) || this.getPriority().equals(castOther.getPriority()));
+	}
+
+	public int hashCode() {
+		int result = 17;
+
+		result = 37 * result + (int) (this.getUserId()==null ? 0 : this.getUserId().intValue());
+		result = 37 * result + (int) (this.getApp().getId()==null ? 0 : this.getApp().getId().intValue());
+		result = 37 * result + (int) (this.getRole().getId()==null ? 0 : this.getRole().getId().intValue());
+		result = 37 * result + (int) (this.priority==null ? 0 : this.priority);
+		return result;
+	}
+
+	public int compareTo(Object other){
+	    EPUserApp castOther = (EPUserApp) other;
+
+	    Long c1 = (this.getUserId()==null ? 0 : this.getUserId()) + (this.getApp()==null||this.getApp().getId()==null ? 0 : this.getApp().getId()) + (this.getRole()==null||this.getRole().getId()==null ? 0 : this.getRole().getId()) + (this.priority==null ? 0 : this.priority);
+	    Long c2 = (castOther.getUserId()==null ? 0 : castOther.getUserId()) + (castOther.getApp()==null||castOther.getApp().getId()==null ? 0 : castOther.getApp().getId()) + (castOther.getRole()==null||castOther.getRole().getId()==null ? 0 : castOther.getRole().getId()) + (castOther.priority==null ? 0 : castOther.priority);
+
+	    return c1.compareTo(c2);
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppCatalogRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppCatalogRoles.java
new file mode 100644
index 00000000..89411ea5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppCatalogRoles.java
@@ -0,0 +1,92 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@Entity
+@JsonInclude
+public class EPUserAppCatalogRoles extends DomainVo {
+
+	private static final long serialVersionUID = -5259869298825093816L;
+
+
+	@Id
+	@Column(name="requested_role_id")
+	public Long requestedRoleId;
+	
+	
+	@Id
+	@Column(name="role_name")
+	public String rolename;
+	
+	@Id
+	@Column(name="request_status")
+	public String requestStatus;
+	
+	@Id
+	@Column(name="app_id")
+	public Long appId;
+
+	public Long getRequestedRoleId() {
+		return requestedRoleId;
+	}
+
+	public void setRequestedRoleId(Long requestedRoleId) {
+		this.requestedRoleId = requestedRoleId;
+	}
+
+	public String getRolename() {
+		return rolename;
+	}
+
+	public void setRolename(String rolename) {
+		this.rolename = rolename;
+	}
+
+	public String getRequestStatus() {
+		return requestStatus;
+	}
+
+	public void setRequestStatus(String requestStatus) {
+		this.requestStatus = requestStatus;
+	}
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String toString() {
+		return "EPUserAppCatalogRoles [requestedRoleId=" + requestedRoleId + ", rolename=" + rolename
+				+ ", requestStatus=" + requestStatus + ", appId=" + appId + "]";
+	}
+
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRolesRequest.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRolesRequest.java
new file mode 100644
index 00000000..1d73945e
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRolesRequest.java
@@ -0,0 +1,87 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+
+import java.util.Date;
+import java.util.Set;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+
+public class EPUserAppRolesRequest extends DomainVo {
+	
+	private static final long serialVersionUID = -7225288307806389019L;
+	private Long userId;
+	private Long appId;
+	private Date createdDate;
+	private Date updatedDate;
+	private String requestStatus;
+	
+	private Set<EPUserAppRolesRequestDetail> epRequestIdDetail;
+
+	public final Long getUserId() {
+		return userId;
+	}
+
+	public final void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public final Long getAppId() {
+		return appId;
+	}
+
+	public final void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public final Date getCreatedDate() {
+		return createdDate;
+	}
+
+	public final void setCreatedDate(Date createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public final Date getUpdatedDate() {
+		return updatedDate;
+	}
+
+	public final void setUpdatedDate(Date updatedDate) {
+		this.updatedDate = updatedDate;
+	}
+
+	public final String getRequestStatus() {
+		return requestStatus;
+	}
+
+	public final void setRequestStatus(String requestStatus) {
+		this.requestStatus = requestStatus;
+	}
+
+	public final Set<EPUserAppRolesRequestDetail> getEpRequestIdDetail() {
+		return epRequestIdDetail;
+	}
+
+	public final void setEpRequestIdDetail(Set<EPUserAppRolesRequestDetail> epMyLoginsDetail) {
+		this.epRequestIdDetail = epMyLoginsDetail;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRolesRequestDetail.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRolesRequestDetail.java
new file mode 100644
index 00000000..d7989bcd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppRolesRequestDetail.java
@@ -0,0 +1,52 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class EPUserAppRolesRequestDetail extends DomainVo{
+
+	private static final long serialVersionUID = -4908856671135348157L;
+	
+	private Long reqRoleId;
+	private String reqType;
+	private EPUserAppRolesRequest epRequestIdData;
+	
+	public final EPUserAppRolesRequest getEpRequestIdData() {
+		return epRequestIdData;
+	}
+	public final void setEpRequestIdData(EPUserAppRolesRequest epRequestIdData) {
+		this.epRequestIdData = epRequestIdData;
+	}
+	public final Long getReqRoleId() {
+		return reqRoleId;
+	}
+	public final void setReqRoleId(Long reqRoleId) {
+		this.reqRoleId = reqRoleId;
+	}
+	public final String getReqType() {
+		return reqType;
+	}
+	public final void setReqType(String reqType) {
+		this.reqType = reqType;
+	}
+
+}
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppsManualSortPreference.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppsManualSortPreference.java
new file mode 100644
index 00000000..30d69bab
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppsManualSortPreference.java
@@ -0,0 +1,50 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class EPUserAppsManualSortPreference extends DomainVo {
+
+	private static final long serialVersionUID = -6270136291139278216L;
+	private int userId;
+	private Long appId;
+	private int appManualSortOrder;
+	
+	public int getUserId() {
+		return userId;
+	}
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+	public Long getAppId() {
+		return appId;
+	}
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+	public int getAppManualSortOrder() {
+		return appManualSortOrder;
+	}
+	public void setAppManualSortOrder(int appManualSortOrder) {
+		this.appManualSortOrder = appManualSortOrder;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppsSortPreference.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppsSortPreference.java
new file mode 100644
index 00000000..1cab30ff
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserAppsSortPreference.java
@@ -0,0 +1,44 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class EPUserAppsSortPreference extends DomainVo{
+
+	private static final long serialVersionUID = -5267000174894006433L;
+
+	private int userId;
+	private String sortPref;
+	
+	public int getUserId() {
+		return userId;
+	}
+	public void setUserId(final int userId) {
+		this.userId = userId;
+	}
+	public String getSortPref() {
+		return sortPref;
+	}
+	public void setSortPref(final String sortPref) {
+		this.sortPref = sortPref;
+	}
+		
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserNotification.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserNotification.java
new file mode 100644
index 00000000..c82db4de
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPUserNotification.java
@@ -0,0 +1,57 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.Date;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+
+public class EPUserNotification extends DomainVo {	
+	private Long userId;
+	private Long notificationId;
+	private String viewed;
+	private Date updateTime;
+	
+	public Long getUserId() {
+		return userId;
+	}
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+	public Long getNotificationId() {
+		return notificationId;
+	}
+	public void setNotificationId(Long notificationId) {
+		this.notificationId = notificationId;
+	}
+	public String getViewed() {
+		return viewed;
+	}
+	public void setViewed(String viewed) {
+		this.viewed = viewed;
+	}
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPWidgetsManualSortPreference.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPWidgetsManualSortPreference.java
new file mode 100644
index 00000000..4a3b784b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EPWidgetsManualSortPreference.java
@@ -0,0 +1,70 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class EPWidgetsManualSortPreference extends DomainVo{
+
+	private static final long serialVersionUID = 4607102334801223570L;
+	private int userId;
+	private Long widgetId;
+	private int widgetRow;
+	private int widgetCol;
+	private int widgetWidth;
+	private int widgetHeight;
+
+	public int getUserId() {
+		return userId;
+	}
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+	public Long getWidgetId() {
+		return widgetId;
+	}
+	public void setWidgetId(Long widgetId) {
+		this.widgetId = widgetId;
+	}
+	public int getWidgetRow() {
+		return widgetRow;
+	}
+	public void setWidgetRow(int widgetRow) {
+		this.widgetRow = widgetRow;
+	}
+	public int getWidgetCol() {
+		return widgetCol;
+	}
+	public void setWidgetCol(int widgetCol) {
+		this.widgetCol = widgetCol;
+	}
+	public int getWidgetWidth() {
+		return widgetWidth;
+	}
+	public void setWidgetWidth(int widgetWidth) {
+		this.widgetWidth = widgetWidth;
+	}
+	public int getWidgetHeight() {
+		return widgetHeight;
+	}
+	public void setWidgetHeight(int widgetHeight) {
+		this.widgetHeight = widgetHeight;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java
new file mode 100644
index 00000000..1cf89fbd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompApp.java
@@ -0,0 +1,146 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+/**
+ * Model for a subset of the columns in the fn_app table.
+ */
+public class EcompApp {
+	
+	protected Long id;
+
+	public Long getId() {
+		return id;
+	}
+	
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+    private String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	private String imageUrl;
+
+	public String getImageUrl() {
+		return imageUrl;
+	}
+
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
+	
+	private String description;
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+	private String notes;
+
+	public String getNotes() {
+		return notes;
+	}
+
+	public void setNotes(String notes) {
+		this.notes = notes;
+	}	
+
+	private String url;
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	private String alternateUrl;
+
+	public String getAlternateUrl() {
+		return alternateUrl;
+	}
+
+	public void setAlternateUrl(String alternateUrl) {
+		this.alternateUrl = alternateUrl;
+	}
+	
+	private String uebTopicName;
+	
+	public String getUebTopicName() {
+		return uebTopicName;
+	}
+	
+	public void setUebTopicName(String topicName) {
+		this.uebTopicName = topicName;
+	}
+	
+	private String uebKey;
+	
+	public String getUebKey() {
+		return uebKey;
+	}
+	
+	public void setUebKey(String uebKey) {
+		this.uebKey = uebKey;
+	}
+	
+	private String uebSecret;
+	
+	public String getUebSecret() {
+		return uebSecret;
+	}
+	
+	public void setUebSecret(String secret) {
+		this.uebSecret = secret;
+	}
+	
+	private Boolean enabled;
+	
+	public Boolean isEnabled() {
+		return enabled;
+	}
+	
+	public void setEnabled(Boolean enable) {
+		this.enabled = enable;
+	}
+
+	private Boolean restrictedApp;
+	
+	public Boolean isRestrictedApp() {
+		return restrictedApp;
+	}
+	
+	public void setRestrictedApp(Boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAppRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAppRole.java
new file mode 100644
index 00000000..78cf4162
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAppRole.java
@@ -0,0 +1,80 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+@Entity
+@IdClass(EcompAppRoleId.class)
+public class EcompAppRole {
+
+	@Id
+	@Column(name="app_id")
+	private Long appId;
+ 
+	@Id
+	@Column(name="app_name")
+	private String appName; 
+	
+	@Id
+	@Column(name="role_id")
+	private Integer roleId;
+	
+	@Id
+	@Column(name="role_name")
+	private String roleName;
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAppRoleId.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAppRoleId.java
new file mode 100644
index 00000000..d89c0736
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAppRoleId.java
@@ -0,0 +1,83 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+public class EcompAppRoleId implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="app_id")
+	private Long appId;
+ 
+	@Id
+	@Column(name="app_name")
+	private String appName; 
+	
+	@Id
+	@Column(name="role_id")
+	private Integer roleId;
+	
+	@Id
+	@Column(name="role_name")
+	private String roleName;
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAuditLog.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAuditLog.java
new file mode 100644
index 00000000..4d4ec277
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EcompAuditLog.java
@@ -0,0 +1,61 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.Date;
+
+import org.openecomp.portalsdk.core.domain.AuditLog;
+
+public class EcompAuditLog extends AuditLog {
+
+	private static final long serialVersionUID = 7970458389782626231L;
+	
+	// values of activity_cd column in table fu_lu_activity
+	// as loaded by DML sql script
+	public static final String CD_ACTIVITY_ADD_CHILD_ROLE = "add_child_role";
+	public static final String CD_ACTIVITY_ADD_ROLE = "add_role";
+	public static final String CD_ACTIVITY_ADD_ROLE_FUNCTION = "add_role_function";
+	public static final String CD_ACTIVITY_ADD_USER_ROLE = "add_user_role";
+	public static final String CD_ACTIVITY_APP_ACCESS = "app_access";
+	public static final String CD_ACTIVITY_FUNCTIONAL_ACCESS = "functional_access";
+	public static final String CD_ACTIVITY_GUEST_LOGIN = "guest_login";
+	public static final String CD_ACTIVITY_LOGIN = "login";
+	public static final String CD_ACTIVITY_LOGOUT = "logout";
+	public static final String CD_ACTIVITY_MOBILE_LOGIN = "mobile_login";
+	public static final String CD_ACTIVITY_MOBILE_LOGOUT = "mobile_logout";
+	public static final String CD_ACTIVITY_REMOVE_CHILD_ROLE = "remove_child_role";
+	public static final String CD_ACTIVITY_REMOVE_ROLE = "remove_role";
+	public static final String CD_ACTIVITY_REMOVE_ROLE_FUNCTION = "remove_role_function";
+	public static final String CD_ACTIVITY_REMOVE_USER_ROLE = "remove_user_role";
+	public static final String CD_ACTIVITY_TAB_ACCESS = "tab_access";
+	public static final String CD_ACTIVITY_SEARCH = "search";
+	public static final String CD_ACTIVITY_ADD_PORTAL_ADMIN = "apa ";
+	public static final String CD_ACTIVITY_DELETE_PORTAL_ADMIN = "dpa";
+	public static final String CD_ACTIVITY_UPDATE_USER = "uu ";
+	public static final String CD_ACTIVITY_UPDATE_ACCOUNT_ADMIN = "uaa ";
+	public static final String CD_ACTIVITY_STORE_ANALYTICS = "store_analytics";
+
+	/**
+	 * Creates a new object with the created field set to the current date-time.
+	 */
+	public EcompAuditLog() {
+		setCreated(new Date());
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EpUserAppRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EpUserAppRoles.java
new file mode 100644
index 00000000..1bfb1841
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/EpUserAppRoles.java
@@ -0,0 +1,63 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@Entity
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EpUserAppRoles extends DomainVo {
+
+	private static final long serialVersionUID = -1484592641766545668L;
+
+	@Id
+	@Column(name ="role_id")
+	public Long roleId;
+	
+	@Id
+	@Column(name ="app_id")
+	public Long appId;
+	
+	public Long getRoleId() {
+		return roleId;
+	}
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+	public Long getAppId() {
+		return appId;
+	}
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+	
+	@Override
+	public String toString() {
+		return "EpUserAppRoles [roleId=" + roleId + ", appId=" + appId + "]";
+	}
+}
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/ExternalSystemAccess.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/ExternalSystemAccess.java
new file mode 100644
index 00000000..a0395bf8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/ExternalSystemAccess.java
@@ -0,0 +1,49 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+public class ExternalSystemAccess {
+	
+	private String key;
+	private Boolean accessValue;
+		
+	public ExternalSystemAccess(String key, Boolean accessValue){
+		this.key = key;
+		this.accessValue = accessValue;
+	}
+	
+	public String getKey() {
+		return key;
+	}
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public Boolean getAccessValue() {
+		return accessValue;
+	}
+
+	public void setAccessValue(Boolean accessValue) {
+		this.accessValue = accessValue;
+	}
+	
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/FunctionalMenuItemWithAppID.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/FunctionalMenuItemWithAppID.java
new file mode 100644
index 00000000..ac2bc6c4
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/FunctionalMenuItemWithAppID.java
@@ -0,0 +1,96 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+/***
+ * 
+ * This class is almost identical to org.openecomp.portalapp.portal.transport.FunctionalMenuItem
+ * The only difference is the appId field. In FunctionMenuItem, we used @Transient as an attribute, and we are using @Column in this class.
+ * In some sql queries, we need to have appId, but it's not a field in fn_menu_functional table.
+ * 
+ * @author robertlo
+ *
+ */
+@Entity
+public class FunctionalMenuItemWithAppID{
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "MENU_ID")
+	public Long menuId;
+	
+	@Column(name = "COLUMN_NUM")
+	public Integer column;
+	
+	@Column(name = "TEXT")
+	public String text;
+	
+	@Column(name = "PARENT_MENU_ID")
+	public Integer parentMenuId;
+	
+	@Column(name = "URL")
+	public String url;
+	
+	@Column(name="ACTIVE_YN")
+	public String active_yn;
+
+	@Column(name="APP_ID")
+	public Integer appid;
+	
+	@Transient
+	public List<Integer> roles;
+	
+	@Transient
+	public Boolean restrictedApp;
+	
+	public void normalize() {
+		if (this.column == null)
+			this.column = new Integer(1);
+		this.text = (this.text == null) ? "" : this.text.trim();
+		if (this.parentMenuId == null)
+			this.parentMenuId = new Integer(-1);
+		this.url = (this.url == null) ? "" : this.url.trim();
+	}
+
+	@Override
+	public String toString() {
+		return "FunctionalMenuItem [menuId=" + menuId + ", column=" + column + ", text=" + text + ", parentMenuId="
+				+ parentMenuId + ", url=" + url + ", active_yn=" + active_yn + ", appid=" + appid + ", roles=" + roles
+				+ ", restrictedApp=" + restrictedApp + "]";
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public void setRestrictedApp(Boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+}
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/GetAccessResult.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/GetAccessResult.java
new file mode 100644
index 00000000..4669426a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/GetAccessResult.java
@@ -0,0 +1,114 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@Entity
+@JsonInclude
+public class GetAccessResult implements Serializable{
+
+
+	private static final long serialVersionUID = 5239527705869613411L;
+
+	@Id
+	@Column(name="row_id")
+	private String rowId;
+	
+	@Column(name="role_id")
+	private Long roleId;
+	
+	@Column(name="ecomp_function",nullable=true)
+	private String ecompFunction;
+	
+	@Column(name="app_name")
+	private String appName; 
+	
+	@Column(name="app_mots_id",nullable=true)
+	private Integer appMotsId;
+	
+	@Column(name="role_name")
+	private String roleName;
+	
+	@Column(name="role_actv",nullable=true)
+	private String roleActive;
+	
+	
+	@Column(name="request_type",nullable=true)
+	private String reqType;
+	
+	
+	
+	public final String getRowId() {
+		return rowId;
+	}
+	public final void setRowId(String rowId) {
+		this.rowId = rowId;
+	}
+	public final Long getRoleId() {
+		return roleId;
+	}
+	public final void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	} 
+	public String getEcompFunction() {
+		return ecompFunction;
+	}
+	public void setEcompFunction(String ecompFunction) {
+		this.ecompFunction = ecompFunction;
+	}
+	public String getAppName() {
+		return appName;
+	}
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+	public Integer getAppMotsId() {
+		return appMotsId;
+	}
+	public void setAppMotsId(Integer appMotsId) {
+		this.appMotsId = appMotsId;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public final String getRoleActive() {
+		return roleActive;
+	}
+	public final void setRoleActive(String roleActive) {
+		this.roleActive = roleActive;
+	}
+	public final String getReqType() {
+		return reqType;
+	}
+	public final void setReqType(String reqType) {
+		this.reqType = reqType;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/GetAccessResultId.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/GetAccessResultId.java
new file mode 100644
index 00000000..0830bfd8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/GetAccessResultId.java
@@ -0,0 +1,64 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+public class GetAccessResultId implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="ecomp_function")
+	private String ecompFunction;
+
+	@Id
+	@Column(name="app_name")
+	private String appName; 
+	
+	@Id
+	@Column(name="role_name")
+	private String roleName;
+	
+	public String getEcompFunction() {
+		return ecompFunction;
+	}
+	public void setEcompFunction(String ecompFunction) {
+		this.ecompFunction = ecompFunction;
+	}
+	public String getAppName() {
+		return appName;
+	}
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/MicroserviceData.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/MicroserviceData.java
new file mode 100644
index 00000000..91366ce8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/MicroserviceData.java
@@ -0,0 +1,146 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class MicroserviceData extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+
+	public MicroserviceData() {
+
+	}
+
+	private Long id;
+
+	private String name;
+
+	private String active;
+
+	private String desc;
+
+	private long appId;
+
+	private String url;
+
+	private String securityType;
+
+	private String username;
+
+	private String password;
+
+	private List<MicroserviceParameter> parameterList;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getActive() {
+		return active;
+	}
+
+	public void setActive(String active) {
+		this.active = active;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	public long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(long appId) {
+		this.appId = appId;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getSecurityType() {
+		return securityType;
+	}
+
+	public void setSecurityType(String securityType) {
+		this.securityType = securityType;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public List<MicroserviceParameter> getParameterList() {
+		return parameterList;
+	}
+
+	public void setParameterList(List<MicroserviceParameter> parameterList) {
+		this.parameterList = parameterList;
+	}
+
+	@Override
+	public String toString() {
+		return "MicroserviceData [id=" + id + ", name=" + name + ", desc=" + desc + ", appId=" + appId + ", url=" + url
+				+ ", securityType=" + securityType + ", username=" + username + ", password=" + password
+				+ ", parameterList=" + parameterList + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/MicroserviceParameter.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/MicroserviceParameter.java
new file mode 100644
index 00000000..74a29370
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/MicroserviceParameter.java
@@ -0,0 +1,82 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class MicroserviceParameter extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+
+	public MicroserviceParameter() {
+
+	}
+
+	private Long id;
+
+	private long serviceId;
+
+	private String para_key;
+
+	private String para_value;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public long getServiceId() {
+		return serviceId;
+	}
+
+	public void setServiceId(long serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public String getPara_key() {
+		return para_key;
+	}
+
+	public void setPara_key(String para_key) {
+		this.para_key = para_key;
+	}
+
+	public String getPara_value() {
+		return para_value;
+	}
+
+	public void setPara_value(String para_value) {
+		this.para_value = para_value;
+	}
+
+	@Override
+	public String toString() {
+		return "MicroserviceParameter [id=" + id + ", serviceId=" + serviceId + ", para_key=" + para_key
+				+ ", para_value=" + para_value + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/PersUserAppSelection.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/PersUserAppSelection.java
new file mode 100644
index 00000000..68875bf5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/PersUserAppSelection.java
@@ -0,0 +1,78 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+/**
+ * Models a row in the table with personalization of user app selections.
+ */
+public class PersUserAppSelection extends DomainVo {
+
+	private static final long serialVersionUID = 1545308654500121206L;
+
+	private Long userId;
+
+	private Long appId;
+
+	private String statusCode;
+
+	public PersUserAppSelection() {}
+	
+	/**
+	 * Convenience constructor
+	 * 
+	 * @param id
+	 * @param userId
+	 * @param appId
+	 * @param statusCode
+	 */
+	public PersUserAppSelection(final Long id, final Long userId, final Long appId, final String statusCode) {
+		super.id = id;
+		this.userId = userId;
+		this.appId = appId;
+		this.statusCode = statusCode;
+	}
+	
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getStatusCode() {
+		return statusCode;
+	}
+
+	public void setStatusCode(String statusCode) {
+		this.statusCode = statusCode;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/PersUserWidgetSelection.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/PersUserWidgetSelection.java
new file mode 100644
index 00000000..4993b462
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/PersUserWidgetSelection.java
@@ -0,0 +1,81 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+/**
+ * Models a row in the table with personalization of user widget selections.
+ */
+public class PersUserWidgetSelection extends DomainVo {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6547880514779039200L;
+
+	private Long userId;
+
+	private Long widgetId;
+
+	private String statusCode;
+
+	public PersUserWidgetSelection() {}
+	
+	/**
+	 * Convenience constructor
+	 * 
+	 * @param id
+	 * @param userId
+	 * @param widgetId
+	 * @param statusCode
+	 */
+	public PersUserWidgetSelection(final Long id, final Long userId, final Long widgetId, final String statusCode) {
+		super.id = id;
+		this.userId = userId;
+		this.widgetId = widgetId;
+		this.statusCode = statusCode;
+	}
+	
+	public Long getWidgetId() {
+		return widgetId;
+	}
+
+	public void setWidgetId(Long widgetId) {
+		this.widgetId = widgetId;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getStatusCode() {
+		return statusCode;
+	}
+
+	public void setStatusCode(String statusCode) {
+		this.statusCode = statusCode;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/RoleApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/RoleApp.java
new file mode 100644
index 00000000..ade24dcb
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/RoleApp.java
@@ -0,0 +1,114 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+//@Entity
+//@Table(name = "FN_ROLE")
+public class RoleApp implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+	//@Id
+	//@Column(name = "ROLE_ID")
+	//@GeneratedValue(strategy=GenerationType.AUTO)
+	private Long roleId;
+	
+	
+	//@Column(name = "ROLE_Name")
+	private String roleName;
+	
+	//@ManyToOne(fetch = FetchType.EAGER)
+	//@JoinColumn(name="APP_ID")
+	private App app;
+	
+	//@JsonIgnore
+	//@ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH}, mappedBy="widgetRoles")
+	private Set<WidgetCatalog> widgets;
+
+	/*@PreRemove
+	private void removeGroupsFromUsers() {
+	    for (WidgetCatalog w : widgets) {
+	        w.getWidgetRoles().remove(this);
+	    }
+	}*/
+	
+	/*@ManyToOne
+	@JoinColumn(name = "WIDGET_ID", nullable = false)
+	WidgetCatalog widgetCatalog;*/
+
+	//@JsonIgnore
+	//@ManyToMany(mappedBy = "widgetRoles")
+	//@ManyToMany(fetch = FetchType.EAGER, mappedBy = "widgetRoles")
+	//private Set<WidgetCatalog> widgets  = new HashSet<WidgetCatalog>();
+	
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public App getApp() {
+		return app;
+	}
+
+	public void setApp(App app) {
+		this.app = app;
+	}
+	
+	
+
+	public Set<WidgetCatalog> getWidgets() {
+		return widgets;
+	}
+
+	public void setWidgets(Set<WidgetCatalog> widgets) {
+		this.widgets = widgets;
+	}
+
+	@Override
+	public String toString() {
+		return "Role [roleId=" + roleId + ", roleName=" + roleName + ", app=" + app + "]";
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/SharedContext.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/SharedContext.java
new file mode 100644
index 00000000..f966c964
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/SharedContext.java
@@ -0,0 +1,161 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+/**
+ * A shared context is a key-value pair in a session. All shared-context objects
+ * should be dropped when a session is destroyed. Because there's always a
+ * chance of missing that event, this object notes its creation time so that it
+ * can be expired after a suitable time interval.
+ */
+@Entity
+@Table(name = "fn_shared_context")
+public class SharedContext extends DomainVo {
+
+	// generated
+	private static final long serialVersionUID = 7287469622586677888L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
+	private Date create_time;
+	private String context_id;
+	private String ckey;
+	private String cvalue;
+
+	/**
+	 * Mandatory no-argument constructor
+	 */
+	public SharedContext() {
+	}
+
+	/**
+	 * Convenience constructor. The database ID and creation timestamp are
+	 * populated when the object is added to the database.
+	 */
+	public SharedContext(final String contextId, final String key, final String value) {
+		this.context_id = contextId;
+		this.ckey = key;
+		this.cvalue = value;
+	}
+
+	/**
+	 * Gets the database row ID.
+	 * 
+	 * @return Database row ID
+	 */
+	public Long getId() {
+		return id;
+	}
+
+	/**
+	 * Sets the database row ID.
+	 * 
+	 * @param id
+	 */
+	public void setId(final Long id) {
+		this.id = id;
+	}
+
+	/**
+	 * Gets the creation time
+	 * 
+	 * @return Creation time as a Date
+	 */
+	public Date getCreate_time() {
+		return create_time;
+	}
+
+	/**
+	 * Sets the creation time
+	 * 
+	 * @param create_time
+	 */
+	public void setCreate_time(final Date create_time) {
+		this.create_time = create_time;
+	}
+
+	/**
+	 * Gets the context ID
+	 * 
+	 * @return Context ID
+	 */
+	public String getContext_id() {
+		return context_id;
+	}
+
+	/**
+	 * Sets the context ID
+	 * 
+	 * @param context_id
+	 */
+	public void setContext_id(final String context_id) {
+		this.context_id = context_id;
+	}
+
+	/**
+	 * Gets the key of the key-value pair. Called ckey because "key" is a
+	 * reserved word in Mysql.
+	 * 
+	 * @return The key
+	 */
+	public String getCkey() {
+		return ckey;
+	}
+
+	/**
+	 * Sets the key of the key-value pair.
+	 * 
+	 * @param ckey
+	 */
+	public void setCkey(final String ckey) {
+		this.ckey = ckey;
+	}
+
+	/**
+	 * Gets the value of the key-value pair. Called cvalue because "value" is a
+	 * reserved word in Mysql.
+	 * 
+	 * @return
+	 */
+	public String getCvalue() {
+		return cvalue;
+	}
+
+	/**
+	 * Sets the value of the key-value pair.
+	 * 
+	 * @param cvalue
+	 */
+	public void setCvalue(final String cvalue) {
+		this.cvalue = cvalue;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserIdRoleId.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserIdRoleId.java
new file mode 100644
index 00000000..4d2041dd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserIdRoleId.java
@@ -0,0 +1,77 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class UserIdRoleId implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="USER_ID")
+	private String user_Id;
+	
+	@Column(name="ROLE_ID")
+	private String roleId;
+	
+	@Column(name="ORG_USER_ID")
+	private String orgUserId;
+	
+	@Column(name="APP_ID")
+	private String appId;
+
+	public String getUser_Id() {
+		return user_Id;
+	}
+
+	public void setUser_Id(String id) {
+		this.user_Id = id;
+	}
+
+	public String getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(String roleId) {
+		this.roleId = roleId;
+	}
+	
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+	
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRole.java
new file mode 100644
index 00000000..0e13cc01
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRole.java
@@ -0,0 +1,91 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class UserRole implements Serializable{
+	private static final long serialVersionUID = 1L;
+	
+	
+	@Id
+	@Column(name="USER_ID")
+	private Long user_Id;
+	
+	@Id
+	@Column(name="ROLE_ID")
+	private Long roleId;
+	
+	@Column(name="ORG_USER_ID")
+	private String orgUserId;
+
+	
+	@Column(name="FIRST_NAME")
+	private String firstName;
+	
+	@Column(name="LAST_NAME")
+	private String lastName;
+
+	
+	@Column(name="ROLE_NAME")
+	private String roleName; 
+	
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public Long getUser_Id() {
+		return user_Id;
+	}
+	public void setUser_Id(Long user_Id) {
+		this.user_Id = user_Id;
+	}
+	public Long getRoleId() {
+		return roleId;
+	}
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java
new file mode 100644
index 00000000..1483f34a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/UserRoles.java
@@ -0,0 +1,113 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+
+public class UserRoles implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/* 
+	private static final HashMap<Long, String> rolesDictionary;
+	// remove hard coded roles
+	static {
+		rolesDictionary = new HashMap<Long, String>();
+		rolesDictionary.put(Long.valueOf(SystemProperties.getProperty(SystemProperties.SYS_ADMIN_ROLE_ID)).longValue(), "superAdmin");
+		rolesDictionary.put(Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID)).longValue(), "admin");
+	}
+	*/
+
+	public UserRoles(UserRole user) {
+		setOrgUserId(user.getOrgUserId());
+		setFirstName(user.getFirstName());
+		setLastName(user.getLastName());
+		setGuestSession(user.getUser_Id()==-1 ? true : false);
+
+		addRole(user.getRoleName());
+	}
+
+	public void addRole(String roleName) {
+		//String normalizedRole = normalizeRole(roleId);
+		if (!getRoles().contains(roleName)) {
+			this.roles.add(roleName);
+		}
+	}
+
+	/*
+	public static String normalizeRole(Long role) {
+		String roleTranslated = rolesDictionary.get(role);
+		return roleTranslated == null ? "user" : roleTranslated;
+	}
+	*/
+
+	private String orgUserId;
+	private String firstName;
+	private String lastName;
+	private boolean guestSession;
+
+	// TODO: Make into set
+	private List<String> roles = new ArrayList<String>();
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+
+	public List<String> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<String> roles) {
+		this.roles = roles;
+	}
+
+	public void setGuestSession(boolean guestSession) {
+		this.guestSession = guestSession;
+	}
+
+	public boolean getGuestSession() {
+		return this.guestSession;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/Widget.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/Widget.java
new file mode 100644
index 00000000..c2ef3c00
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/Widget.java
@@ -0,0 +1,105 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.apache.commons.lang.StringUtils;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class Widget extends DomainVo {
+
+	private static final long serialVersionUID = 1L;
+
+	private String name;
+
+	private Integer width;
+
+	private Integer height;
+
+	private String url;
+
+	private Long appId;
+
+	public Widget() {
+		// Attention!!!
+		// We set here all default values. We also place protection
+		// into setters for fields with default values.
+		// If we don't use such protection we are able to place null
+		// to these fields and save such fields into DB even if DB has
+		// default values for these fields.
+		this.name = "";
+		this.width = new Integer(0);
+		this.height = new Integer(0);
+		this.url = "";
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		if (StringUtils.isEmpty(name)) {
+			name = "";
+		}
+		this.name = name;
+	}
+
+	public Integer getWidth() {
+		return width;
+	}
+
+	public void setWidth(Integer width) {
+		if (width == null) {
+			width = new Integer(0);
+		}
+		this.width = width;
+	}
+
+	public Integer getHeight() {
+		return height;
+	}
+
+	public void setHeight(Integer height) {
+		if (height == null) {
+			height = new Integer(0);
+		}
+		this.height = height;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		if (StringUtils.isEmpty(url)) {
+			url = "";
+		}
+		this.url = url;
+	}
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetCatalog.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetCatalog.java
new file mode 100644
index 00000000..605a41d2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetCatalog.java
@@ -0,0 +1,109 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.io.Serializable;
+import java.util.Set;
+
+public class WidgetCatalog implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+
+	private long id;
+	
+	private String name;
+	
+	private String desc;
+	
+	private String fileLocation;
+	
+	private String allowAllUser;
+	
+	private Long serviceId;
+	
+	private String sortOrder;
+
+	private String statusCode;
+	
+	private Set<RoleApp> widgetRoles;
+	
+	public long getId() {
+		return id;
+	}
+	public void setId(long id) {
+		this.id = id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public Long getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Long serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+	public String getFileLocation() {
+		return fileLocation;
+	}
+	public void setFileLocation(String fileLocation) {
+		this.fileLocation = fileLocation;
+	}
+	
+	public String getAllowAllUser() {
+		return allowAllUser;
+	}
+	public void setAllowAllUser(String allowAllUser) {
+		this.allowAllUser = allowAllUser;
+	}
+	public Set<RoleApp> getWidgetRoles() {
+		return widgetRoles;
+	}
+	public void setWidgetRoles(Set<RoleApp> widgetRoles) {
+		this.widgetRoles = widgetRoles;
+	}
+	
+	public String getSortOrder() {
+		return sortOrder;
+	}
+	public void setSortOrder(String sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+	public String getStatusCode() {
+		return statusCode;
+	}
+	public void setStatusCode(String statusCode) {
+		this.statusCode = statusCode;
+	}
+	@Override
+	public String toString() {
+		return "WidgetCatalog [id=" + id + ", name=" + name + ", desc=" + desc + ", fileLocation=" + fileLocation
+				+ ", allowAllUser=" + allowAllUser + "]";
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetCatalogParameter.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetCatalogParameter.java
new file mode 100644
index 00000000..c72780aa
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetCatalogParameter.java
@@ -0,0 +1,90 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+public class WidgetCatalogParameter extends DomainVo{
+	
+	private static final long serialVersionUID = 1L;
+
+	public WidgetCatalogParameter() {
+
+	}
+	private Long id;
+
+	private Long widgetId;
+
+	private Long userId;
+
+	private Long paramId;
+
+	private String user_value;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getWidgetId() {
+		return widgetId;
+	}
+
+	public void setWidgetId(Long widgetId) {
+		this.widgetId = widgetId;
+	}
+
+	public String getUser_value() {
+		return user_value;
+	}
+
+	public void setUser_value(String user_value) {
+		this.user_value = user_value;
+	}
+
+	public Long getParamId() {
+		return paramId;
+	}
+
+	public void setParamId(Long paramId) {
+		this.paramId = paramId;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public String toString() {
+		return "WidgetCatalogParameter [id=" + id + ", widgetId=" + widgetId + ", userId=" + userId + ", paramId="
+				+ paramId + ", user_value=" + user_value + "]";
+	}
+
+	
+
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetParameterResult.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetParameterResult.java
new file mode 100644
index 00000000..884ec141
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetParameterResult.java
@@ -0,0 +1,70 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+public class WidgetParameterResult {
+	
+	private Long param_id;
+	
+	private String param_key;
+	
+	private String user_value;
+	
+	private String default_value;
+
+	public Long getParam_id() {
+		return param_id;
+	}
+
+	public void setParam_id(Long param_id) {
+		this.param_id = param_id;
+	}
+
+	public String getParam_key() {
+		return param_key;
+	}
+
+	public void setParam_key(String param_key) {
+		this.param_key = param_key;
+	}
+
+	public String getUser_value() {
+		return user_value;
+	}
+
+	public void setUser_value(String user_value) {
+		this.user_value = user_value;
+	}
+
+	public String getDefault_value() {
+		return default_value;
+	}
+
+	public void setDefault_value(String default_value) {
+		this.default_value = default_value;
+	}
+
+	@Override
+	public String toString() {
+		return "WidgetParameterResult [param_id=" + param_id + ", param_key=" + param_key + ", user_value=" + user_value
+				+ ", default_value=" + default_value + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetServiceHeaders.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetServiceHeaders.java
new file mode 100644
index 00000000..9200adda
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/domain/WidgetServiceHeaders.java
@@ -0,0 +1,54 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.domain;
+
+import java.nio.charset.Charset;
+
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.http.HttpHeaders;
+
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+public class WidgetServiceHeaders {
+	
+	private static HttpHeaders widgetHeaders;
+	
+	private WidgetServiceHeaders(){}
+	
+	public static HttpHeaders getInstance() throws Exception{
+		if(null == widgetHeaders){
+		   return new HttpHeaders(){{
+			   	
+				    String username = EcompPortalUtils.getPropertyOrDefault("microservices.widget.username", "widget_user");
+				    String password = CipherUtil.decrypt(EcompPortalUtils.getPropertyOrDefault("microservices.widget.password", "widget_password"));
+			        String auth = username + ":" + password;
+			        byte[] encodedAuth = Base64.encodeBase64( 
+			           auth.getBytes(Charset.forName("US-ASCII")) );
+			        String authHeader = "Basic " + new String( encodedAuth );
+			        set( "Authorization", authHeader );
+			      }
+			   };
+		}
+		else 
+			return widgetHeaders;
+		
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppCatalogItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppCatalogItem.java
new file mode 100644
index 00000000..ec20b4f3
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppCatalogItem.java
@@ -0,0 +1,249 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * This model of an application catalog entry has some EPApp fields plus
+ * additional fields to indicate access(ible) and select(ed) statuses.
+ */
+@Entity
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AppCatalogItem extends DomainVo {
+
+	private static final long serialVersionUID = 6619663784935017846L;
+
+	@Id
+	private Long id;
+	private String name;
+	private String imageUrl;
+	private String description;
+	private String notes;
+	private String url;
+	private String alternateUrl;
+	private Boolean restricted;
+	private Boolean open;
+	private Boolean access;
+	private Boolean select;
+	private Boolean pending;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getImageUrl() {
+		return imageUrl;
+	}
+
+	public void setImageUrl(String imageUrl) {
+		this.imageUrl = imageUrl;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getNotes() {
+		return notes;
+	}
+
+	public void setNotes(String notes) {
+		this.notes = notes;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getAlternateUrl() {
+		return alternateUrl;
+	}
+
+	public void setAlternateUrl(String alternateUrl) {
+		this.alternateUrl = alternateUrl;
+	}
+
+	public Boolean getRestricted() {
+		return restricted;
+	}
+
+	public void setRestricted(Boolean restricted) {
+		this.restricted = restricted;
+	}
+
+	public Boolean getOpen() {
+		return open;
+	}
+
+	public void setOpen(Boolean open) {
+		this.open = open;
+	}
+
+	public Boolean getAccess() {
+		return access;
+	}
+
+	public void setAccess(Boolean access) {
+		this.access = access;
+	}
+
+	public Boolean getSelect() {
+		return select;
+	}
+
+	public void setSelect(Boolean select) {
+		this.select = select;
+	}
+
+	public Boolean getPending() {
+		return pending;
+	}
+
+	public void setPending(Boolean pending) {
+		this.pending = pending;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	@Override
+	public String toString() {
+		return "AppCatalogItem [id=" + id + ", name=" + name + ", access=" + access + ", select=" + select
+				+ ", pending=" + pending + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((access == null) ? 0 : access.hashCode());
+		result = prime * result + ((alternateUrl == null) ? 0 : alternateUrl.hashCode());
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((imageUrl == null) ? 0 : imageUrl.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((notes == null) ? 0 : notes.hashCode());
+		result = prime * result + ((open == null) ? 0 : open.hashCode());
+		result = prime * result + ((pending == null) ? 0 : pending.hashCode());
+		result = prime * result + ((restricted == null) ? 0 : restricted.hashCode());
+		result = prime * result + ((select == null) ? 0 : select.hashCode());
+		result = prime * result + ((url == null) ? 0 : url.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AppCatalogItem other = (AppCatalogItem) obj;
+		if (access == null) {
+			if (other.access != null)
+				return false;
+		} else if (!access.equals(other.access))
+			return false;
+		if (alternateUrl == null) {
+			if (other.alternateUrl != null)
+				return false;
+		} else if (!alternateUrl.equals(other.alternateUrl))
+			return false;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (imageUrl == null) {
+			if (other.imageUrl != null)
+				return false;
+		} else if (!imageUrl.equals(other.imageUrl))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (notes == null) {
+			if (other.notes != null)
+				return false;
+		} else if (!notes.equals(other.notes))
+			return false;
+		if (open == null) {
+			if (other.open != null)
+				return false;
+		} else if (!open.equals(other.open))
+			return false;
+		if (pending == null) {
+			if (other.pending != null)
+				return false;
+		} else if (!pending.equals(other.pending))
+			return false;
+		if (restricted == null) {
+			if (other.restricted != null)
+				return false;
+		} else if (!restricted.equals(other.restricted))
+			return false;
+		if (select == null) {
+			if (other.select != null)
+				return false;
+		} else if (!select.equals(other.select))
+			return false;
+		if (url == null) {
+			if (other.url != null)
+				return false;
+		} else if (!url.equals(other.url))
+			return false;
+		return true;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppCategoryFunctionsItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppCategoryFunctionsItem.java
new file mode 100644
index 00000000..b1601431
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppCategoryFunctionsItem.java
@@ -0,0 +1,140 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Carries row information for the functional table on the Contact Us page.
+ */
+@Entity
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AppCategoryFunctionsItem extends DomainVo {
+
+	private static final long serialVersionUID = -1573834082471206458L;
+
+	@Id
+	private String rowId;
+	private String appId;
+	private String application;
+	private String category;
+	private String functions;
+
+	public String getRowId() {
+		return rowId;
+	}
+
+	public void setRowId(String rowId) {
+		this.rowId = rowId;
+	}
+
+	public String getAppId() {
+		return appId;
+	}
+	
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+	
+	public String getApplication() {
+		return application;
+	}
+
+	public void setApplication(String appName) {
+		this.application = appName;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getFunctions() {
+		return functions;
+	}
+
+	public void setFunctions(String functions) {
+		this.functions = functions;
+	}
+
+	@Override
+	public String toString() {
+		return "AppCategoryFunctionsItem [rowId=" + rowId + ", appId=" + appId + ", application=" + application
+				+ ", category=" + category + ", functions=" + functions + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appId == null) ? 0 : appId.hashCode());
+		result = prime * result + ((application == null) ? 0 : application.hashCode());
+		result = prime * result + ((category == null) ? 0 : category.hashCode());
+		result = prime * result + ((functions == null) ? 0 : functions.hashCode());
+		result = prime * result + ((rowId == null) ? 0 : rowId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AppCategoryFunctionsItem other = (AppCategoryFunctionsItem) obj;
+		if (appId == null) {
+			if (other.appId != null)
+				return false;
+		} else if (!appId.equals(other.appId))
+			return false;
+		if (application == null) {
+			if (other.application != null)
+				return false;
+		} else if (!application.equals(other.application))
+			return false;
+		if (category == null) {
+			if (other.category != null)
+				return false;
+		} else if (!category.equals(other.category))
+			return false;
+		if (functions == null) {
+			if (other.functions != null)
+				return false;
+		} else if (!functions.equals(other.functions))
+			return false;
+		if (rowId == null) {
+			if (other.rowId != null)
+				return false;
+		} else if (!rowId.equals(other.rowId))
+			return false;
+		return true;
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppContactUsItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppContactUsItem.java
new file mode 100644
index 00000000..5dc7bf57
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/AppContactUsItem.java
@@ -0,0 +1,171 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * An easily serializable version of row information from the fn_app_contact_us
+ * table; specifically this has an app ID instead of an EPApp object.
+ */
+@Entity
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class AppContactUsItem extends DomainVo {
+
+	private static final long serialVersionUID = 6964210807573346262L;
+
+	@Id
+	private Long appId;
+	private String appName;
+	private String description;
+	private String contactName;
+	private String contactEmail;
+	private String url;
+	private String activeYN;
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getContactName() {
+		return contactName;
+	}
+
+	public void setContactName(String contactName) {
+		this.contactName = contactName;
+	}
+
+	public String getContactEmail() {
+		return contactEmail;
+	}
+
+	public void setContactEmail(String contactEmail) {
+		this.contactEmail = contactEmail;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getActiveYN() {
+		return activeYN;
+	}
+
+	public void setActiveYN(String activeYN) {
+		this.activeYN = activeYN;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((activeYN == null) ? 0 : activeYN.hashCode());
+		result = prime * result + ((appId == null) ? 0 : appId.hashCode());
+		result = prime * result + ((appName == null) ? 0 : appName.hashCode());
+		result = prime * result + ((contactEmail == null) ? 0 : contactEmail.hashCode());
+		result = prime * result + ((contactName == null) ? 0 : contactName.hashCode());
+		result = prime * result + ((description == null) ? 0 : description.hashCode());
+		result = prime * result + ((url == null) ? 0 : url.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AppContactUsItem other = (AppContactUsItem) obj;
+		if (activeYN == null) {
+			if (other.activeYN != null)
+				return false;
+		} else if (!activeYN.equals(other.activeYN))
+			return false;
+		if (appId == null) {
+			if (other.appId != null)
+				return false;
+		} else if (!appId.equals(other.appId))
+			return false;
+		if (appName == null) {
+			if (other.appName != null)
+				return false;
+		} else if (!appName.equals(other.appName))
+			return false;
+		if (contactEmail == null) {
+			if (other.contactEmail != null)
+				return false;
+		} else if (!contactEmail.equals(other.contactEmail))
+			return false;
+		if (contactName == null) {
+			if (other.contactName != null)
+				return false;
+		} else if (!contactName.equals(other.contactName))
+			return false;
+		if (description == null) {
+			if (other.description != null)
+				return false;
+		} else if (!description.equals(other.description))
+			return false;
+		if (url == null) {
+			if (other.url != null)
+				return false;
+		} else if (!url.equals(other.url))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "AppContactUsItem [appId=" + appId + ", appName=" + appName + ", description=" + description
+				+ ", contactName=" + contactName + ", contactEmail=" + contactEmail + ", url=" + url + ", activeYN="
+				+ activeYN + "]";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/CommonWidgetsEnum.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/CommonWidgetsEnum.java
new file mode 100644
index 00000000..994108dd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/CommonWidgetsEnum.java
@@ -0,0 +1,36 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+public enum CommonWidgetsEnum{
+	NEWS("news"),
+	EVENTS("events"),
+	RESOURCES("resources");
+	
+	private String value;
+	private CommonWidgetsEnum(String value){
+		this.value = value;
+	}
+	
+	@Override
+    public String toString() {
+        return value;
+    }
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/PortalRestResponse.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/PortalRestResponse.java
new file mode 100644
index 00000000..3572d6a6
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/PortalRestResponse.java
@@ -0,0 +1,101 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+public class PortalRestResponse<T> {
+	
+	private PortalRestStatusEnum status;
+	private String message;
+	
+	private T response;
+	
+	public PortalRestResponse(){};
+	
+	public PortalRestResponse(PortalRestStatusEnum status, String message, T response){
+		this.status = status;
+		this.message = message;
+		this.response = response;
+	}
+
+	public PortalRestStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(PortalRestStatusEnum status) {
+		this.status = status;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public T getResponse() {
+		return response;
+	}
+
+	public void setResponse(T response) {
+		this.response = response;
+	}
+
+	@Override
+	public String toString() {
+		return "PortalRestResponse [status=" + status + ", message=" + message + ", response=" + response + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((message == null) ? 0 : message.hashCode());
+		result = prime * result + ((response == null) ? 0 : response.hashCode());
+		result = prime * result + ((status == null) ? 0 : status.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		PortalRestResponse other = (PortalRestResponse) obj;
+		if (message == null) {
+			if (other.message != null)
+				return false;
+		} else if (!message.equals(other.message))
+			return false;
+		if (response == null) {
+			if (other.response != null)
+				return false;
+		} else if (!response.equals(other.response))
+			return false;
+		if (status != other.status)
+			return false;
+		return true;
+	};	
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/PortalRestStatusEnum.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/PortalRestStatusEnum.java
new file mode 100644
index 00000000..b4dc63ab
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/PortalRestStatusEnum.java
@@ -0,0 +1,36 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+public enum PortalRestStatusEnum{
+	OK("ok"),
+	WARN("WARNING"),
+	ERROR("error");
+	
+	private String value;
+	private PortalRestStatusEnum(String value){
+		this.value = value;
+	}
+	
+	@Override
+    public String toString() {
+        return value;
+    }
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/SearchResultItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/SearchResultItem.java
new file mode 100644
index 00000000..c6538470
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ecomp/model/SearchResultItem.java
@@ -0,0 +1,86 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ecomp.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Entity
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SearchResultItem extends DomainVo{
+
+	@Id
+	private String rowId;	
+	
+	@JsonProperty("category")
+	private String category;
+	
+	@JsonProperty("name")
+	private String name;
+	
+	@JsonProperty("target")
+	private String target;
+
+	@JsonProperty("uuid")
+	private String uuid;
+	
+	public String getUuid() {
+		return uuid;
+	}
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+	public String getRowId() {
+		return rowId;
+	}
+	public void setRowId(String rowId) {
+		this.rowId = rowId;
+	}
+	public String getCategory() {
+		return category;
+	}
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getTarget() {
+		return target;
+	}
+	public void setTarget(String target) {
+		this.target = target;
+	}
+	@Override
+	public String toString() {
+		return "SearchResultItem [rowId=" + rowId + ", category=" + category + ", name=" + name + ", target=" + target
+				+ ", uuid=" + uuid + "]";
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/exceptions/NoHealthyServiceException.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/exceptions/NoHealthyServiceException.java
new file mode 100644
index 00000000..ce0366c8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/exceptions/NoHealthyServiceException.java
@@ -0,0 +1,36 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.exceptions;
+
+import com.ecwid.consul.ConsulException;
+
+public class NoHealthyServiceException extends ConsulException{
+
+	private static final long serialVersionUID = -7089437673127729813L;
+	
+	public NoHealthyServiceException(String message){
+		super(message);
+	}
+	
+	@Override
+	public String toString() {
+		return "NoHealthyServiceException [] " + this.getMessage();
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/interceptor/PortalResourceInterceptor.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/interceptor/PortalResourceInterceptor.java
new file mode 100644
index 00000000..9a2fc4de
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/interceptor/PortalResourceInterceptor.java
@@ -0,0 +1,335 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================*/
+package org.openecomp.portalapp.portal.interceptor;
+
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.util.Base64;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.openecomp.portalapp.controller.sessionmgt.SessionCommunicationController;
+import org.openecomp.portalapp.portal.controller.BasicAuthenticationController;
+import org.openecomp.portalapp.portal.controller.ExternalAppsRestfulController;
+import org.openecomp.portalapp.portal.controller.SharedContextRestController;
+import org.openecomp.portalapp.portal.controller.WebAnalyticsExtAppController;
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+import org.openecomp.portalapp.portal.domain.EPEndpoint;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.BasicAuthenticationCredentialService;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.service.RemoteWebServiceCallService;
+import org.openecomp.portalapp.service.sessionmgt.ManageService;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.controller.FusionBaseController;
+import org.openecomp.portalsdk.core.exception.UrlAccessRestrictedException;
+import org.openecomp.portalsdk.core.interceptor.ResourceInterceptor;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.method.HandlerMethod;
+
+public class PortalResourceInterceptor extends ResourceInterceptor {
+	private static final String APP_KEY = "uebkey";
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PortalResourceInterceptor.class);
+
+	@Autowired
+	private  RemoteWebServiceCallService remoteWebServiceCallService;
+
+	@Autowired
+	private ManageService manageService;
+
+	@Autowired
+	private EPEELFLoggerAdvice epAdvice;
+
+	@Autowired
+	private BasicAuthenticationCredentialService basicAuthService;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+			throws Exception {
+
+		if (handler instanceof HandlerMethod) {
+			HandlerMethod method = (HandlerMethod) handler;
+
+			/**
+			 * These classes provide REST endpoints used by other application
+			 * servers, NOT by an end user's browser.
+			 */
+			if (method.getBean() instanceof FusionBaseController) {
+				FusionBaseController controller = (FusionBaseController) method.getBean();
+				if (!controller.isAccessible()) {
+
+					// authorize portalApi requests by user role
+					String requestURI = request.getRequestURI();
+					if (requestURI != null) {
+						String[] uriArray = requestURI.split("/portalApi/");
+						if (uriArray.length > 1) {
+							String portalApiPath = uriArray[1];
+
+							Set<? extends String> roleFunctions = (Set<? extends String>) request.getSession()
+									.getAttribute(SystemProperties
+											.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME));
+							Set<? extends String> allRoleFunctions = (Set<? extends String>) request.getSession()
+									.getAttribute(EPUserUtils.ALL_ROLE_FUNCTIONS);
+							// Defend against code error to avoid throwing NPE
+							if (roleFunctions == null || allRoleFunctions == null) {
+								logger.error(EELFLoggerDelegate.errorLogger,
+										"preHandle: failed to get role functions attribute(s) from session!!");
+								EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInitializationError);
+								return false;
+							}
+							// check to see if roleFunctions of the user is in
+							// the
+							// list of all role functions
+							// if not, ignore to prevent restricting every
+							// trivial
+							// call; otherwise, if it is, then check for the
+							// access
+							if (matchRoleFunctions(portalApiPath, allRoleFunctions)
+									&& !matchRoleFunctions(portalApiPath, roleFunctions)) {
+								EPUser user = (EPUser) request.getSession().getAttribute(
+										SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
+								logger.error(EELFLoggerDelegate.errorLogger,
+										"preHandle: User {} not authorized for path {} ", user.getOrgUserId(),
+										portalApiPath);
+								EcompPortalUtils.setBadPermissions(user, response, portalApiPath);
+								EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiAuthenticationError);
+								return false;
+							} // failed to match
+
+						} // is portalApi
+
+					} // requestURI
+				} // instance check
+			} // not accessible
+			else if (method.getBean() instanceof BasicAuthenticationController) {
+				return checkBasicAuth(request, response);
+			}
+			Object controllerObj = method.getBean();
+			if (controllerObj instanceof SessionCommunicationController
+					|| controllerObj instanceof SharedContextRestController
+					|| controllerObj instanceof ExternalAppsRestfulController) {
+				// check user authentication for RESTful calls
+				String secretKey = null;
+				try {
+					epAdvice.loadServletRequestBasedDefaults(request, SecurityEventTypeEnum.INCOMING_REST_MESSAGE);
+					if (!remoteWebServiceCallService.verifyRESTCredential(secretKey, request.getHeader(APP_KEY),
+							request.getHeader("username"), request.getHeader("password"))) {
+						throw new UrlAccessRestrictedException();
+					}
+				} catch (Exception e) {
+					logger.error(EELFLoggerDelegate.errorLogger, "preHandle: failed to authenticate RESTful service",
+							e);
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiAuthenticationError, e);
+					throw new UrlAccessRestrictedException();
+				}
+			}
+
+			if (controllerObj instanceof WebAnalyticsExtAppController) {
+				if (!remoteWebServiceCallService.verifyAppKeyCredential(request.getHeader(APP_KEY))) {
+					logger.error(EELFLoggerDelegate.errorLogger,
+							"preHandle: failed to verify app key for web analytics call");
+					throw new UrlAccessRestrictedException();
+				}
+			}
+		}
+
+		handleSessionUpdates(request);
+		return true;
+	}
+
+	/**
+	 * Sets the status code and sends a response. Factors code out of many
+	 * methods.
+	 * 
+	 * @param response
+	 *            HttpServletResponse
+	 * @param statusCode
+	 *            HTTP status code like 404
+	 * @param message
+	 *            Message to send in a JSON error object
+	 */
+	private void sendErrorResponse(HttpServletResponse response, final int statusCode, final String message)
+			throws Exception {
+		response.setStatus(statusCode);
+		response.setContentType("application/json");
+		response.getWriter().write("{\"error\":\"" + message + "\"}");
+		response.getWriter().flush();
+	}
+
+	/**
+	 * Gets HTTP basic authentication information from the request and checks
+	 * whether those credentials are authorized for the request path.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @param response
+	 *            HttpServletResponse
+	 * @return True if the request is authorized, else false
+	 * @throws Exception
+	 */
+	private boolean checkBasicAuth(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		
+		String uri = request.getRequestURI().toString();
+		uri = uri.substring(uri.indexOf("/", 1));
+		
+		final String authHeader = request.getHeader("Authorization");
+		if (authHeader == null) {
+			final String msg = "no authorization found";
+			logger.debug(EELFLoggerDelegate.debugLogger, "checkBasicAuth: {}", msg);
+			sendErrorResponse(response, HttpServletResponse.SC_UNAUTHORIZED, msg);
+			return false;
+		}
+
+		String[] accountNamePassword = getUserNamePassword(authHeader);
+		if (accountNamePassword == null || accountNamePassword.length != 2) {
+			final String msg = "failed to get username and password from auth header";
+			logger.debug(EELFLoggerDelegate.debugLogger, "checkBasicAuth: {}", msg);
+			sendErrorResponse(response, HttpServletResponse.SC_UNAUTHORIZED, msg);
+			return false;
+		}
+
+		BasicAuthCredentials creds;
+		try {
+			creds = basicAuthService.getBasicAuthCredentialByAppName(accountNamePassword[0]);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "checkBasicAuth failed to get credentials", e);
+			final String msg = "Failed while getting basic authentication credential: " + e.toString();
+			sendErrorResponse(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, msg);
+			throw e;
+		}
+		
+		boolean isAllowedEp = false;
+		for(EPEndpoint ep: creds.getEndpoints()){
+			if(ep.getName().equals(uri)){
+				isAllowedEp = true;
+				break;
+			}
+		}
+		if(!isAllowedEp){
+			response.setStatus(401);
+			response.setContentType("application/json");
+			response.getWriter().write("{\"error\":\"Unauthorized: Endpoint access denied\"}");
+			response.getWriter().flush();
+			response.getWriter().close();
+			return false;
+		}
+		
+		if (creds == null) {
+			final String msg = "failed to find match for credentials";
+			logger.debug(EELFLoggerDelegate.debugLogger, "checkBasicAuth: {}", msg);
+			sendErrorResponse(response, HttpServletResponse.SC_UNAUTHORIZED, msg);
+			return false;
+		}
+
+		boolean isAuth;
+		try {
+			isAuth = authorization(authHeader, creds.getApplicationName(), creds.getPassword());
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "checkBasicAuth failed to check authorization", e);
+			final String msg = "failed while checking authorization: " + e.toString();
+			sendErrorResponse(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, msg);
+			throw e;
+		}
+
+		if (!isAuth) {
+			response.setStatus(401);
+			response.setContentType("application/json");
+			response.getWriter().write("{\"error\":\"Unauthorized: Invalid username or password\"}");
+			response.getWriter().flush();
+			response.getWriter().close();
+			final String msg = "Unauthorized: Access denied";
+			sendErrorResponse(response, HttpServletResponse.SC_UNAUTHORIZED, msg);
+			return false;
+		}
+
+		// Made it to the end!
+		return true;
+	}
+
+	/**
+	 * 
+	 * Basic Authorization check
+	 * 
+	 * @param auth
+	 * @param security_user
+	 * @param security_pass
+	 * @return
+	 * @throws Exception
+	 */
+
+	protected boolean authorization(String auth, String security_user, String security_pass) throws Exception {
+
+		if (auth != null && auth.startsWith("Basic")) {
+			String[] usernamePassword = getUserNamePassword(auth);
+			if (security_user.equals(usernamePassword[0]) && decrypted(security_pass).equals(usernamePassword[1]))
+				return true;
+		}
+		return false;
+	}
+
+	public static void main(String str[]) {
+		System.out.println(new PortalResourceInterceptor().getUserNamePassword("Basic Qy1CVVM6X3Bhc3M=")[0]);
+		System.out.println(new PortalResourceInterceptor().getUserNamePassword("Basic Qy1CVVM6X3Bhc3M=")[1]);
+	}
+
+	private String[] getUserNamePassword(String authValue) {
+		String base64Credentials = authValue.substring("Basic".length()).trim();
+		String credentials = new String(Base64.getDecoder().decode(base64Credentials), Charset.forName("UTF-8"));
+		final String[] values = credentials.split(":", 2);
+		return values;
+	}
+
+	private String decrypted(String encrypted) throws Exception {
+		String result = "";
+		if (encrypted != null & encrypted.length() > 0) {
+			try {
+				result = CipherUtil.decrypt(encrypted, SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e);
+				throw e;
+			}
+		}
+		return result;
+	}
+
+	private Boolean matchRoleFunctions(String portalApiPath, Set<? extends String> roleFunctions) {
+		for (String roleFunction : roleFunctions) {
+			if (portalApiPath.matches(roleFunction))
+				return true;
+		}
+		return false;
+
+	}
+
+	protected void handleSessionUpdates(HttpServletRequest request) {
+		PortalTimeoutHandler.handleSessionUpdatesNative(request, null, null, null, null, manageService);
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/HealthMonitor.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/HealthMonitor.java
new file mode 100644
index 00000000..b8e608cd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/HealthMonitor.java
@@ -0,0 +1,355 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.listener;
+
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.ueb.EPUebHelper;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class HealthMonitor {
+
+	@Autowired
+	private SessionFactory sessionFactory;
+
+	@Autowired
+	private EPUebHelper epUebHelper;
+
+	private static boolean databaseUp;
+	private static boolean uebUp;
+	private static boolean frontEndUp;
+	private static boolean backEndUp;
+	private static boolean dbClusterStatusOk;
+	private static boolean dbPermissionsOk;
+	public static boolean isSuspended = false;
+
+	Thread healthMonitorThread;
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HealthMonitor.class);
+
+	public HealthMonitor() {
+
+	}
+
+	public static boolean isDatabaseUp() {
+		return databaseUp;
+	}
+
+	public static boolean isClusterStatusOk() {
+		return dbClusterStatusOk;
+	}
+
+	public static boolean isDatabasePermissionsOk() {
+		return dbPermissionsOk;
+	}
+
+	public static boolean isUebUp() {
+		return uebUp;
+	}
+
+	public static boolean isFrontEndUp() {
+		return frontEndUp;
+	}
+
+	public static boolean isBackEndUp() {
+		return backEndUp;
+	}
+
+	private void monitorEPHealth() throws InterruptedException {
+
+		int numIntervalsDatabaseHasBeenDown = 0;
+		int numIntervalsClusterNotHealthy = 0;
+		int numIntervalsDatabasePermissionsIncorrect = 0;
+		int numIntervalsUebHasBeenDown = 0;
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "==> Health Monitor thread started");
+
+		long sleepInterval = (Long
+				.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.HEALTH_POLL_INTERVAL_SECONDS)) * 1000);
+		long numIntervalsBetweenAlerts = Long
+				.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.HEALTHFAIL_ALERT_EVERY_X_INTERVALS));
+		logger.debug(EELFLoggerDelegate.debugLogger,
+				"Polling health every " + sleepInterval + " milliseconds. Alerting every "
+						+ (sleepInterval * numIntervalsBetweenAlerts) / 1000 + " seconds when component remains down.");
+
+		while (true) {
+			//
+			// Get DB status. If down, signal alert once every X intervals.
+			//
+			databaseUp = this.checkIfDatabaseUp();
+			if (databaseUp == false) {
+
+				if ((numIntervalsDatabaseHasBeenDown % numIntervalsBetweenAlerts) == 0) {
+					// Write a Log entry that will generate an alert
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHealthCheckMySqlError);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"Database down, logging to error log to trigger alert.");
+					numIntervalsDatabaseHasBeenDown++;
+				} else {
+					numIntervalsDatabaseHasBeenDown = 0;
+				}
+			}
+
+			dbClusterStatusOk = this.checkClusterStatus();
+			if (dbClusterStatusOk == false) {
+
+				if ((numIntervalsClusterNotHealthy % numIntervalsBetweenAlerts) == 0) {
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHealthCheckMySqlError);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"Cluster nodes appear to be down, logging to error log to trigger alert.");
+					numIntervalsClusterNotHealthy++;
+				} else {
+					numIntervalsClusterNotHealthy = 0;
+				}
+			}
+
+			dbPermissionsOk = this.checkDatabaseAndPermissions();
+			if (dbPermissionsOk == false) {
+
+				if ((numIntervalsDatabasePermissionsIncorrect % numIntervalsBetweenAlerts) == 0) {
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHealthCheckMySqlError);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"Database permissions don't seem correct, logging to error log to trigger alert.");
+					numIntervalsDatabasePermissionsIncorrect++;
+				} else {
+					numIntervalsDatabasePermissionsIncorrect = 0;
+				}
+			}
+
+			//
+			// Get UEB status. Publish a bogus message to EP inbox, if 200 OK
+			// returned, status is Up.
+			// If down, signal alert once every X intervals.
+			// EP will ignore this bogus message.
+			//
+			uebUp = this.checkIfUebUp();
+			if (uebUp == false) {
+
+				if ((numIntervalsUebHasBeenDown % numIntervalsBetweenAlerts) == 0) {
+					// Write a Log entry that will generate an alert
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHealthCheckUebClusterError);
+					logger.debug(EELFLoggerDelegate.debugLogger, "UEB down, logging to error log to trigger alert");
+					numIntervalsUebHasBeenDown++;
+				} else {
+					numIntervalsUebHasBeenDown = 0;
+				}
+			}
+
+			// The front end should be up because the API is called through
+			// proxy front end server.
+			frontEndUp = true;
+
+			// If the rest API called, the backend is always up
+			backEndUp = true;
+
+			//
+			// future nice to have...get Partner status
+			//
+			// For all apps exposing a rest url, query one of the rest
+			// urls(/roles?) and manage a list
+			// of app name/status. We might not return back a non 200 OK in
+			// health check, but we
+			// could return information in the json content of a health check.
+			//
+
+			//
+			// Get DB status. If down, signal alert once every X intervals.
+			//
+			if (Thread.interrupted()) {
+				logger.info(EELFLoggerDelegate.errorLogger, "==> UebMainHandler exiting");
+				break;
+			}
+
+			try {
+				Thread.sleep(sleepInterval);
+			} catch (InterruptedException e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "monitorEPHealth interrupted", e);
+				Thread.currentThread().interrupt();
+			}
+		}
+	}
+
+	@PostConstruct
+	public void initHealthMonitor() {
+
+		healthMonitorThread = new Thread("EP HealthMonitor thread") {
+			public void run() {
+				try {
+					monitorEPHealth();
+				} catch (InterruptedException e) {
+					logger.debug(EELFLoggerDelegate.debugLogger, "healthMonitorThread interrupted", e);
+				} catch (Exception e) {
+					logger.error(EELFLoggerDelegate.errorLogger, "healthMonitorThread failed", e);
+				}
+			}
+		};
+		if (healthMonitorThread != null) {
+			healthMonitorThread.start();
+		}
+	}
+
+	@PreDestroy
+	public void closeHealthMonitor() {
+		this.healthMonitorThread.interrupt();
+	}
+
+	private boolean checkIfDatabaseUp() {
+
+		boolean isUp = false;
+
+		Session localSession = null;
+
+		try {
+			localSession = sessionFactory.openSession();
+
+			if (localSession != null) {
+
+				String sql = "select app_name from fn_app where app_id=1";
+				Query query = localSession.createSQLQuery(sql);
+				@SuppressWarnings("unchecked")
+				List<String> queryList = query.list();
+				if (queryList != null) {
+					isUp = true;
+				}
+				localSession.close();
+			}
+		} catch (Exception e) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "checkIfDatabaseUp failed", e);
+			isUp = false;
+		}
+
+		return isUp;
+	}
+
+	private boolean checkClusterStatus() {
+
+		boolean isUp = false;
+
+		Session localSession = null;
+
+		try {
+			localSession = sessionFactory.openSession();
+			if (localSession != null) {
+				// If all nodes are unhealthy in a cluster, this will throw an
+				// exception
+				String sql = "select * from mysql.user";
+				Query query = localSession.createSQLQuery(sql);
+				@SuppressWarnings("unchecked")
+				List<String> queryList = query.list();
+				if (queryList != null) {
+					isUp = true;
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "checkClusterStatus failed", e);
+			if ((e.getCause() != null) && (e.getCause().getMessage() != null)) {
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"checkClusterStatus() exception msg = " + e.getCause().getMessage());
+			}
+			isUp = false;
+		} finally {
+			if (localSession != null) {
+				localSession.close();
+			}
+		}
+
+		return isUp;
+
+	}
+
+	private boolean checkDatabaseAndPermissions() {
+
+		boolean isUp = false;
+
+		Session localSession = null;
+
+		try {
+			localSession = sessionFactory.openSession();
+			if (localSession != null) {
+				String sql = "SHOW GRANTS FOR CURRENT_USER";
+				Query query = localSession.createSQLQuery(sql);
+				@SuppressWarnings("unchecked")
+				List<String> grantsList = query.list();
+				for (String str : grantsList) {
+					if ((str.toUpperCase().contains("ALL"))
+							|| (str.toUpperCase().contains("DELETE") && str.toUpperCase().contains("SELECT")
+									&& str.toUpperCase().contains("UPDATE") && str.toUpperCase().contains("INSERT"))) {
+						isUp = true;
+						break;
+					}
+				}
+				if (isUp == false) {
+					logger.error(EELFLoggerDelegate.errorLogger,
+							"checkDatabaseAndPermissions() returning false.  SHOW GRANTS FOR CURRENT_USER being dumped:");
+					for (String str : grantsList) {
+						logger.error(EELFLoggerDelegate.errorLogger, "grants output item = [" + str + "]");
+					}
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "checkDatabaseAndPermissions failed", e);
+			if ((e.getCause() != null) && (e.getCause().getMessage() != null)) {
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"checkDatabaseAndPermissions() exception msg = " + e.getCause().getMessage());
+			}
+			isUp = false;
+		} finally {
+			if (localSession != null) {
+				localSession.close();
+			}
+		}
+
+		return isUp;
+
+	}
+
+	private boolean checkIfUebUp() {
+		boolean uebUp = false;
+		try {
+			boolean isAvailable = epUebHelper.checkAvailability();
+			boolean messageCanBeSent = epUebHelper.MessageCanBeSentToTopic();
+			uebUp = (isAvailable && messageCanBeSent);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "checkIfUebUp failed", e);
+		}
+
+		return uebUp;
+
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/UserContextListener.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/UserContextListener.java
new file mode 100644
index 00000000..05af7388
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/UserContextListener.java
@@ -0,0 +1,51 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.listener;
+
+import java.util.HashMap;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+@WebListener
+public class UserContextListener implements ServletContextListener{
+	@SuppressWarnings("rawtypes")
+	public void contextInitialized(ServletContextEvent event){
+    	ServletContext context = event.getServletContext();        
+        //
+        // instanciate a map to store references to all the active
+        // sessions and bind it to context scope.
+        //
+        HashMap activeUsers = new HashMap();
+        context.setAttribute("activeUsers", activeUsers);
+    }
+
+    /**
+     * Needed for the ServletContextListener interface.
+     */
+    public void contextDestroyed(ServletContextEvent event){
+        // To overcome the problem with losing the session references
+        // during server restarts, put code here to serialize the
+        // activeUsers HashMap.  Then put code in the contextInitialized
+        // method that reads and reloads it if it exists...
+    }
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/UserSessionListener.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/UserSessionListener.java
new file mode 100644
index 00000000..ebab2aa3
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/listener/UserSessionListener.java
@@ -0,0 +1,126 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+
+package org.openecomp.portalapp.portal.listener;
+
+import java.util.HashMap;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.annotation.WebListener;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.util.StringUtils;
+
+import org.openecomp.portalsdk.core.domain.support.CollaborateList;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.service.SharedContextService;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+/**
+ * Listens for session-create and session-destroy events.
+ */
+@WebListener
+@SuppressWarnings({ "unchecked", "rawtypes" })
+public class UserSessionListener implements HttpSessionListener {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserSessionListener.class);
+
+	/**
+	 * Access to the database
+	 */
+	@Autowired
+	SharedContextService sharedContextService;
+
+	public void init(ServletConfig config) {
+	}
+
+	/**
+	 * Adds sessions to the context scoped HashMap when they begin.
+	 */
+	public void sessionCreated(HttpSessionEvent event) {
+		HttpSession session = event.getSession();
+		ServletContext context = session.getServletContext();
+		HashMap activeUsers = (HashMap) context.getAttribute("activeUsers");
+
+		activeUsers.put(session.getId(), session);
+		context.setAttribute("activeUsers", activeUsers);
+		logger.info(EELFLoggerDelegate.debugLogger, "Session Created : " + session.getId());
+	}
+
+	/**
+	 * Removes sessions from the context scoped HashMap when they expire or are
+	 * invalidated.
+	 */
+	public void sessionDestroyed(HttpSessionEvent event) {
+
+		try {
+			HttpSession session = event.getSession();
+			ServletContext context = session.getServletContext();
+			HashMap activeUsers = (HashMap) context.getAttribute("activeUsers");
+			activeUsers.remove(session.getId());
+
+			EPUser user = (EPUser) session
+					.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
+			if (user!=null && !StringUtils.isEmpty(user.getOrgUserId())) {
+				CollaborateList.delUserName(user.getOrgUserId());
+			}
+
+			// Remove any shared context entries for this session.
+			if (getSharedContextService()!=null) {
+				getSharedContextService().deleteSharedContexts(session.getId());
+				
+				// Clean the shared context each time a session is destroyed.
+				// TODO: move the threshold to configuration file.
+				getSharedContextService().expireSharedContexts(60 * 60 * 8);
+			}
+
+			logger.info(EELFLoggerDelegate.debugLogger, "Session Destroyed : " + session.getId());
+
+		} catch (Exception e) {
+			logger.warn(EELFLoggerDelegate.errorLogger, "Exception occurred while executing sessionDestroyed. Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+	}
+	
+	private static ApplicationContext applicationContext;
+
+	public static void setApplicationContext(ApplicationContext _applicationContext) {
+		applicationContext = _applicationContext;
+	}
+
+	public SharedContextService getSharedContextService() {
+		if(sharedContextService == null){
+			if (applicationContext != null)				
+				sharedContextService = (SharedContextService)applicationContext.getBean("sharedContextService");
+		}
+		
+		return sharedContextService;
+	}
+
+	public void setSharedContextService(SharedContextService sharedContextService) {
+		this.sharedContextService = sharedContextService;
+	}
+}
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPAuditLog.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPAuditLog.java
new file mode 100644
index 00000000..965866c8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPAuditLog.java
@@ -0,0 +1,31 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.logging.aop;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EPAuditLog {
+    String value() default "";
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java
new file mode 100644
index 00000000..89f1b92f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAdvice.java
@@ -0,0 +1,371 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.logging.aop;
+
+import java.net.InetAddress;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.util.EPUserUtils;
+import org.openecomp.portalsdk.core.exception.SessionExpiredException;
+import org.openecomp.portalsdk.core.logging.format.AlarmSeverityEnum;
+import org.openecomp.portalsdk.core.logging.format.AuditLogFormatter;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
+import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.slf4j.MDC;
+
+import com.att.eelf.configuration.Configuration;
+
+@org.springframework.context.annotation.Configuration
+public class EPEELFLoggerAdvice {
+
+	private EELFLoggerDelegate adviceLogger = EELFLoggerDelegate.getLogger(EPEELFLoggerAdvice.class);
+
+	/**
+	 * DateTime Format according to the ECOMP Application Logging Guidelines.
+	 */
+	private static final SimpleDateFormat ecompLogDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+
+	/**
+	 * @return Current date and time in the format specified by the ECOMP
+	 *         Application Logging Guidelines.
+	 */
+	public static String getCurrentDateTimeUTC() {
+		String currentDateTime = ecompLogDateFormat.format(new Date());
+		return currentDateTime;
+	}
+
+	/**
+	 * Sets logging context with values from HttpServletRequest object.
+	 * 
+	 * @param req
+	 *            HttpServletRequest
+	 * @param securityEventType
+	 *            SecurityEventTypeEnum
+	 */
+	public void loadServletRequestBasedDefaults(HttpServletRequest req, SecurityEventTypeEnum securityEventType) {
+		try {
+			setHttpRequestBasedDefaultsIntoGlobalLoggingContext(req, securityEventType, req.getServletPath());
+		} catch (Exception e) {
+			adviceLogger.error(EELFLoggerDelegate.errorLogger, "loadServletRequestBasedDefaults failed", e);
+		}
+	}
+
+	/**
+	 * 
+	 * @param securityEventType
+	 * @param args
+	 * @param passOnArgs
+	 * @return
+	 */
+	public Object[] before(SecurityEventTypeEnum securityEventType, Object[] args, Object[] passOnArgs) {
+		String className = "";
+		if (passOnArgs[0] != null) {
+			className = passOnArgs[0].toString();
+		}
+
+		String methodName = "";
+		if (passOnArgs[1] != null) {
+			methodName = passOnArgs[1].toString();
+		}
+
+		// Initialize Request defaults only for controller methods.
+		MDC.put(className + methodName + EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP, getCurrentDateTimeUTC());
+		MDC.put(EPCommonSystemProperties.TARGET_ENTITY, EPCommonSystemProperties.ECOMP_PORTAL_BE);
+		MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, methodName);
+		if (securityEventType != null) {
+			MDC.put(className + methodName + EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
+					getCurrentDateTimeUTC());
+			HttpServletRequest req = null;
+			if (args[0] != null && args[0] instanceof HttpServletRequest) {
+				req = (HttpServletRequest) args[0];
+				this.setHttpRequestBasedDefaultsIntoGlobalLoggingContext(req, securityEventType, methodName);
+			}
+		}
+
+		EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
+		logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#before: entering {}", methodName);
+		return new Object[] { "" };
+	}
+
+	/**
+	 * 
+	 * @param securityEventType
+	 * @param statusCode
+	 * @param responseCode
+	 * @param args
+	 * @param returnArgs
+	 * @param passOnArgs
+	 */
+	public void after(SecurityEventTypeEnum securityEventType, String statusCode, String responseCode, Object[] args,
+			Object[] returnArgs, Object[] passOnArgs) {
+		String className = "";
+		if (passOnArgs[0] != null)
+			className = passOnArgs[0].toString();
+
+		// Method Name
+		String methodName = "";
+		if (passOnArgs[1] != null)
+			methodName = passOnArgs[1].toString();
+
+		if (MDC.get(EPCommonSystemProperties.TARGET_SERVICE_NAME) == null
+				|| MDC.get(EPCommonSystemProperties.TARGET_SERVICE_NAME) == "")
+			MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, methodName);
+
+		if (MDC.get(EPCommonSystemProperties.TARGET_ENTITY) == null
+				|| MDC.get(EPCommonSystemProperties.TARGET_ENTITY) == "")
+			MDC.put(EPCommonSystemProperties.TARGET_ENTITY, EPCommonSystemProperties.ECOMP_PORTAL_BE);
+
+		MDC.put(EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP,
+				MDC.get(className + methodName + EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP));
+		MDC.put(EPCommonSystemProperties.METRICSLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
+		this.calculateDateTimeDifference(MDC.get(EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP),
+				MDC.get(EPCommonSystemProperties.METRICSLOG_END_TIMESTAMP));
+
+		// Making sure to reload the INCOMING request MDC defaults if they have
+		// been wiped out by either Outgoing or LDAP Phone book search
+		// operations.
+		if (securityEventType != null && args[0] != null && args[0] instanceof HttpServletRequest
+				&& securityEventType == SecurityEventTypeEnum.INCOMING_REST_MESSAGE
+				&& (MDC.get(EPCommonSystemProperties.FULL_URL) == null
+						|| MDC.get(EPCommonSystemProperties.FULL_URL) == "")) {
+			HttpServletRequest req = (HttpServletRequest) args[0];
+			this.setHttpRequestBasedDefaultsIntoGlobalLoggingContext(req, securityEventType, methodName);
+		}
+
+		// Use external API response code in case if it resulted in an error.
+		String externalAPIResponseCode = MDC.get(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE);
+		if (externalAPIResponseCode == null || externalAPIResponseCode == ""
+				|| externalAPIResponseCode.trim().equalsIgnoreCase("200")) {
+			MDC.put(EPCommonSystemProperties.RESPONSE_CODE, responseCode);
+			MDC.put(EPCommonSystemProperties.STATUS_CODE, statusCode);
+		} else {
+			MDC.put(EPCommonSystemProperties.RESPONSE_CODE, externalAPIResponseCode);
+			MDC.put(EPCommonSystemProperties.STATUS_CODE, "ERROR");
+		}
+
+		EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
+		logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#after: finished {}", methodName);
+
+		// Log security message, if necessary
+		if (securityEventType != null) {
+			MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
+					MDC.get(className + methodName + EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP));
+			MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
+			this.calculateDateTimeDifference(MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+					MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+
+			this.logSecurityMessage(logger, securityEventType, methodName);
+
+			// Outgoing & LDAP messages are part of Incoming requests so,
+			// keep "RequestId", "PartnerName", "ServiceName", "LoginId" &
+			// "ResponseCode" etc. in memory and remove it only when
+			// finished processing the parent incoming message.
+			if (securityEventType != SecurityEventTypeEnum.OUTGOING_REST_MESSAGE
+					&& securityEventType != SecurityEventTypeEnum.LDAP_PHONEBOOK_USER_SEARCH) {
+				MDC.remove(Configuration.MDC_KEY_REQUEST_ID);
+				MDC.remove(EPCommonSystemProperties.PARTNER_NAME);
+				MDC.remove(Configuration.MDC_SERVICE_NAME);
+				MDC.remove(EPCommonSystemProperties.MDC_LOGIN_ID);
+				MDC.remove(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE);
+			}
+
+			// clear when finishes audit logging
+			MDC.remove(EPCommonSystemProperties.FULL_URL);
+			MDC.remove(EPCommonSystemProperties.PROTOCOL);
+			MDC.remove(EPCommonSystemProperties.STATUS_CODE);
+			MDC.remove(className + methodName + EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+			MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+			MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+			MDC.remove(EPCommonSystemProperties.RESPONSE_CODE);
+		}
+		MDC.remove(className + methodName + EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
+		MDC.remove(EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
+		MDC.remove(EPCommonSystemProperties.METRICSLOG_END_TIMESTAMP);
+		MDC.remove(EPCommonSystemProperties.MDC_TIMER);
+		MDC.remove(EPCommonSystemProperties.TARGET_ENTITY);
+		MDC.remove(EPCommonSystemProperties.TARGET_SERVICE_NAME);
+	}
+
+	/**
+	 * 
+	 * @param logger
+	 * @param securityEventType
+	 * @param restMethod
+	 */
+	private void logSecurityMessage(EELFLoggerDelegate logger, SecurityEventTypeEnum securityEventType,
+			String restMethod) {
+		StringBuilder additionalInfoAppender = new StringBuilder();
+		String auditMessage = "";
+
+		if (securityEventType == SecurityEventTypeEnum.OUTGOING_REST_MESSAGE) {
+			additionalInfoAppender.append(String.format("%s '%s' request was initiated.", restMethod,
+					MDC.get(EPCommonSystemProperties.TARGET_SERVICE_NAME)));
+		} else if (securityEventType == SecurityEventTypeEnum.LDAP_PHONEBOOK_USER_SEARCH) {
+			additionalInfoAppender.append("LDAP Phonebook search operation is performed.");
+		} else {
+			additionalInfoAppender.append(String.format("%s request was received.", restMethod));
+
+			if (securityEventType == SecurityEventTypeEnum.FE_LOGIN_ATTEMPT) {
+				String loginId = "";
+				String additionalMessage = " Successfully authenticated.";
+				loginId = MDC.get(EPCommonSystemProperties.MDC_LOGIN_ID);
+				if (loginId == null || loginId == "" || loginId == EPCommonSystemProperties.UNKNOWN) {
+					additionalMessage = " No cookies are found.";
+				}
+				additionalInfoAppender.append(additionalMessage);
+			} else if (securityEventType == SecurityEventTypeEnum.FE_LOGOUT) {
+				additionalInfoAppender.append(" User has been successfully logged out.");
+			}
+		}
+
+		String fullURL = MDC.get(EPCommonSystemProperties.FULL_URL);
+		if (fullURL != null && fullURL != "") {
+			additionalInfoAppender.append(" Request-URL:" + MDC.get(EPCommonSystemProperties.FULL_URL));
+		}
+
+		auditMessage = AuditLogFormatter.getInstance().createMessage(MDC.get(EPCommonSystemProperties.PROTOCOL),
+				securityEventType.name(), MDC.get(EPCommonSystemProperties.MDC_LOGIN_ID),
+				additionalInfoAppender.toString());
+
+		logger.info(EELFLoggerDelegate.auditLogger, auditMessage);
+	}
+
+	/**
+	 * 
+	 * @param req
+	 * @param securityEventType
+	 * @param restMethod
+	 */
+	private void setHttpRequestBasedDefaultsIntoGlobalLoggingContext(HttpServletRequest req,
+			SecurityEventTypeEnum securityEventType, String restMethod) {
+		/**
+		 * No need to load the request based defaults for the following security
+		 * messages since either they are initiated by the Portal BE or not Http
+		 * request based.
+		 */
+		if (req != null) {
+			if (securityEventType != SecurityEventTypeEnum.OUTGOING_REST_MESSAGE
+					&& securityEventType != SecurityEventTypeEnum.LDAP_PHONEBOOK_USER_SEARCH
+					&& securityEventType != SecurityEventTypeEnum.INCOMING_UEB_MESSAGE) {
+				// Load the RequestID (aka TrasactionId) into MDC context.
+				String requestId = UserUtils.getRequestId(req);
+				if (requestId == "" || requestId == null) {
+					requestId = UUID.randomUUID().toString();
+				}
+				MDC.put(Configuration.MDC_KEY_REQUEST_ID, requestId);
+
+				// Load user agent into MDC context, if available.
+				String accessingClient = "Unknown";
+				accessingClient = req.getHeader(SystemProperties.USERAGENT_NAME);
+				if (accessingClient != null && accessingClient != "" && (accessingClient.contains("Mozilla")
+						|| accessingClient.contains("Chrome") || accessingClient.contains("Safari"))) {
+					accessingClient = EPCommonSystemProperties.ECOMP_PORTAL_FE;
+				}
+				MDC.put(EPCommonSystemProperties.PARTNER_NAME, accessingClient);
+
+				// Load loginId into MDC context.
+				EPUser user = null;
+				try {
+					user = EPUserUtils.getUserSession(req);
+				} catch (SessionExpiredException se) {
+					adviceLogger.debug(EELFLoggerDelegate.debugLogger,
+							"setHttpRequestBasedDefaultsIntoGlobalLoggingContext: No user found in session");
+				}
+
+				MDC.put(EPCommonSystemProperties.MDC_LOGIN_ID, (user != null ? user.getOrgUserId() : "NoUser"));
+
+				// Rest URL & Protocol
+				String restURL = "";
+				MDC.put(EPCommonSystemProperties.FULL_URL, EPCommonSystemProperties.UNKNOWN);
+				MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTP);
+				restURL = UserUtils.getFullURL(req);
+				if (restURL != null && restURL != "") {
+					MDC.put(EPCommonSystemProperties.FULL_URL, restURL);
+					if (restURL.toLowerCase().contains("https")) {
+						MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTPS);
+					}
+				}
+
+				// Rest Path
+				MDC.put(Configuration.MDC_SERVICE_NAME, restMethod);
+				String restPath = req.getServletPath();
+				if (restPath != null && restPath != "") {
+					MDC.put(Configuration.MDC_SERVICE_NAME, restPath);
+				}
+
+				// Client IPAddress i.e. IPAddress of the remote host who is
+				// making this request.
+				String clientIPAddress = "";
+				clientIPAddress = req.getHeader("X-FORWARDED-FOR");
+				if (clientIPAddress == null) {
+					clientIPAddress = req.getRemoteAddr();
+				}
+				MDC.put(EPCommonSystemProperties.CLIENT_IP_ADDRESS, clientIPAddress);
+			} else if (securityEventType == SecurityEventTypeEnum.LDAP_PHONEBOOK_USER_SEARCH) {
+				MDC.put(EPCommonSystemProperties.TARGET_ENTITY, "Phonebook");
+				MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, "search");
+			}
+		} else {
+			MDC.put(Configuration.MDC_SERVICE_NAME, restMethod);
+			MDC.put(EPCommonSystemProperties.PARTNER_NAME, EPCommonSystemProperties.ECOMP_PORTAL_FE);
+		}
+
+		MDC.put(Configuration.MDC_SERVICE_INSTANCE_ID, "");
+		MDC.put(Configuration.MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.toString());
+		try {
+			MDC.put(Configuration.MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName());
+			MDC.put(Configuration.MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress());
+			MDC.put(Configuration.MDC_INSTANCE_UUID, SystemProperties.getProperty(SystemProperties.INSTANCE_UUID));
+		} catch (Exception e) {
+			adviceLogger.error(EELFLoggerDelegate.errorLogger,
+					"setHttpRequestBasedDefaultsIntoGlobalLoggingContext failed", e);
+		}
+	}
+
+	/**
+	 * 
+	 * @param beginDateTime
+	 * @param endDateTime
+	 */
+	private void calculateDateTimeDifference(String beginDateTime, String endDateTime) {
+		if (beginDateTime != null && endDateTime != null) {
+			try {
+				Date beginDate = ecompLogDateFormat.parse(beginDateTime);
+				Date endDate = ecompLogDateFormat.parse(endDateTime);
+				String timeDifference = String.format("%d", endDate.getTime() - beginDate.getTime());
+				MDC.put(SystemProperties.MDC_TIMER, timeDifference);
+			} catch (Exception e) {
+				adviceLogger.error(EELFLoggerDelegate.errorLogger, "calculateDateTimeDifference failed", e);
+			}
+		}
+	}
+
+	public String getInternalResponseCode() {
+		return MDC.get(EPCommonSystemProperties.RESPONSE_CODE);
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPMetricsLog.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPMetricsLog.java
new file mode 100644
index 00000000..ab8a3672
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPMetricsLog.java
@@ -0,0 +1,31 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.logging.aop;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EPMetricsLog {
+    String value() default "";
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/ApplicationCodes.properties b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/ApplicationCodes.properties
new file mode 100644
index 00000000..6ee63b24
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/ApplicationCodes.properties
@@ -0,0 +1,141 @@
+###
+# ================================================================================
+# ECOMP Portal
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ================================================================================
+###
+########################################################################
+#Resource key=Error Code|Message text|Resolution text |Description text
+#######
+#Newlines can be utilized to add some clarity ensuring continuing line
+#has atleast one leading space
+#ResourceKey=\
+#             ERR0000E\
+#             Sample error msg txt\
+#             Sample resolution msg\
+#             Sample description txt
+#
+######
+#Error code classification category
+#100	Permission errors
+#200	Availability errors/Timeouts
+#300	Data errors
+#400	Schema Interface type/validation errors
+#500	Business process errors
+#900	Unknown errors
+#
+########################################################################
+
+# Define Alarm Codes Specific to ECOMP Portal
+BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT=	||Reason: {0}.|\
+										An Authentication failure occurred during access to UEB server. Please check that UEB keys are configured correctly under fusion.properties file.
+
+BERESTAPIAUTHENTICATIONERROR =			|||Please check application credentials defined in Database or portal.properties file.
+										
+INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT=||Description: {0}.|Please check the logs for more information.
+										
+INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT=||Description: {0}.|Please check the logs for more information.
+
+INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT=||Description: {0}.|Please check the logs for more information.
+
+INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT=||Description: {0}.|Please check the logs for more information.
+
+BEHEALTHCHECKERROR=						|||Please check the logs for more information.
+
+BEHEALTHCHECKMYSQLERROR=				||Please check the logs for more information.|\
+										Check connectivity to MYSQL is configured correctly under system.properties file.
+
+BEHEALTHCHECKUEBCLUSTERERROR=			||Please check the logs for more information.|\
+										Check connectivity to UEB cluster which is configured under portal.properties file.
+
+FEHEALTHCHECKERROR=						|||Please check connectivity from this FE instance towards BE or BE Load Balancer.
+										
+BEHEALTHCHECKRECOVERY=					|||Please check logs for more specific information about the problem.
+
+BEHEALTHCHECKMYSQLRECOVERY=				|||Please check logs for more specific information about the problem.
+
+BEHEALTHCHECKUEBCLUSTERRECOVERY=		|||Please check logs for more specific information about the problem.
+
+FEHEALTHCHECKRECOVERY=					|||Please check logs for more specific information about the problem.
+
+#UEB communication
+BEUEBCONNECTIONERROR_ONE_ARGUMENT=		||Reason: {0}.|\
+										Please check UEB server list and keys configured under Portal.Properties file.
+										
+BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT=		||Cannot reach host {0}.|\
+										Please check UEB server list and keys configured under Portal.Properties file.
+
+#Onboarding apps
+BEUEBREGISTERONBOARDINGAPPERROR=		||Reason: {0}.|\
+										Please check UEB server list and keys configured under Portal.Properties file.
+
+#HTTP communication
+BEHTTPCONNECTIONERROR_ONE_ARGUMENT=		||Reason: {0}.|Please check the logs for more information.
+
+INTERNALCONNECTIONINFO_ONE_ARGUMENT=	||Description: {0}.|Please check the logs for more information.
+
+INTERNALCONNECTIONWARNING_ONE_ARGUMENT=	||Description: {0}.|Please check the logs for more information.
+
+INTERNALCONNECTIONERROR_ONE_ARGUMENT=	||Description: {0}.|Please check the logs for more information.
+
+INTERNALCONNECTIONFATAL_ONE_ARGUMENT=	||Description: {0}.|Please check the logs for more information.
+
+BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT=	||Data not found: {0}.|\
+										An error occurred during access to UEB Server, {1} failed to either register or unregister to/from UEB topic.
+
+#Login error codes
+BEUSERMISSINGERROR_ONE_ARGUMENT=		|||\
+										User {0} must be added to the corresponding application with proper user roles.
+										
+BEUSERINACTIVEWARNING_ONE_ARGUMENT=		|||\
+										User {0} must be added to the corresponding application with proper user roles.
+										
+BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT=	|||\
+										User {0} should be given proper administrator role for the corresponding application to perform the necessary actions.
+										
+BEINVALIDJSONINPUT=						|||Please check error logs for more information.
+
+BEINCORRECTHTTPSTATUSERROR=				|||Please check logs for more information.
+
+BEINITIALIZATIONERROR=					|||Please check logs for more information.
+
+BEUEBSYSTEMERROR=						||\
+										Operation: {0}.|\
+										An error occurred in {1} distribution mechanism. Please check the logs for more information.
+										
+BEDAOSYSTEMERROR=						|||Please check MySQL DB health or look at the logs for more details.
+
+BESYSTEMERROR=							|||Please check logs for more information.
+
+BEEXECUTEROLLBACKERROR=					|||Please check MYSQL DB health or look at the logs for more details.
+
+FEHTTPLOGGINGERROR=						|||Please check MYSQL DB health or look at the logs for more details.
+										
+FEPORTALSERVLETERROR=					|||Please check logs for more specific information about the problem.
+
+BEDAOCLOSESESSIONERROR=					|||Please check MYSQL DB health or look at the logs form more details.
+
+BERESTAPIGENERALERROR=					|||Please check error log for more information.
+
+FEHEALTHCHECKGENERALERROR=				|||Please check error log for more information.
+
+INTERNALUNEXPECTEDINFO_ONE_ARGUMENT=	|||Description: {0}.
+
+INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT=	|||Description: {0}.
+
+INTERNALUNEXPECTEDERROR_ONE_ARGUMENT=	|||Description: {0}.
+
+INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT=	|||Description: {0}.
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java
new file mode 100644
index 00000000..a9cb2e4c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPAppMessagesEnum.java
@@ -0,0 +1,260 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.logging.format;
+
+import org.openecomp.portalsdk.core.logging.format.AlarmSeverityEnum;
+import org.openecomp.portalsdk.core.logging.format.ErrorSeverityEnum;
+import org.openecomp.portalsdk.core.logging.format.ErrorTypeEnum;
+
+/**
+ * 
+ * @author rc580q
+ * Add ECOMP Portal Specific Error Code Enums here, for generic
+ * ones (ones you think are useful not only Portal but also SDK), add it
+ * to the enum class AppMessagesEnum defined in SDK.
+ */
+public enum EPAppMessagesEnum {
+	/*
+	100-199 Security/Permission Related 
+										- Authentication problems (from external client, to external server)
+										- Certification errors
+										- 
+											
+	200-299 Availability/Timeout Related
+										- connectivity error
+										- connection timeout
+										
+	300-399 Data Access/Integrity Related
+										- Data in graph in invalid(E.g. no creator is found for service) 
+										- Artifact is missing in ES, but exists in graph.
+										 
+	400-499 Schema Interface Type/Validation
+										- received Pay-load checksum is invalid
+										- received JSON is not valid
+							  
+	500-599 Business/Flow Processing Related  
+										-  check out to service is not allowed
+										-  Roll-back is done
+										-  failed to generate heat file
+										  
+
+	600-899 Reserved - do not use
+
+	900-999 Unknown Errors 
+										- Unexpected exception
+										*/
+	
+	BeUebAuthenticationError(EPErrorCodesEnum.BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR100E", "An Authentication failure occurred during access to UEB server", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+	
+	BeRestApiAuthenticationError(EPErrorCodesEnum.BERESTAPIAUTHENTICATIONERROR, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR101E", "Rejected an incoming REST API request due to invalid credentials", "", "Please check application credentials defined in Database or properties files."),
+	
+	InternalAuthenticationInfo(EPErrorCodesEnum.INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR199I", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	InternalAuthenticationWarning(EPErrorCodesEnum.INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+								"ERR199W", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	InternalAuthenticationError(EPErrorCodesEnum.INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR199E", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	InternalAuthenticationFatal(EPErrorCodesEnum.INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.AUTHENTICATION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+								"ERR199F", "Internal authentication problem", "Details: {0}.", "Please check the logs for more information."),
+	
+	BeHealthCheckError(EPErrorCodesEnum.BeHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR200E", "ECOMP-PORTAL Back-end probably lost connectivity to either one of the following components: MySQL DB, UEB Cluster", "", "Please check the logs for more information."),
+
+	BeHealthCheckMySqlError(EPErrorCodesEnum.BEHEALTHCHECKMYSQLERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR201E", "ECOMP-PORTAL Back-end probably lost connectivity to MySQL DB", "", "Check connectivity to MYSQL is configured correctly under system.properties file."),
+
+	BeHealthCheckUebClusterError(EPErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR203E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "", "Check connectivity to UEB cluster which is configured under portal.properties file."),
+	
+	FeHealthCheckError(EPErrorCodesEnum.FEHEALTHCHECKERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+								"ERR204E", "Unable to connect to a valid ECOMP-PORTAL Back-end Server.", "", "Please check connectivity from this FE instance towards BE or BE Load Balancer."),
+	
+	BeHealthCheckRecovery(EPErrorCodesEnum.BEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR205I", "ECOMP-PORTAL Back-end Recovery to either one of the following components: MySQL DB, UEB Cluster", "", "Please check logs for more specific information about the problem."),
+	
+	BeHealthCheckMySqlRecovery(EPErrorCodesEnum.BEHEALTHCHECKMYSQLRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR206I", "ECOMP-PORTAL Back-end connection recovery to MySQL DB", "", "Please check logs for more specific information about the problem."),
+	
+	BeHealthCheckUebClusterRecovery(EPErrorCodesEnum.BEHEALTHCHECKUEBCLUSTERRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR208I", "ECOMP-PORTAL Back-end connection recovery to UEB Cluster", "", "Please check logs for more specific information about the problem."),
+	
+	FeHealthCheckRecovery(EPErrorCodesEnum.FEHEALTHCHECKRECOVERY, ErrorTypeEnum.RECOVERY, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR209I", "Connectivity to ECOMP-PORTAL Front-end Server is recovered", "", "Please check logs for more specific information about the problem."),
+    
+	BeUebConnectionError(EPErrorCodesEnum.BEUEBCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR210E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+    
+    BeUebUnkownHostError(EPErrorCodesEnum.BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR211E", "ECOMP-PORTAL Back-end probably lost connectivity to UEB Cluster", "Cannot reach host: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+	
+    BeUebRegisterOnboardingAppError(EPErrorCodesEnum.BEUEBREGISTERONBOARDINGAPPERROR, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR212E", "Failed to register the On-boarding application with UEB Communication server", "Details: {0}.", "Please check UEB server list and keys configured under Portal.Properties file."),
+    
+    BeHttpConnectionError(EPErrorCodesEnum.BEHTTPCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR213E", "It could be that communication to an external application might resulted an exception or failed to reach the external application", 
+								"Details: {0}.", "Please check logs for more information."),
+    
+    InternalConnectionInfo(EPErrorCodesEnum.INTERNALCONNECTIONINFO_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+								"ERR299I", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+	InternalConnectionWarning(EPErrorCodesEnum.INTERNALCONNECTIONWARNING_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+								"ERR299W", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalConnectionError(EPErrorCodesEnum.INTERNALCONNECTIONERROR_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR299E", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalConnectionFatal(EPErrorCodesEnum.INTERNALCONNECTIONFATAL_ONE_ARGUMENT, ErrorTypeEnum.CONNECTION_PROBLEM, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+    							"ERR299F", "Internal Connection problem", "Details: {0}.", "Please check logs for more information."),
+    
+    BeUebObjectNotFoundError(EPErrorCodesEnum.BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR303E", "Error occurred during access to U-EB Server.", "Data not found: {0}.", "An error occurred during access to UEB Server, {1} failed to either register or unregister to/from UEB topic."),
+    
+    BeUserMissingError(EPErrorCodesEnum.BEUSERMISSINGERROR_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR310E", "User is not found", "", "User {0} must be added to the corresponding application with proper user roles."),
+    
+    BeUserInactiveWarning(EPErrorCodesEnum.BEUSERINACTIVEWARNING_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+    							"ERR313W", "User is found but in-active", "", "User {0} must be added to the corresponding application with proper user roles."),
+    
+    BeUserAdminPrivilegesInfo(EPErrorCodesEnum.BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+    							"ERR314W", "User is found but don't have administrative privileges", "", "User {0} should be given administrator role for the corresponding application to perform the necessary actions."),
+    
+    BeInvalidJsonInput(EPErrorCodesEnum.BEINVALIDJSONINPUT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR405E", "Failed to convert JSON input to object", "", "Please check logs for more information."),
+    
+    BeIncorrectHttpStatusError(EPErrorCodesEnum.BEINCORRECTHTTPSTATUSERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR407E", "Communication to an external application is resulted in with Incorrect Http response code", "", "Please check logs for more information."),
+    
+    BeInitializationError(EPErrorCodesEnum.BEINITIALIZATIONERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR500E", "ECOMP-PORTAL Back-end was not initialized properly", "", "Please check logs for more information."),
+    
+    BeUebSystemError(EPErrorCodesEnum.BEUEBSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR502E", "Error occurred during access to U-EB Server", "Details: {0}.", "An error occurred in {1} distribution mechanism. Please check the logs for more information."),
+    
+    BeDaoSystemError(EPErrorCodesEnum.BEDAOSYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR505E", "Performing DDL or DML operations on database might have failed", "", "Please check MySQL DB health or look at the logs for more details."),
+    
+    BeSystemError(EPErrorCodesEnum.BESYSTEMERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR506E", "Unexpected error during operation", "", "Please check logs for more information."),
+    
+    BeExecuteRollbackError(EPErrorCodesEnum.BEEXECUTEROLLBACKERROR, ErrorTypeEnum.DATA_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR507E", "Roll-back operation towards database has failed", "", "Please check MYSQL DB health or look at the logs for more details."),
+    
+    FeHttpLoggingError(EPErrorCodesEnum.FEHTTPLOGGINGERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.ERROR,
+    							"ERR517E", "Error when logging FE HTTP request/response", "", "Please check MYSQL DB health or look at the logs for more details."),
+    
+	FePortalServletError(EPErrorCodesEnum.FEPORTALSERVLETERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+								"ERR518E", "Error when trying to access FE Portal page.", "", "Please check logs for more information."),
+	
+    BeDaoCloseSessionError(EPErrorCodesEnum.BEDAOCLOSESESSIONERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR519E", "Close local session operation with database failed", "", "Please check MYSQL DB health or look at the logs form more details."),
+    
+    BeRestApiGeneralError(EPErrorCodesEnum.BERESTAPIGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR900E", "Unexpected error during ECOMP-PORTAL Back-end REST API execution", "", "Please check error log for more information."),
+    
+    FeHealthCheckGeneralError(EPErrorCodesEnum.FEHEALTHCHECKGENERALERROR, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.ERROR,
+    							"ERR901E", "General error during FE Health Check", "", "Please check error log for more information."),
+    
+    InternalUnexpectedInfo(EPErrorCodesEnum.INTERNALUNEXPECTEDINFO_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.INFORMATIONAL, ErrorSeverityEnum.INFO,
+    							"ERR999I", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalUnexpectedWarning(EPErrorCodesEnum.INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MINOR, ErrorSeverityEnum.WARN,
+    							"ERR999W", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalUnexpectedError(EPErrorCodesEnum.INTERNALUNEXPECTEDERROR_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.MAJOR, ErrorSeverityEnum.ERROR,
+    							"ERR999E", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+    
+    InternalUnexpectedFatal(EPErrorCodesEnum.INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT, ErrorTypeEnum.SYSTEM_ERROR, AlarmSeverityEnum.CRITICAL, ErrorSeverityEnum.FATAL,
+    							"ERR999F", "Unexpected error", "Details: {0}.", "Please check logs for more information."),
+	
+	;
+	
+	ErrorTypeEnum eType;
+	AlarmSeverityEnum alarmSeverity;
+	EPErrorCodesEnum messageCode;
+	ErrorSeverityEnum errorSeverity;
+	String errorCode;
+	String errorDescription;
+	String details;
+	String resolution;
+	
+	EPAppMessagesEnum(EPErrorCodesEnum messageCode, ErrorTypeEnum eType, AlarmSeverityEnum alarmSeverity, ErrorSeverityEnum errorSeverity, String errorCode, String errorDescription, 
+						String details, String resolution) {
+		this.messageCode = messageCode;
+		this.eType = eType;
+		this.alarmSeverity = alarmSeverity;
+		this.errorSeverity = errorSeverity;
+		this.errorCode = errorCode;
+		this.errorDescription = errorDescription;
+		this.details = details;
+		this.resolution = resolution;
+	}
+	
+	public String getDetails() {
+		return this.details;
+	}
+	
+	public String getResolution() {
+		return this.resolution;
+	}
+	public String getErrorCode() {
+		return this.errorCode;
+	}
+	
+	public String getErrorDescription() {
+		return this.errorDescription;
+	}
+	
+	public ErrorSeverityEnum getErrorSeverity() {
+		return this.errorSeverity;
+	}
+	
+	public void setErrorSeverity(ErrorSeverityEnum errorSeverity) {
+		this.errorSeverity = errorSeverity;
+	}
+	
+	public EPErrorCodesEnum getMessageCode() {
+		return messageCode;
+	}
+
+	public void setMessageCode(EPErrorCodesEnum messageCode) {
+		this.messageCode = messageCode;
+	}
+	
+	public AlarmSeverityEnum getAlarmSeverity() {
+		return alarmSeverity;
+	}
+
+	public void setAlarmSeverity(AlarmSeverityEnum alarmSeverity) {
+		this.alarmSeverity = alarmSeverity;
+	}
+	
+	public ErrorTypeEnum getErrorType() {
+		return eType;
+	}
+
+	public void setErrorType(ErrorTypeEnum eType) {
+		this.eType = eType;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java
new file mode 100644
index 00000000..cbfb4fa3
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/format/EPErrorCodesEnum.java
@@ -0,0 +1,95 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.logging.format;
+
+import com.att.eelf.i18n.EELFResolvableErrorEnum;
+import com.att.eelf.i18n.EELFResourceManager;
+
+/**
+ * 
+ * @author rc580q
+ * Add ECOMP Portal Specific Error Code Enums here, for generic
+ * ones (ones you think are useful not only Portal but also SDK), add it
+ * to the enum class AppMessagesEnum defined in SDK.
+ */
+public enum EPErrorCodesEnum implements EELFResolvableErrorEnum {
+	BERESTAPIAUTHENTICATIONERROR,
+	BEHTTPCONNECTIONERROR_ONE_ARGUMENT,
+	BEUEBAUTHENTICATIONERROR_ONE_ARGUMENT,
+	
+	INTERNALAUTHENTICATIONINFO_ONE_ARGUMENT,
+	INTERNALAUTHENTICATIONWARNING_ONE_ARGUMENT,
+	INTERNALAUTHENTICATIONERROR_ONE_ARGUMENT,
+	INTERNALAUTHENTICATIONFATAL_ONE_ARGUMENT,
+	
+	BEHEALTHCHECKRECOVERY,
+	BEHEALTHCHECKMYSQLRECOVERY,
+	BEHEALTHCHECKUEBCLUSTERRECOVERY,
+	FEHEALTHCHECKRECOVERY,
+	BeHEALTHCHECKERROR,
+	
+	BEHEALTHCHECKMYSQLERROR,
+	BEHEALTHCHECKUEBCLUSTERERROR,
+	FEHEALTHCHECKERROR,
+	BEUEBCONNECTIONERROR_ONE_ARGUMENT,
+	BEUEBUNKOWNHOSTERROR_ONE_ARGUMENT,
+	BEUEBREGISTERONBOARDINGAPPERROR,
+	
+	INTERNALCONNECTIONINFO_ONE_ARGUMENT,
+	INTERNALCONNECTIONWARNING_ONE_ARGUMENT,
+	INTERNALCONNECTIONERROR_ONE_ARGUMENT,
+	INTERNALCONNECTIONFATAL_ONE_ARGUMENT,
+	
+	BEUEBOBJECTNOTFOUNDERROR_ONE_ARGUMENT,
+	BEUSERMISSINGERROR_ONE_ARGUMENT,
+	
+	BEUSERINACTIVEWARNING_ONE_ARGUMENT,
+	BEUSERADMINPRIVILEGESINFO_ONE_ARGUMENT,
+	
+	BEINVALIDJSONINPUT,
+	BEINCORRECTHTTPSTATUSERROR,
+		
+	BEINITIALIZATIONERROR,
+	BEUEBSYSTEMERROR,
+	BEDAOSYSTEMERROR,
+	BESYSTEMERROR,
+	BEEXECUTEROLLBACKERROR,
+	
+	FEHTTPLOGGINGERROR,
+	FEPORTALSERVLETERROR,
+	BEDAOCLOSESESSIONERROR,
+	
+	BERESTAPIGENERALERROR,
+	FEHEALTHCHECKGENERALERROR,
+	
+	INTERNALUNEXPECTEDINFO_ONE_ARGUMENT,
+	INTERNALUNEXPECTEDWARNING_ONE_ARGUMENT,
+	INTERNALUNEXPECTEDERROR_ONE_ARGUMENT,
+	INTERNALUNEXPECTEDFATAL_ONE_ARGUMENT,
+	;
+	
+	/**
+     * Static initializer to ensure the resource bundles for this class are loaded...
+     * Here this application loads messages from three bundles
+     */
+    static {
+        EELFResourceManager.loadMessageBundle("org/openecomp/portalapp/portal/logging/format/ApplicationCodes");
+    }
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/logic/EPLogUtil.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/logic/EPLogUtil.java
new file mode 100644
index 00000000..aa86765b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/logging/logic/EPLogUtil.java
@@ -0,0 +1,270 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.logging.logic;
+
+import static com.att.eelf.configuration.Configuration.MDC_ALERT_SEVERITY;
+
+import java.text.MessageFormat;
+
+import org.slf4j.MDC;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import org.openecomp.portalsdk.core.logging.format.AlarmSeverityEnum;
+import org.openecomp.portalsdk.core.logging.format.ErrorSeverityEnum;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+
+public class EPLogUtil {
+
+	// This class has no logger.  It uses loggers passed to it.
+	
+	/**
+	 * Formats and writes a message to the error log with the class name and the
+	 * specified parameters, using log level info, warn or error appropriate for
+	 * the specified severity
+	 * 
+	 * @param classLogger
+	 *            Logger for the class where the error occurred; the logger
+	 *            carries the class name.
+	 * @param epMessageEnum
+	 *            Enum carrying alarm and error severity
+	 * @param param
+	 *            Values used to build the message.
+	 */
+	public static void logEcompError(EELFLoggerDelegate classLogger, EPAppMessagesEnum epMessageEnum, String... param) {
+		logEcompError(classLogger, epMessageEnum, null, param);
+	}
+	
+	/**
+	 * Formats and writes a message to the error log with the class name and the
+	 * specified parameters, using log level info, warn or error appropriate for
+	 * the specified severity
+	 * 
+	 * @param classLogger
+	 *            Logger for the class where the error occurred; the logger
+	 *            carries the class name.
+	 * @param epMessageEnum
+	 *            Enum carrying alarm and error severity
+	 * @param param
+	 *            Values used to build the message.
+	 */
+	private static EELFLogger errorLogger = EELFManager.getInstance().getErrorLogger();
+	public static void logEcompError(EPAppMessagesEnum epMessageEnum, String... param) {
+		try {
+			AlarmSeverityEnum alarmSeverityEnum = epMessageEnum.getAlarmSeverity();
+			ErrorSeverityEnum errorSeverityEnum = epMessageEnum.getErrorSeverity();
+			
+			MDC.put(MDC_ALERT_SEVERITY, alarmSeverityEnum.name());
+			MDC.put("ErrorCode", epMessageEnum.getErrorCode());
+			MDC.put("ErrorDescription", epMessageEnum.getErrorDescription());
+			MDC.put("ClassName", EPLogUtil.class.getName());
+			
+			String resolution = EPLogUtil.formatMessage(epMessageEnum.getDetails() + " " + epMessageEnum.getResolution(), (Object[]) param);
+			if (errorSeverityEnum == ErrorSeverityEnum.WARN) {
+				errorLogger.warn(resolution);
+			} else if(errorSeverityEnum == ErrorSeverityEnum.INFO) {
+				errorLogger.info(resolution);
+			} else {
+				errorLogger.error(resolution);
+			}
+		} catch(Exception e) {
+			errorLogger.error("Failed to log the error code. Details: " + UserUtils.getStackTrace(e));
+		} finally {
+			MDC.remove("ErrorCode");
+			MDC.remove("ErrorDescription");
+			MDC.remove("ClassName");
+			MDC.remove(MDC_ALERT_SEVERITY);
+		}
+	}
+
+	/**
+	 * Formats and writes a message to the error log with the class name,
+	 * throwable and the specified parameters, using log level info, warn or
+	 * error appropriate for the specified severity
+	 * 
+	 * @param classLogger
+	 *            Logger for the class where the error occurred; the logger
+	 *            carries the class name.
+	 * @param epMessageEnum
+	 *            Enum carrying alarm and error severity
+	 * @param th
+	 *            Throwable; ignored if null
+	 * @param param
+	 *            Array of Strings used to build the message.
+	 */
+	@SuppressWarnings("static-access")
+	public static void logEcompError(EELFLoggerDelegate classLogger, EPAppMessagesEnum epMessageEnum, Throwable th,
+			String... param) {
+
+		AlarmSeverityEnum alarmSeverityEnum = epMessageEnum.getAlarmSeverity();
+		ErrorSeverityEnum errorSeverityEnum = epMessageEnum.getErrorSeverity();
+
+		MDC.put(MDC_ALERT_SEVERITY, alarmSeverityEnum.name());
+		MDC.put("ErrorCode", epMessageEnum.getErrorCode());
+		MDC.put("ErrorDescription", epMessageEnum.getErrorDescription());
+
+		final String message = EPLogUtil.formatMessage(epMessageEnum.getDetails() + " " + epMessageEnum.getResolution(),
+				(Object[]) param);
+		if (errorSeverityEnum == ErrorSeverityEnum.INFO) {
+			if (th == null)
+				classLogger.info(classLogger.errorLogger, message);
+			else
+				classLogger.info(classLogger.errorLogger, message, th);
+		} else if (errorSeverityEnum == ErrorSeverityEnum.WARN) {
+			if (th == null)
+				classLogger.warn(classLogger.errorLogger, message);
+			else
+				classLogger.warn(classLogger.errorLogger, message, th);
+		} else {
+			if (th == null)
+				classLogger.error(classLogger.errorLogger, message);
+			else
+				classLogger.error(classLogger.errorLogger, message, th);
+		}
+
+		// Clean up
+		MDC.remove(MDC_ALERT_SEVERITY);
+		MDC.remove("ErrorCode");
+		MDC.remove("ErrorDescription");
+	}
+
+	/**
+	 * Builds a string using the format and parameters.
+	 * @param message
+	 * @param args
+	 * @return
+	 */
+	private static String formatMessage(String message, Object... args) {
+		StringBuilder sbFormattedMessage = new StringBuilder();
+		if (args != null && args.length > 0 && message != null && message != "") {
+			MessageFormat mf = new MessageFormat(message);
+			sbFormattedMessage.append(mf.format(args));
+		} else {
+			sbFormattedMessage.append(message);
+		}
+		return sbFormattedMessage.toString();
+	}
+
+	/**
+	 * Builds a comma-separated string of values to document a user action.
+	 * 
+	 * @param action
+	 * @param activity
+	 * @param userId
+	 * @param affectedId
+	 * @param comment
+	 * @return Value suitable for writing to the audit log file.
+	 */
+	public static String formatAuditLogMessage(String action, String activity, String userId, String affectedId,
+			String comment) {
+		StringBuilder auditLogMsg = new StringBuilder();
+		auditLogMsg.append("Click_A:[");
+		if (action != null && !action.equals("")) {
+			auditLogMsg.append(" Action: ");
+			auditLogMsg.append(action);
+		}
+
+		if (activity != null && !activity.equals("")) {
+			auditLogMsg.append(",Activity CD: ");
+			auditLogMsg.append(activity);
+		}
+
+		if (userId != null && !userId.equals("")) {
+			auditLogMsg.append(",User ID: ");
+			auditLogMsg.append(userId);
+		}
+
+		if (affectedId != null && !affectedId.equals("")) {
+			auditLogMsg.append(",Affected ID: ");
+			auditLogMsg.append(affectedId);
+		}
+
+		if (comment != null && !comment.equals("")) {
+			auditLogMsg.append(",Comment: ");
+			auditLogMsg.append(comment);
+		}
+		auditLogMsg.append("]");
+		return auditLogMsg.toString();
+	}
+
+	/**
+	 * Builds a comma-separated string of values to document a user browser
+	 * action.
+	 * 
+	 * @param orgUserId
+	 * @param action
+	 * @param activity
+	 * @param actionLink
+	 * @param page
+	 * @param function
+	 * @param type
+	 * @return Value suitable for writing to the audit log file.
+	 */
+	public static String formatStoreAnalyticsAuditLogMessage(String orgUserId, String appName, String action, String activity,
+			String actionLink, String page, String function, String type) {
+		StringBuilder auditLogStoreAnalyticsMsg = new StringBuilder();
+		auditLogStoreAnalyticsMsg.append("Click_Analytics:[");
+		if (orgUserId != null && !orgUserId.equals("")) {
+			auditLogStoreAnalyticsMsg.append(" Organization User ID: ");
+			auditLogStoreAnalyticsMsg.append(orgUserId);
+		}
+		
+		if (appName != null && !appName.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",AppName: ");
+			auditLogStoreAnalyticsMsg.append(appName);
+		}
+
+		if (action != null && !action.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",Action: ");
+			auditLogStoreAnalyticsMsg.append(action);
+		}
+
+		if (activity != null && !activity.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",Activity: ");
+			auditLogStoreAnalyticsMsg.append(activity);
+		}
+
+		if (actionLink != null && !actionLink.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",ActionLink: ");
+			auditLogStoreAnalyticsMsg.append(actionLink);
+		}
+
+		if (page != null && !page.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",Page: ");
+			auditLogStoreAnalyticsMsg.append(page);
+		}
+
+		if (function != null && !function.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",Function: ");
+			auditLogStoreAnalyticsMsg.append(function);
+		}
+
+		if (type != null && !type.equals("")) {
+			auditLogStoreAnalyticsMsg.append(",Type: ");
+			auditLogStoreAnalyticsMsg.append(type);
+		}
+		auditLogStoreAnalyticsMsg.append("]");
+		return auditLogStoreAnalyticsMsg.toString();
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesService.java
new file mode 100644
index 00000000..a1016e1c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesService.java
@@ -0,0 +1,56 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.transport.AppsListWithAdminRole;
+
+public interface AdminRolesService {
+
+	public AppsListWithAdminRole getAppsWithAdminRoleStateForUser(String orgUserId);
+
+	public boolean setAppsWithAdminRoleStateForUser(AppsListWithAdminRole newAppsListWithAdminRoles);
+
+	/**
+	 * Attention! User roles in ECOMP PORTAL cannot be managed by this function.
+	 * @param user
+	 * @return 'true' if user has Super Administrator role SYS_ADMIN_ROLE_ID (1 for now) in ECOMP PORTAL, 'false' otherwise
+	 */
+	public boolean isSuperAdmin(EPUser user);
+	
+	/**
+	 * Attention! User roles in ECOMP PORTAL cannot be managed by this function.
+	 * @param user
+	 * @return 'true' if user has Account Administrator role ACCOUNT_ADMIN_ROLE_ID (999 for now) for any application except ECOMP Portal, 'false' otherwise
+	 */
+	public boolean isAccountAdmin(EPUser user);
+
+	/**
+	 * Attention! User roles in ECOMP PORTAL cannot be managed by this function.
+	 * @param user
+	 * @return 'true' if user has any remote(!) role within any application (ECOMP Portal roles are not included), 'false' otherwise
+	 */
+	public boolean isUser(EPUser user);
+
+	List<EPRole> getRolesByApp(EPUser user, Long appId);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java
new file mode 100644
index 00000000..50e7348e
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AdminRolesServiceImpl.java
@@ -0,0 +1,329 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.cxf.common.util.StringUtils;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserApp;
+import org.openecomp.portalapp.portal.domain.UserIdRoleId;
+import org.openecomp.portalapp.portal.domain.UserRole;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.transport.AppNameIdIsAdmin;
+import org.openecomp.portalapp.portal.transport.AppsListWithAdminRole;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Service("adminRolesService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+
+public class AdminRolesServiceImpl implements AdminRolesService {
+
+	private Long SYS_ADMIN_ROLE_ID = 1L;
+	private Long ACCOUNT_ADMIN_ROLE_ID = 999L;
+	private Long ECOMP_APP_ID = 1L;
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AdminRolesServiceImpl.class);
+
+	@Autowired
+	private SessionFactory sessionFactory;
+	@Autowired
+	private DataAccessService dataAccessService;
+	@Autowired
+	SearchService searchService;
+	@Autowired
+	EPAppService appsService;
+
+	@PostConstruct
+	private void init() {
+		try {
+			SYS_ADMIN_ROLE_ID = Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.SYS_ADMIN_ROLE_ID));
+			ACCOUNT_ADMIN_ROLE_ID = Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID));
+			ECOMP_APP_ID = Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ECOMP_APP_ID));
+		} catch(Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		}
+	}
+	
+	@Override
+	@EPMetricsLog
+	@SuppressWarnings("unchecked")
+	public AppsListWithAdminRole getAppsWithAdminRoleStateForUser(String orgUserId) {
+		AppsListWithAdminRole appsListWithAdminRole = null;
+
+		try {
+			List<EPUser> userList = dataAccessService.getList(EPUser.class, " where orgUserId = '" + orgUserId + "'", null,
+					null);
+			HashMap<Long, Long> appsUserAdmin = new HashMap<Long, Long>();
+			if (userList.size() > 0) {
+				EPUser user = userList.get(0);
+				List<EPUserApp> userAppList = null;
+				try {
+					userAppList = dataAccessService.getList(EPUserApp.class,
+							" where userId = " + user.getId() + " and role.id = " + ACCOUNT_ADMIN_ROLE_ID, null, null);
+				} catch (Exception e) {
+					logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+					EPLogUtil.logEcompError(EPAppMessagesEnum.BeDaoSystemError);
+				}
+				for (EPUserApp userApp : userAppList) {
+					appsUserAdmin.put(userApp.getAppId(), userApp.getUserId());
+				}
+			}
+
+			appsListWithAdminRole = new AppsListWithAdminRole();
+			appsListWithAdminRole.orgUserId = orgUserId;
+			List<EPApp> appsList = null;
+			try {
+				appsList = dataAccessService.getList(EPApp.class, "  where ( enabled = 'Y' or id = " + ECOMP_APP_ID + ")", null, null);
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+				EPLogUtil.logEcompError(EPAppMessagesEnum.BeDaoSystemError);
+			}
+			for (EPApp app : appsList) {
+				AppNameIdIsAdmin appNameIdIsAdmin = new AppNameIdIsAdmin();
+				appNameIdIsAdmin.id = app.getId();
+				appNameIdIsAdmin.appName = app.getName();	
+				appNameIdIsAdmin.isAdmin = new Boolean(appsUserAdmin.containsKey(app.getId()));
+				appNameIdIsAdmin.restrictedApp = app.isRestrictedApp();
+				appsListWithAdminRole.appsRoles.add(appNameIdIsAdmin);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing AdminRolesServiceImpl.getAppsWithAdminRoleStateForUser operation, Details:"
+							+ EcompPortalUtils.getStackTrace(e));
+		}
+
+		return appsListWithAdminRole;
+	}
+
+	private static final Object syncRests = new Object();
+
+	@Override
+	@EPMetricsLog
+	@SuppressWarnings("unchecked")
+	public boolean setAppsWithAdminRoleStateForUser(AppsListWithAdminRole newAppsListWithAdminRoles) {
+		boolean result = false;
+		// No changes if no new roles list or no userId.
+		if (!StringUtils.isEmpty(newAppsListWithAdminRoles.orgUserId) && newAppsListWithAdminRoles.appsRoles != null) {
+			synchronized (syncRests) {
+				List<EPApp> apps = appsService.getAppsFullList();
+				HashMap<Long, EPApp> enabledApps = new HashMap<Long, EPApp>();
+				for (EPApp app : apps) {
+					if (app.getEnabled().booleanValue() || app.getId() == ECOMP_APP_ID) {
+						enabledApps.put(app.getId(), app);
+					}
+				}
+				List<AppNameIdIsAdmin> newAppsWhereUserIsAdmin = new ArrayList<AppNameIdIsAdmin>();
+				for (AppNameIdIsAdmin adminRole : newAppsListWithAdminRoles.appsRoles) {
+					// user Admin role may be added only for enabled apps
+					if (adminRole.isAdmin.booleanValue() && enabledApps.containsKey(adminRole.id)) {
+						newAppsWhereUserIsAdmin.add(adminRole);
+					}
+				}
+				EPUser user = null;
+				boolean createNewUser = false;
+				String orgUserId = newAppsListWithAdminRoles.orgUserId.trim();
+				List<EPUser> localUserList = dataAccessService.getList(EPUser.class, " where org_user_id='" + orgUserId + "'",
+						null, null);
+				List<EPUserApp> oldAppsWhereUserIsAdmin = new ArrayList<EPUserApp>();
+				if (localUserList.size() > 0) {
+					EPUser tmpUser = localUserList.get(0);
+					oldAppsWhereUserIsAdmin = dataAccessService.getList(EPUserApp.class,
+							" where userId = " + tmpUser.getId() + " and role.id = " + ACCOUNT_ADMIN_ROLE_ID, null,
+							null);
+					if (oldAppsWhereUserIsAdmin.size() > 0 || newAppsWhereUserIsAdmin.size() > 0) {
+						user = tmpUser;
+					}
+				} else if (newAppsWhereUserIsAdmin.size() > 0) {
+					// we create new user only if he has Admin Role for any App
+					createNewUser = true;
+				}
+				if (user != null || createNewUser) {
+					Session localSession = null;
+					Transaction transaction = null;
+					try {
+						localSession = sessionFactory.openSession();
+						transaction = localSession.beginTransaction();
+						if (createNewUser) {
+							user = this.searchService.searchUserByUserId(orgUserId);
+							if (user != null) {
+								// insert the user with active true in order to
+								// pass login phase.
+								user.setActive(true);
+								localSession.save(EPUser.class.getName(), user);
+							}
+						}
+						for (EPUserApp oldUserApp : oldAppsWhereUserIsAdmin) {
+							// user Admin role may be deleted only for enabled
+							// apps
+							if (enabledApps.containsKey(oldUserApp.getAppId())) {
+								localSession.delete(oldUserApp);
+							}
+						}
+						for (AppNameIdIsAdmin appNameIdIsAdmin : newAppsWhereUserIsAdmin) {
+							EPApp app = (EPApp) localSession.get(EPApp.class, appNameIdIsAdmin.id);
+							EPRole role = (EPRole) localSession.get(EPRole.class, new Long(ACCOUNT_ADMIN_ROLE_ID));
+							EPUserApp newUserApp = new EPUserApp();
+							newUserApp.setUserId(user.getId());
+							newUserApp.setApp(app);
+							newUserApp.setRole(role);
+							localSession.save(EPUserApp.class.getName(), newUserApp);
+						}
+						transaction.commit();
+						result = true;
+					} catch (Exception e) {
+						EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+						logger.error(EELFLoggerDelegate.errorLogger, "setAppsWithAdminRoleStateForUser: exception in point 2", e);
+						try {
+							transaction.rollback();
+						} catch (Exception ex) {
+							EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeExecuteRollbackError, e);
+							logger.error(EELFLoggerDelegate.errorLogger, "setAppsWithAdminRoleStateForUser: exception in point 3", ex);
+						}
+					} finally {
+						try {
+							localSession.close();
+						} catch (Exception e) {
+							EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoCloseSessionError, e);
+							logger.error(EELFLoggerDelegate.errorLogger, "setAppsWithAdminRoleStateForUser: exception in point 4", e);
+						}
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public boolean isSuperAdmin(EPUser user) {
+		if ((user != null) /* && (user.getId() == null) */ && (user.getOrgUserId() != null)) {
+			String sql = "SELECT user.USER_ID, user.org_user_id, userrole.ROLE_ID, userrole.APP_ID FROM fn_user_role userrole "
+					+ "INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID " + "WHERE user.org_user_id = '"
+					+ user.getOrgUserId() + "' " + "AND userrole.ROLE_ID = '" + SYS_ADMIN_ROLE_ID + "' "
+					+ "AND userrole.APP_ID = '" + ECOMP_APP_ID + "';";
+			try {
+				List<UserRole> userRoleList = dataAccessService.executeSQLQuery(sql, UserIdRoleId.class, null);
+				if (userRoleList != null && userRoleList.size() > 0) {
+					return true;
+				}
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+				logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while executing isSuperAdmin operation", e);
+			}
+		}
+		// else
+		// {
+		// User currentUser = user != null ? (User)
+		// dataAccessService.getDomainObject(User.class, user.getId(), null) :
+		// null;
+		// if (currentUser != null && currentUser.getId() != null) {
+		// for (UserApp userApp : currentUser.getUserApps()) {
+		// if (userApp.getApp().getId().equals(ECOMP_APP_ID) &&
+		// userApp.getRole().getId().equals(SYS_ADMIN_ROLE_ID)) {
+		// // Super Administrator role is global, no need to keep iterating
+		// return true;
+		// }
+		// }
+		// }
+		// }
+		return false;
+	}
+
+	public boolean isAccountAdmin(EPUser user) {
+		try {
+			EPUser currentUser = user != null
+					? (EPUser) dataAccessService.getDomainObject(EPUser.class, user.getId(), null) : null;
+			if (currentUser != null && currentUser.getId() != null) {
+				for (EPUserApp userApp : currentUser.getEPUserApps()) {
+					if (//!userApp.getApp().getId().equals(ECOMP_APP_ID)
+							// && 
+							userApp.getRole().getId().equals(ACCOUNT_ADMIN_ROLE_ID)) {
+						// Account Administrator sees only the applications
+						// he/she is Administrator
+						return true;
+					}
+				}
+			}
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while executing isAccountAdmin operation", e);
+		}
+		return false;
+	}
+
+	public boolean isUser(EPUser user) {
+		try {
+			EPUser currentUser = user != null
+					? (EPUser) dataAccessService.getDomainObject(EPUser.class, user.getId(), null) : null;
+			if (currentUser != null && currentUser.getId() != null) {
+				for (EPUserApp userApp : currentUser.getEPUserApps()) {
+					if (!userApp.getApp().getId().equals(ECOMP_APP_ID)) {
+						EPRole role = userApp.getRole();
+						if (!role.getId().equals(SYS_ADMIN_ROLE_ID) && !role.getId().equals(ACCOUNT_ADMIN_ROLE_ID)) {
+							if (role.getActive()) {
+								return true;
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while executing isUser operation", e);
+		}
+		return false;
+	}
+
+	@Override
+	@EPMetricsLog
+	public List<EPRole> getRolesByApp(EPUser user, Long appId) {
+		List<EPRole> list = new ArrayList<>();
+		String sql = "SELECT * FROM FN_ROLE WHERE APP_ID = " + appId;
+		@SuppressWarnings("unchecked")
+		List<EPRole> roles = dataAccessService.executeSQLQuery(sql, EPRole.class, null);
+		for (EPRole role: roles) {
+			list.add(role);
+		}
+		return list;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppContactUsService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppContactUsService.java
new file mode 100644
index 00000000..e8ef64fd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppContactUsService.java
@@ -0,0 +1,55 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.ecomp.model.AppCategoryFunctionsItem;
+import org.openecomp.portalapp.portal.ecomp.model.AppContactUsItem;
+
+public interface AppContactUsService {
+	
+	/**
+	 * Gets a list of contact-us information for all entries in
+	 * the fn_app_contact_us table, sorted by app name.  If an application is active but has no fn_app_contact_us entry, it will have no entry in this result.
+ 	* 
+	 * @return List of AppContactUsItem, one for each item in fn_app_contact_us table.
+	 * @throws Exception
+	 */
+	public List<AppContactUsItem> getAppContactUs() throws Exception;
+
+	/**
+	 * Gets a list of contact-us information for all applications
+	 * in the fn_app table, extended with any information in the fn_app_contact_us table.
+	 * 
+	 * @return List of AppContactUsItem, one for each item in fn_app table.
+	 * @throws Exception
+	 */
+	public List<AppContactUsItem> getAppsAndContacts() throws Exception;
+	
+	public List<AppCategoryFunctionsItem> getAppCategoryFunctions() throws Exception;
+	
+	public String saveAppContactUs(List<AppContactUsItem> contactUs) throws Exception;
+	
+	public String saveAppContactUs(AppContactUsItem contactUs) throws Exception;
+
+	public String deleteContactUs(Long id) throws Exception;
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppContactUsServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppContactUsServiceImpl.java
new file mode 100644
index 00000000..41c5d9fd
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppContactUsServiceImpl.java
@@ -0,0 +1,189 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.AppContactUs;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.ecomp.model.AppCategoryFunctionsItem;
+import org.openecomp.portalapp.portal.ecomp.model.AppContactUsItem;
+
+/**
+ * Provides database access for the contact-us page controllers.
+ */
+@Transactional
+@org.springframework.context.annotation.Configuration
+public class AppContactUsServiceImpl implements AppContactUsService {
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppContactUsServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.AppContactUsService#
+	 * getAppContactUs()
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<AppContactUsItem> getAppContactUs() throws Exception {
+		List<AppContactUsItem> contactUsItemList = (List<AppContactUsItem>) getDataAccessService()
+				.executeNamedQuery("getAppContactUsItems", null, null);
+		Collections.sort(contactUsItemList, new AppContactUsItemCompare());
+		return contactUsItemList;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.AppContactUsService#
+	 * getAllAppsAndContacts()
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<AppContactUsItem> getAppsAndContacts() throws Exception {
+		List<AppContactUsItem> contactUsItemList = (List<AppContactUsItem>) getDataAccessService()
+				.executeNamedQuery("getAppsAndContacts", null, null);
+		Collections.sort(contactUsItemList, new AppContactUsItemCompare());
+		return contactUsItemList;
+	}
+
+	/**
+	 * Assists in sorting app-contact-us items by application name.
+	 */
+	class AppContactUsItemCompare implements Comparator<AppContactUsItem> {
+		@Override
+		public int compare(AppContactUsItem o1, AppContactUsItem o2) {
+			return o1.getAppName().compareTo(o2.getAppName());
+		}
+	}
+
+	/**
+	 * Gets a table of category and function details for apps that participate
+	 * in the functional menu.
+	 */
+	@Override
+	public List<AppCategoryFunctionsItem> getAppCategoryFunctions() throws Exception {
+		@SuppressWarnings("unchecked")
+		// This named query requires no parameters.
+		List<AppCategoryFunctionsItem> list = (List<AppCategoryFunctionsItem>) dataAccessService
+				.executeNamedQuery("getAppCategoryFunctions", null, null);
+		logger.debug(EELFLoggerDelegate.debugLogger, "getAppCategoryFunctions: result list size is " + list.size());
+		return list;
+	}
+
+	/**
+	 * Saves the list of contact-us objects to the database.
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String saveAppContactUs(List<AppContactUsItem> contactUsModelList) throws Exception {
+		try {
+			for (AppContactUsItem contactUs : contactUsModelList) {
+				String status = saveAppContactUs(contactUs);
+				if (!status.equals("success"))
+					throw new Exception("saveAppContaatUsFailed: service returned " + status);
+			}
+			return "success";
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "", e);
+			throw new Exception(e);
+		}
+
+	}
+
+	/**
+	 * Saves a single contact-us object to the database, either creating a new
+	 * row or updating if the argument has the ID of an existing row.
+	 */
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public String saveAppContactUs(AppContactUsItem contactUsModel) throws Exception {
+		try {
+			HashMap<String, Object> map = new HashMap<String, Object>();
+			AppContactUs contactUs = null;
+			try {
+				contactUs = (AppContactUs) getDataAccessService().getDomainObject(AppContactUs.class,
+						contactUsModel.getAppId(), map);
+			} catch (Exception e) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "saveAppContactUs: not found for App {}, adding new entry",
+						contactUsModel.getAppName());
+				contactUs = new AppContactUs();
+			}
+
+			// Populate the AppContactUs model for the database.
+			EPApp app = (EPApp) getDataAccessService().getDomainObject(EPApp.class, contactUsModel.getAppId(), map);
+			if (app == null || app.getId() == null)
+				throw new Exception("saveAppContactus: App not found for Id " + contactUsModel.getAppId());
+			contactUs.setApp(app);
+			contactUs.setDescription(contactUsModel.getDescription());
+			contactUs.setContactName(contactUsModel.getContactName());
+			contactUs.setContactEmail(contactUsModel.getContactEmail());
+			contactUs.setActiveYN(contactUsModel.getActiveYN());
+			contactUs.setUrl(contactUsModel.getUrl());
+			getDataAccessService().saveDomainObject(contactUs, map);
+			return "success";
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveAppContactUs failed", e);
+			throw e;
+			// return "failure";
+		}
+	}
+
+	/**
+	 * Deletes the row from the app contact us table with the specified ID.
+	 */
+	@Override
+	public String deleteContactUs(Long id) throws Exception {
+		try {
+			HashMap<String, Object> map = new HashMap<String, Object>();
+			AppContactUs contactUs = (AppContactUs) getDataAccessService().getDomainObject(AppContactUs.class, id, map);
+			if (contactUs.getApp() == null)
+				throw new Exception("Delete unsuccessful for Id " + id);
+			getDataAccessService().deleteDomainObject(contactUs, map);
+			return "success";
+		} catch (Exception e) {
+
+			logger.info(EELFLoggerDelegate.errorLogger, "", e);
+			throw e;
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientService.java
new file mode 100644
index 00000000..caeceb3c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientService.java
@@ -0,0 +1,53 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import org.apache.cxf.transport.http.HTTPException;
+import org.openecomp.portalapp.util.SystemType;
+
+public interface ApplicationsRestClientService {
+	public <T> T get(Class<T> clazz, long app, String restPath) throws HTTPException;
+	public String getIncomingJsonString(long appId, String restPath) throws HTTPException;
+
+	public <T> T post(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException;
+	public <T> T post(Class<T> clazz, long appId, Object payload, String restPath, SystemType type) throws HTTPException;
+
+	public <T> T put(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException;
+
+	/**
+	 * Sends a GET request to the specified application at the specified path.
+	 * This is a workaround for a problem triggered by a superclass/subclass
+	 * with identical field names.
+	 * 
+	 * @param clazz
+	 *            Expected response type
+	 * @param appId
+	 *            Application ID
+	 * @param restPath
+	 *            Path at the remote application
+	 * @param useJacksonMapper
+	 *            If true, uses a com.fasterxml.jackson.databind.ObjectMapper to
+	 *            translate the remote application response from JSON to an
+	 *            object. Otherwise, uses a com.google.gson.Gson.
+	 * @return Instance of the specified class
+	 * @throws HTTPException
+	 */
+	public <T> T get(Class<T> clazz, long appId, String restPath, boolean useJacksonMapper) throws HTTPException;
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
new file mode 100644
index 00000000..027d972c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
@@ -0,0 +1,411 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;
+
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Base64;
+import java.util.Date;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.transport.http.HTTPException;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalapp.util.SystemType;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+
+@Service("applicationsRestClientService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPAuditLog
+public class ApplicationsRestClientServiceImpl implements ApplicationsRestClientService {
+
+	private static final String PASSWORD_HEADER = "password";
+
+	private static final String APP_USERNAME_HEADER = "username";
+
+	private static final String BASIC_AUTHENTICATION_HEADER = "Authorization";
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ApplicationsRestClientServiceImpl.class);
+
+	@Autowired
+	private AppsCacheService appsCacheService;
+
+	Gson gson = null;
+
+	private final ObjectMapper mapper = new ObjectMapper();
+
+	@PostConstruct
+	private void init() {
+		logger.debug(EELFLoggerDelegate.debugLogger, "initializing");
+		GsonBuilder builder = new GsonBuilder();
+
+		// Register an adapter to manage the date types as long values
+		builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
+			public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+					throws JsonParseException {
+				return new Date(json.getAsJsonPrimitive().getAsLong());
+			}
+		});
+
+		gson = builder.create();
+	}
+
+	// TODO: do we need to do additional logging for remote API calls?
+	private static WebClient createClientForPath(String baseUri, String path) {
+		logger.info(EELFLoggerDelegate.debugLogger, "Creating web client for " + baseUri + "   +   " + path);
+		WebClient client = WebClient.create(baseUri);
+		client.type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON);
+		client.path(path);
+		return client;
+	}
+
+	@EPMetricsLog
+	private void verifyResponse(Response response) throws HTTPException {
+		int status = response.getStatus();
+		logger.debug(EELFLoggerDelegate.debugLogger, "http response status=" + status);
+		MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE, Integer.toString(status));
+		if (!isHttpSuccess(status)) {
+			String errMsg = "Failed. Status=" + status + "; [" + response.getStatusInfo().getReasonPhrase().toString()
+					+ "]";
+			URL url = null;
+			try {
+				// must not be null to avoid NPE in HTTPException constructor
+				url = new URL("http://null");
+				if (response.getLocation() != null)
+					url = response.getLocation().toURL();
+			} catch (MalformedURLException e) {
+				// never mind. it is only for the debug message.
+				logger.warn(EELFLoggerDelegate.errorLogger, "Failed to build URL", e);
+			}
+			logger.error(EELFLoggerDelegate.errorLogger, "http response failed. " + errMsg + "; url=" + url);
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeIncorrectHttpStatusError);
+			throw new HTTPException(status, errMsg, url);
+		}
+	}
+
+	private static boolean isHttpSuccess(int status) {
+		return status / 100 == 2;
+	}
+	
+	
+	private WebClient createClientForApp(long appId, String restPath) {
+		return createClientFor(appId, restPath, SystemType.APPLICATION);
+	}
+
+	//TODO Need to implement the mylogins once the endpoint is confirmed
+	@EPMetricsLog
+	private WebClient createClientFor(long appSystemId, String restPath, SystemType type) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "creating client for appId=" + appSystemId + "; restPath=" + restPath);
+		EPApp externalApp = null;
+		
+		if(type == SystemType.APPLICATION){
+		externalApp = appsCacheService.getApp(appSystemId);
+		}else{
+			// TO DO 
+		}
+		
+		if (externalApp != null) {
+			String appBaseUri = (type == SystemType.APPLICATION) ? externalApp.getAppRestEndpoint() : "";
+			String username = (type == SystemType.APPLICATION) ? externalApp.getUsername(): "";
+			String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppPassword(): "";
+			String appName = (type == SystemType.APPLICATION) ? externalApp.getName(): "";
+			String decreptedAppPwd = "";
+
+			// Set local context
+			MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTP);
+			if (appBaseUri != null && appBaseUri.contains("https")) {
+				MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTPS);
+			}
+			MDC.put(EPCommonSystemProperties.FULL_URL, appBaseUri + restPath);
+			MDC.put(EPCommonSystemProperties.TARGET_ENTITY, appName);
+			MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, restPath);
+
+			try {
+				decreptedAppPwd = CipherUtil.decrypt(encriptedPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "Unable to decrypt App name = " + externalApp,
+						EcompPortalUtils.getStackTrace(e));
+				logger.error(EELFLoggerDelegate.errorLogger, "Unable to decrypt App name = " + externalApp,
+						EcompPortalUtils.getStackTrace(e));
+			}
+			
+			WebClient client = createClientForPath(appBaseUri, restPath);
+
+			// support basic authentication for some partners
+			String encoding = Base64.getEncoder().encodeToString((username + ":" + decreptedAppPwd).getBytes());
+			String encodingStr = "Basic " + encoding;
+			client.header(BASIC_AUTHENTICATION_HEADER, encodingStr);
+
+			// But still keep code downward compatible for non compliant apps
+			client.header(APP_USERNAME_HEADER, username);
+			client.header(PASSWORD_HEADER, decreptedAppPwd);
+
+			client.header(SystemProperties.ECOMP_REQUEST_ID, MDC.get(MDC_KEY_REQUEST_ID));
+			client.header(SystemProperties.USERAGENT_NAME, EPCommonSystemProperties.ECOMP_PORTAL_BE);
+			
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					String.format("App %d found, baseUri=[%s], Headers: [%s=%s, %s=%s, %s=%s]", appSystemId, appBaseUri,
+							APP_USERNAME_HEADER, username, PASSWORD_HEADER, encriptedPwd, BASIC_AUTHENTICATION_HEADER, encodingStr));
+
+			return client;
+		}
+		return null;
+	}
+
+	@Override
+	public <T> T get(Class<T> clazz, long appId, String restPath) throws HTTPException {
+		T t = null;
+		Response response = getResponse(appId, restPath);
+
+		if (response != null) {
+			verifyResponse(response);
+			String str = response.readEntity(String.class);
+			EcompPortalUtils.logAndSerializeObject(logger, restPath, "GET result =", str);
+			try {
+				t = gson.fromJson(str, clazz);
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+			}
+		}
+
+		return t;
+	}
+	
+	@Override
+	public String getIncomingJsonString(long appId, String restPath) throws HTTPException {
+		Response response = getResponse(appId, restPath);
+
+		if (response != null) {
+			verifyResponse(response);
+			String incomingJson = response.readEntity(String.class);
+			return incomingJson;
+		}
+		
+		return "";
+	}
+
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.openecomp.portalapp.portal.service.ApplicationsRestClientService#get(
+	 * java.lang.Class, long, java.lang.String, boolean)
+	 */
+	@Override
+	public <T> T get(Class<T> clazz, long appId, String restPath, boolean useJacksonMapper) throws HTTPException {
+
+		if (!useJacksonMapper)
+			return get(clazz, appId, restPath);
+
+		T t = null;
+		Response response = getResponse(appId, restPath);
+
+		if (response != null) {
+			verifyResponse(response);
+			String str = response.readEntity(String.class);
+			EcompPortalUtils.logAndSerializeObject(logger, restPath, "GET result =", str);
+
+			try {
+				t = mapper.readValue(str, clazz);
+			} catch (Exception e) {
+				e.printStackTrace();
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+			}
+		}
+
+		return t;
+	}
+
+	protected Response getResponse(long appId, String restPath) {
+		WebClient webClient = null;
+		Response response = null;
+
+		webClient = createClientForApp(appId, restPath);
+		EcompPortalUtils.logAndSerializeObject(logger, restPath, "GET request =", "no-payload");
+
+		try {
+			if (webClient != null) {
+				response = webClient.get();
+			} else {
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Unable to create the Webclient to make the '" + restPath + "' API call.");
+			}
+		} catch (Exception e) {
+			MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE,
+					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiGeneralError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while making the GET REST API call", e);
+		}
+		return response;
+	}
+	
+	
+	@Override
+	public <T> T post(Class<T> clazz, long appId, Object payload, String restPath, SystemType type) throws HTTPException {
+		WebClient client = null;
+		Response response = null;
+		T t = null;
+
+		client = createClientFor(appId, restPath, type);
+		EcompPortalUtils.logAndSerializeObject(logger, restPath, "POST request =", payload);
+
+		try {
+			if (client != null) {
+				response = client.post(payload);
+			} else {
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Unable to create the Webclient to make the '" + restPath + "' API call.");
+			}
+		} catch (Exception e) {
+			MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE,
+					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiGeneralError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while making the POST REST API call", e);
+		}
+
+		if (response != null) {
+			verifyResponse(response);
+
+			// String contentType = response.getHeaderString("Content-Type");
+			if (clazz != null) {
+				String str = response.readEntity(String.class);
+				EcompPortalUtils.logAndSerializeObject(logger, restPath, "POST result =", str);
+				try {
+					t = gson.fromJson(str, clazz);
+				} catch (Exception e) {
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+				}
+			}
+		}
+		return t;
+	}
+
+	@Override
+	public <T> T post(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException {
+		return post( clazz, appId, payload, restPath, SystemType.APPLICATION);
+	}
+
+	//@Override
+	public <T> T postForClass(Class<T> clazz, long appId, Object payload, String restPath, Class<T> forClass) throws HTTPException {
+		WebClient client = null;
+		Response response = null;
+		T t = null;
+
+		client = createClientForApp(appId, restPath);
+		EcompPortalUtils.logAndSerializeObject(logger, restPath, "POST request =", payload);
+
+		try {
+			if (client != null) {
+				response = client.post(payload);
+			} else {
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Unable to create the Webclient to make the '" + restPath + "' API call.");
+			}
+		} catch (Exception e) {
+			MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE,
+					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiGeneralError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while making the POST REST API call", e);
+		}
+
+		if (response != null) {
+			verifyResponse(response);
+
+			// String contentType = response.getHeaderString("Content-Type");
+			if (clazz != null) {
+				String str = response.readEntity(String.class);
+				EcompPortalUtils.logAndSerializeObject(logger, restPath, "POST result =", str);
+				try {
+					t = gson.fromJson(str, clazz);
+				} catch (Exception e) {
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+				}
+			}
+		}
+		return t;
+	}
+
+	
+	@Override
+	public <T> T put(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException {
+		WebClient client = null;
+		Response response = null;
+		T t = null;
+
+		client = createClientForApp(appId, restPath);
+		EcompPortalUtils.logAndSerializeObject(logger, restPath, "PUT request =", payload);
+
+		try {
+			if (client != null) {
+				response = client.put(payload);
+			} else {
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Unable to create the Webclient to make the '" + restPath + "' API call.");
+			}
+		} catch (Exception e) {
+			MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE,
+					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiGeneralError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while making the PUT REST API call", e);
+		}
+
+		if (response != null) {
+			verifyResponse(response);
+			String str = response.readEntity(String.class);
+			EcompPortalUtils.logAndSerializeObject(logger, restPath, "PUT result =", str);
+			try {
+				t = gson.fromJson(str, clazz);
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+			}
+		}
+		return t;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppsCacheService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppsCacheService.java
new file mode 100644
index 00000000..aefbbbd5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppsCacheService.java
@@ -0,0 +1,42 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+
+package org.openecomp.portalapp.portal.service;
+
+import org.openecomp.portalapp.portal.domain.EPApp;
+
+public interface AppsCacheService {
+	
+	/**
+	 * returns an app by id from the cache
+	 * @param appId
+	 * @return corresponding App
+	 */
+	EPApp getApp(Long appId);
+	
+	/**
+	 * returns the corresponding application endpoint
+	 * @param appId
+	 * @return if appId exists in cache, then return corresponding application endpoint, null otherwise.
+	 */
+	String getAppEndpoint(Long appId);
+
+	EPApp getAppForAnalytics(String appKey);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppsCacheServiceImple.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppsCacheServiceImple.java
new file mode 100644
index 00000000..80aa00d4
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/AppsCacheServiceImple.java
@@ -0,0 +1,136 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("appsCacheService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class AppsCacheServiceImple implements AppsCacheService {
+	@Autowired
+	EPAppService appsService;
+	
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppsCacheServiceImple.class);
+	
+	final class CacheConfiguration {
+		
+		private long updateTime = 0;
+		private int updateInterval = 10;
+		
+		public CacheConfiguration (long _updateTime, int _updateInterval) {
+			updateTime = _updateTime;
+			updateInterval = _updateInterval;
+		}
+	}
+	
+	CacheConfiguration appConf = null;
+	CacheConfiguration analyticsAppConf = null;
+	
+	
+	private static volatile Map<Long, EPApp> appsMap;
+	private static volatile Map<String, EPApp> anlyticsAppsMap;
+	
+	@PostConstruct
+	public void init() {
+		appConf = new CacheConfiguration(0, 10);
+		analyticsAppConf = new CacheConfiguration(0, 3600);
+		
+		this.refreshAppsMap(appConf);
+	}
+
+	private Map<Long, EPApp> refreshAppsMap(CacheConfiguration conf) {
+		long now = System.currentTimeMillis();
+		
+		if(noNeedToUpdate(now, conf))
+			return null;
+		
+		synchronized (this) {
+			if(noNeedToUpdate(now, conf))
+				return null;
+			List<EPApp> allApps = appsService.getAppsFullList();
+			Map<Long, EPApp> newAppsMap = new HashMap<Long, EPApp>();
+			for (EPApp app : allApps) {
+				newAppsMap.put(app.getId(), app);
+			}
+			
+			Map<String, EPApp> newAnalyticsAppsMap = new HashMap<String, EPApp>();
+			for (EPApp app : allApps) {
+				newAnalyticsAppsMap.put(app.getUebKey(), app);
+			}
+			// Switch cache with the new one.
+			appsMap = newAppsMap;
+			anlyticsAppsMap = newAnalyticsAppsMap;
+			conf.updateTime = now;
+		}
+		
+		return appsMap;
+	}
+
+	private boolean noNeedToUpdate(long now, CacheConfiguration conf) {
+		long secondsPassed = (now - conf.updateTime)/1000;
+		if(secondsPassed < conf.updateInterval){
+			logger.debug(EELFLoggerDelegate.debugLogger, "no need to refresh yet, seconds since last refresh: " + secondsPassed + ", refresh interval (sec) = " + conf.updateInterval);
+			return true; // no need to update cache
+		}
+		return false; // its time to update
+	}
+
+	@Override
+	public String getAppEndpoint(Long appId) {
+		refreshAppsMap(appConf);
+		EPApp app = appsMap.get(appId);
+		if(app != null)
+			return app.getAppRestEndpoint();
+		return null;
+	}
+	
+	@Override
+	public EPApp getApp(Long appId) {
+		refreshAppsMap(appConf);
+		EPApp app = appsMap.get(appId);
+		if(app != null)
+			return app;
+		return null;		
+	}
+	
+	@Override
+	public EPApp getAppForAnalytics(String appKey) {
+		refreshAppsMap(analyticsAppConf);
+		EPApp app = anlyticsAppsMap.get(appKey);
+		if(app != null)
+			return app;
+		return null;		
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthAccountService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthAccountService.java
new file mode 100644
index 00000000..011a6485
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthAccountService.java
@@ -0,0 +1,47 @@
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+import org.openecomp.portalapp.portal.domain.EPEndpoint;
+
+public interface BasicAuthAccountService {
+	
+	/**
+	 * Saves Basic Authentication account for external systems 
+	 * @param BasicAuthCredentials
+	 * @return Id of the newly created account
+	 */
+	Long saveBasicAuthAccount(BasicAuthCredentials newCredential) throws Exception;
+	
+	/**
+	 * Saves Endpoint associated with a Basic Auth account 
+	 * @param EPEndpoint
+	 * @return Id of the newly created endpoint
+	 */
+	Long saveEndpoints(EPEndpoint endpoint) throws Exception;
+	
+	/**
+	 * Saves Endpoint associated with a Basic Auth account 
+	 * @param accountId, endpointId
+	 */
+	void saveEndpointAccount(Long accountId, Long endpointId) throws Exception;
+	
+	/**
+	 * Returns list of all  BasicAuthCredentials in the sytem
+	 * @return List<BasicAuthCredentials>
+	 */
+	List<BasicAuthCredentials> getAccountData() throws Exception;
+	
+	/**
+	 * Deletes BasicAuthenticationAccount
+	 * @param accountId
+	 */
+	void deleteEndpointAccout(Long accountId) throws Exception;
+	
+	/**
+	 * Updates BasicAuthenticationAccount
+	 * @param accountId, BasicAuthCredentials
+	 */
+	void updateBasicAuthAccount(Long accountId, BasicAuthCredentials newCredential) throws Exception;
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthAccountServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthAccountServiceImpl.java
new file mode 100644
index 00000000..fd0fb597
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthAccountServiceImpl.java
@@ -0,0 +1,205 @@
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.Session;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+import org.openecomp.portalapp.portal.domain.EPEndpoint;
+import org.openecomp.portalapp.portal.domain.EPEndpointAccount;
+import org.openecomp.portalapp.portal.domain.MicroserviceData;
+import org.openecomp.portalapp.portal.domain.MicroserviceParameter;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+@Service("basicAuthAccountService")
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class BasicAuthAccountServiceImpl implements BasicAuthAccountService{
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MicroserviceServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	@Override
+	public Long saveBasicAuthAccount(BasicAuthCredentials newCredential) throws Exception {
+		if (newCredential.getPassword() != null)
+			newCredential.setPassword(encryptedPassword(newCredential.getPassword()));
+		try{
+			getDataAccessService().saveDomainObject(newCredential, null);
+		}catch(Exception e){
+			logger.error(EELFLoggerDelegate.errorLogger, "saveBasicAuthAccount() failed", e);
+			throw e;
+		}
+		return newCredential.getId();
+	}
+	
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public Long saveEndpoints(EPEndpoint endpoint) throws Exception {
+		
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion NameCrit = Restrictions.eq("name", endpoint.getName());
+		restrictionsList.add(NameCrit);
+
+		List<EPEndpoint> tempList = (List<EPEndpoint>) dataAccessService.getList(EPEndpoint.class, null,
+				restrictionsList, null);
+		if (tempList.size() != 0) {
+			return tempList.get(0).getId();
+		} else {
+			getDataAccessService().saveDomainObject(endpoint, null);
+			return endpoint.getId();
+		}
+		
+	}
+	
+	@Override
+	public void saveEndpointAccount(Long accountId, Long endpointId) throws Exception {
+		EPEndpointAccount record = new EPEndpointAccount();
+		record.setAccount_id(accountId);
+		record.setEp_id(endpointId);
+		try {
+			getDataAccessService().saveDomainObject(record, null);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveEndpointAccount() failed", e);
+			throw e;
+		}
+
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public void updateBasicAuthAccount(Long accountId, BasicAuthCredentials newCredential) throws Exception {
+		try {
+			newCredential.setId(accountId);
+			if (newCredential.getPassword() != null)
+				newCredential.setPassword(encryptedPassword(newCredential.getPassword()));
+			getDataAccessService().saveDomainObject(newCredential, null);
+			
+			List<EPEndpoint> endpoints = newCredential.getEndpoints();
+			List<EPEndpoint> orig_points = getEPEndpoints(accountId);
+			
+			for(EPEndpoint temp_ep: orig_points){
+				boolean flag = false;
+				for(EPEndpoint temp_ep2: endpoints){
+					if(temp_ep2.getId() == temp_ep.getId())
+						flag = true;
+				}
+				if(!flag){
+					Map<String, String> params = new HashMap<String, String>();
+					params.put("accountId", Long.toString(accountId));
+					params.put("epId", Long.toString(temp_ep.getId()));
+					dataAccessService.executeNamedQuery("deleteAccountEndpointRecord", params, null);
+				}
+			}
+			
+			
+			for(int i = 0; i < endpoints.size(); i++){
+				
+				List<Criterion> restrictionsList = new ArrayList<Criterion>();
+				Criterion IdCrit = Restrictions.eq("id", endpoints.get(i).getId());
+				restrictionsList.add(IdCrit);
+				Criterion NameCrit = Restrictions.eq("name", endpoints.get(i).getName());
+				restrictionsList.add(NameCrit);
+				List<EPEndpoint> tempList = (List<EPEndpoint>) dataAccessService
+						.getList(EPEndpoint.class, null, restrictionsList, null);
+				if(tempList.size() == 0){
+					if(endpoints.get(i).getId() != null){
+						//delete the record endpoints.get(i).getId(), accountId						
+						Map<String, String> params = new HashMap<String, String>();
+						params.put("accountId", Long.toString(accountId));
+						params.put("epId", Long.toString(endpoints.get(i).getId()));
+						dataAccessService.executeNamedQuery("deleteAccountEndpointRecord", params, null);
+						endpoints.get(i).setId(null);
+					}
+					//create a new endpoint
+					Long ep_id = saveEndpoints(endpoints.get(i));
+					saveEndpointAccount(accountId, ep_id);						 
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "updateBasicAuthAccount() failed", e);
+			throw e;
+		}
+	}
+
+	@Override
+	public List<BasicAuthCredentials> getAccountData() throws Exception {
+		List<BasicAuthCredentials> list = (List<BasicAuthCredentials>) dataAccessService.getList(BasicAuthCredentials.class, null);
+		for (int i = 0; i < list.size(); i++) {
+			if (list.get(i).getPassword() != null)
+				list.get(i).setPassword(decryptedPassword(list.get(i).getPassword()));
+			list.get(i).setEndpoints(getEPEndpoints(list.get(i).getId()));
+		}
+		return list;
+	}
+	
+	@SuppressWarnings("unchecked")
+	private List<EPEndpoint> getEPEndpoints(long accountId) {
+		List<EPEndpoint> result = new ArrayList<>();
+		List<EPEndpointAccount> list = (List<EPEndpointAccount>) dataAccessService
+				.getList(EPEndpointAccount.class, " where account_id = '" + accountId + "'", null, null);
+		for(int i = 0; i < list.size(); i++){
+			result.add((EPEndpoint) dataAccessService.getDomainObject(EPEndpoint.class, list.get(i).getEp_id(), null));
+		}
+		return result;
+	}
+	
+	@Override
+	public void deleteEndpointAccout(Long accountId) throws Exception {
+		try{
+			Map<String, String> params = new HashMap<String, String>();
+			params.put("accountId", Long.toString(accountId));
+			
+			dataAccessService.executeNamedQuery("deleteAccountEndpoint", params, null);
+			dataAccessService.executeNamedQuery("deleteBasicAuthAccount", params, null);
+			
+		}catch(Exception e){
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteEndpointAccout() failed", e);
+			throw e;
+		}
+	}
+	
+	private String decryptedPassword(String encryptedPwd) throws Exception {
+		String result = "";
+		if (encryptedPwd != null & encryptedPwd.length() > 0) {
+			try {
+				result = CipherUtil.decrypt(encryptedPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword() failed", e);
+				throw e;
+			}
+		}
+		return result;
+	}
+
+	private String encryptedPassword(String decryptedPwd) throws Exception {
+		String result = "";
+		if (decryptedPwd != null & decryptedPwd.length() > 0) {
+			try {
+				result = CipherUtil.encrypt(decryptedPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "encryptedPassword() failed", e);
+				throw e;
+			}
+		}
+		return result;
+	}
+	
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthenticationCredentialService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthenticationCredentialService.java
new file mode 100644
index 00000000..459a6504
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthenticationCredentialService.java
@@ -0,0 +1,35 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+
+public interface BasicAuthenticationCredentialService {
+	/**
+	 * Gets the basic authentication credential for the specified appName from
+	 * table ep_basic_auth_account
+	 * 
+	 * @param appName
+	 *            External application name
+	 * @return BasicAuthCredentials for the specified app; null if the app is
+	 *         not known.
+	 */
+	public BasicAuthCredentials getBasicAuthCredentialByAppName(String appName);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthenticationCredentialServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthenticationCredentialServiceImpl.java
new file mode 100644
index 00000000..54a9d2af
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/BasicAuthenticationCredentialServiceImpl.java
@@ -0,0 +1,81 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+import org.openecomp.portalapp.portal.domain.EPEndpoint;
+import org.openecomp.portalapp.portal.domain.EPEndpointAccount;
+import org.openecomp.portalapp.portal.domain.SharedContext;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+@Service("basicAuthenticationCredentialService")
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class BasicAuthenticationCredentialServiceImpl implements BasicAuthenticationCredentialService {
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(BasicAuthenticationCredentialServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	@Override
+	public BasicAuthCredentials getBasicAuthCredentialByAppName(String appName) {
+	
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion contextIdCrit = Restrictions.eq("applicationName", appName);
+		restrictionsList.add(contextIdCrit);
+		@SuppressWarnings("unchecked")
+		List<BasicAuthCredentials> credList = (List<BasicAuthCredentials>) dataAccessService.getList(BasicAuthCredentials.class, null, restrictionsList, null);
+		if (credList == null || credList.size() == 0) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"getBasicAuthCredentialByAppName: no credential(s) for " + appName);
+			return null;
+		}
+		logger.debug(EELFLoggerDelegate.debugLogger,
+				"getBasicAuthCredentialByAppName: cred list size: " + credList.size());
+		BasicAuthCredentials cred = (BasicAuthCredentials) credList.get(0);
+		cred.setEndpoints(getEndpointsByAccountId(cred.getId()));
+		return cred;
+	}
+	
+	private List<EPEndpoint> getEndpointsByAccountId(long id){
+		
+		List<EPEndpoint> list = new ArrayList<>();
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion contextIdCrit = Restrictions.eq("account_id", id);
+		restrictionsList.add(contextIdCrit);
+		List<EPEndpointAccount> epList = (List<EPEndpointAccount>) dataAccessService.getList(EPEndpointAccount.class, null, restrictionsList, null);
+		for(EPEndpointAccount ep: epList){
+			list.add((EPEndpoint) dataAccessService.getDomainObject(EPEndpoint.class, ep.getEp_id(), null));
+		}
+		return list;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthService.java
new file mode 100644
index 00000000..6ceb2cac
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthService.java
@@ -0,0 +1,32 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.exceptions.NoHealthyServiceException;
+import com.ecwid.consul.ConsulException;
+import com.orbitz.consul.model.health.ServiceHealth;
+
+public interface ConsulHealthService {
+	public String getServiceLocation(String service)  throws NoHealthyServiceException;
+	public List<ServiceHealth> getAllHealthyNodes(String service)  throws ConsulException;
+	public List<ServiceHealth> getAllNodes(String service)  throws ConsulException;
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java
new file mode 100644
index 00000000..1d741dca
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ConsulHealthServiceImpl.java
@@ -0,0 +1,91 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import com.ecwid.consul.ConsulException;
+import com.orbitz.consul.Consul;
+import com.orbitz.consul.HealthClient;
+import com.orbitz.consul.model.health.ServiceHealth;
+
+@Component
+public class ConsulHealthServiceImpl implements ConsulHealthService {
+	
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ConsulHealthServiceImpl.class);
+
+	@Override
+	public String getServiceLocation(String service){
+
+		List<ServiceHealth> nodes = null;
+		
+		try{
+			Consul consul = Consul.builder().build();
+			HealthClient healthClient = consul.healthClient();
+			nodes = healthClient.getHealthyServiceInstances(service).getResponse();
+		}
+		catch(Exception e){
+			//using both loggers.
+			logger.debug(logger.debugLogger, " problem getting nodes for service - " + service + e.getMessage() + " - Defaulting to localhost", e);
+			logger.error(logger.errorLogger, " problem getting nodes for service - " + service + e.getMessage() + " - Defaulting to localhost", e);
+
+			return "localhost:" + SystemProperties.getProperty("microservices.widget.local.port");
+		}
+		
+		if(nodes == null || nodes.size() == 0){
+			logger.debug(logger.debugLogger, "No healthy node found in the consul cluster running service " + service + ". Defaulting to localhost");
+			return "localhost:" + SystemProperties.getProperty("microservices.widget.local.port");
+		}
+		else{
+			String locationFromConsul;
+			ServiceHealth node = nodes.get(0);
+			locationFromConsul = node.getNode().getNode()  + ":" + node.getService().getPort();
+			logger.debug(logger.debugLogger, "Found healthy service location using consul - returning location " + locationFromConsul);
+			
+			//if locationFromConsul is null for some reason (very unlikely at this point), default to localhost		
+			if(null == locationFromConsul || "".equals(locationFromConsul)){
+				logger.debug(logger.debugLogger, "Couldn't get location from consul for service " + service + ". Defaulting to localhost");
+				return "localhost:" + SystemProperties.getProperty("microservices.widget.local.port");
+			}
+			else{
+				logger.debug(logger.debugLogger, "Found service location from consul for service " + service + ". Location is " + locationFromConsul);
+				return locationFromConsul;
+			}			
+		}		
+	}
+
+	@Override
+	public List<ServiceHealth> getAllHealthyNodes(String service) throws ConsulException{
+		Consul consul = Consul.builder().build();
+		HealthClient healthClient = consul.healthClient();
+		return healthClient.getHealthyServiceInstances(service).getResponse();
+	}
+
+	@Override
+	public List<ServiceHealth> getAllNodes(String service){
+		Consul consul = Consul.builder().build();
+		HealthClient healthClient = consul.healthClient();
+		return healthClient.getAllServiceInstances(service).getResponse();
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/DashboardSearchService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/DashboardSearchService.java
new file mode 100644
index 00000000..177f0e6a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/DashboardSearchService.java
@@ -0,0 +1,37 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+import java.util.Map;
+
+import org.openecomp.portalapp.portal.transport.CommonWidget;
+import org.openecomp.portalapp.portal.transport.CommonWidgetMeta;
+import org.openecomp.portalapp.portal.ecomp.model.SearchResultItem;
+
+public interface DashboardSearchService {
+	public Map<String, List<SearchResultItem>> searchResults(String userId, String searchString);
+	public List<String> getRelatedUsers(String userId);
+	
+	public CommonWidgetMeta getWidgetData(String resourceType);
+	public String saveWidgetDataBulk(CommonWidgetMeta commonWidgetMetaData);
+	public String saveWidgetData(CommonWidget commonWidgetData);
+	public String deleteWidgetData(CommonWidget eventWidget);	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/DashboardSearchServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/DashboardSearchServiceImpl.java
new file mode 100644
index 00000000..412d833d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/DashboardSearchServiceImpl.java
@@ -0,0 +1,100 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.transport.CommonWidget;
+import org.openecomp.portalapp.portal.transport.CommonWidgetMeta;
+import org.openecomp.portalapp.portal.ecomp.model.SearchResultItem;
+
+@Component
+public class DashboardSearchServiceImpl implements DashboardSearchService {
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	public Map<String, List<SearchResultItem>> searchResults(String userId, String searchString) {
+		Map<String, String> params = new HashMap<>();
+		params.put("userId", userId);
+		params.put("searchQuery", searchString);
+		// Named query is stored in a *.hbm.xml file, mapped to SearchResultItem
+		@SuppressWarnings("unchecked")
+		List<SearchResultItem> list = dataAccessService.executeNamedQuery("searchPortal", params, null);
+		Map<String, List<SearchResultItem>> finalJson = null;
+		if (list.size() > 0) {
+			finalJson = new HashMap<String, List<SearchResultItem>>();
+			for (SearchResultItem thisResult : list) {
+				List<SearchResultItem> thisList = finalJson.get(thisResult.getCategory().toLowerCase());
+				if (thisList == null)
+					thisList = new ArrayList<SearchResultItem>();
+				thisList.add(thisResult);
+				finalJson.put(thisResult.getCategory().toLowerCase(), thisList);
+			}
+		}
+		return finalJson;
+	}
+
+	@Override
+	public List<String> getRelatedUsers(String userId) {
+		Map<String, String> params = new HashMap<>();
+		params.put("userId", userId);
+		@SuppressWarnings("unchecked")
+		List<String> activeUsers = dataAccessService.executeNamedQuery("relatedUsers", params, null);
+		return activeUsers;
+	}
+
+	@Override
+	public CommonWidgetMeta getWidgetData(String resourceType) {
+		Map<String, String> params = new HashMap<>();
+		params.put("cat", resourceType);
+		@SuppressWarnings("unchecked")
+		List<CommonWidget> widgetItems = (List<CommonWidget>) dataAccessService.executeNamedQuery("getCommonWidgetItem", params, null);
+		return new CommonWidgetMeta(resourceType, widgetItems);
+	}
+
+	@Override
+	public String saveWidgetDataBulk(CommonWidgetMeta commonMetaWidgetData) {
+		for (CommonWidget widgetData : commonMetaWidgetData.getItems()) {
+			widgetData.setCategory(commonMetaWidgetData.getCategory());
+			dataAccessService.saveDomainObject(widgetData, null);
+		}
+		return "success";
+	}
+
+	@Override
+	public String saveWidgetData(CommonWidget commonWidgetData) {
+		dataAccessService.saveDomainObject(commonWidgetData, null);
+		return "success";
+	}
+
+	@Override
+	public String deleteWidgetData(CommonWidget eventWidget) {
+		dataAccessService.deleteDomainObject(eventWidget, null);
+		return "success";
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java
new file mode 100644
index 00000000..a5b15e24
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppCommonServiceImpl.java
@@ -0,0 +1,1368 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.openecomp.portalapp.portal.domain.AdminUserApp;
+import org.openecomp.portalapp.portal.domain.AdminUserApplications;
+import org.openecomp.portalapp.portal.domain.AppIdAndNameTransportModel;
+import org.openecomp.portalapp.portal.domain.AppsResponse;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserAppsManualSortPreference;
+import org.openecomp.portalapp.portal.domain.EPUserAppsSortPreference;
+import org.openecomp.portalapp.portal.domain.EPWidgetsManualSortPreference;
+import org.openecomp.portalapp.portal.domain.EcompApp;
+import org.openecomp.portalapp.portal.domain.UserRole;
+import org.openecomp.portalapp.portal.domain.UserRoles;
+import org.openecomp.portalapp.portal.ecomp.model.AppCatalogItem;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.transport.EPAppsManualPreference;
+import org.openecomp.portalapp.portal.transport.EPAppsSortPreference;
+import org.openecomp.portalapp.portal.transport.EPDeleteAppsManualSortPref;
+import org.openecomp.portalapp.portal.transport.EPWidgetsSortPreference;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.LocalRole;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+import org.openecomp.portalapp.portal.ueb.EPUebHelper;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.ueb.Helper;
+import org.openecomp.portalsdk.core.onboarding.ueb.TopicManager;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.att.nsa.apiClient.http.HttpException;
+import com.att.nsa.cambria.client.CambriaClient.CambriaApiException;
+import com.att.nsa.cambria.client.CambriaClientBuilders;
+import com.att.nsa.cambria.client.CambriaIdentityManager;
+import com.google.common.primitives.Ints;
+
+public class EPAppCommonServiceImpl implements EPAppService {
+
+	protected String ECOMP_APP_ID = "1";
+	protected String SUPER_ADMIN_ROLE_ID = "1";
+	protected String ACCOUNT_ADMIN_ROLE_ID = "999";
+	protected String RESTRICTED_APP_ROLE_ID = "900";
+
+	private static final String urlField = "url";
+	private static final String nameField = "name";
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPAppCommonServiceImpl.class);
+
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	private SessionFactory sessionFactory;
+	@Autowired
+	private DataAccessService dataAccessService;
+	@Autowired
+	EPUebHelper epUebHelper;
+
+	@PostConstruct
+	private void init() {
+		SUPER_ADMIN_ROLE_ID = SystemProperties.getProperty(EPCommonSystemProperties.SYS_ADMIN_ROLE_ID);
+		ACCOUNT_ADMIN_ROLE_ID = SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID);
+		ECOMP_APP_ID = SystemProperties.getProperty(EPCommonSystemProperties.ECOMP_APP_ID);
+		RESTRICTED_APP_ROLE_ID = SystemProperties.getProperty(EPCommonSystemProperties.RESTRICTED_APP_ROLE_ID);
+	}
+
+	@Override
+	public List<EPApp> getUserAsAdminApps(EPUser user) {
+		if (adminRolesService.isAccountAdmin(user)) {
+			String sql = "SELECT * FROM FN_APP join FN_USER_ROLE ON FN_USER_ROLE.APP_ID=FN_APP.APP_ID where "
+					+ "FN_USER_ROLE.USER_ID=" + user.getId() + " AND FN_USER_ROLE.ROLE_ID=" + ACCOUNT_ADMIN_ROLE_ID
+					+ " AND FN_APP.ENABLED = 'Y'";
+			logQuery(sql);
+			try {
+				@SuppressWarnings("unchecked")
+				List<EPApp> adminApps = dataAccessService.executeSQLQuery(sql, EPApp.class, null);
+				return adminApps;
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+				return null;
+			}
+		} else {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"getUserAsAdminApps: only Account Admin may invoke this function!");
+			return new ArrayList<EPApp>();
+		}
+	}
+
+	@Override
+	public List<EPApp> getUserByOrgUserIdAsAdminApps(String orgUserId) {
+		String format = "SELECT * FROM FN_APP app INNER JOIN FN_USER_ROLE userrole ON userrole.APP_ID=app.APP_ID "
+				+ "INNER JOIN FN_USER user on user.USER_ID = userrole.USER_ID "
+				+ "WHERE user.org_user_id = '%s' AND userrole.ROLE_ID=" + ACCOUNT_ADMIN_ROLE_ID
+				+ " AND FN_APP.ENABLED = 'Y'";
+
+		String sql = String.format(format, orgUserId);
+		logQuery(sql);
+
+		try {
+			@SuppressWarnings("unchecked")
+			List<EPApp> adminApps = dataAccessService.executeSQLQuery(sql, EPApp.class, null);
+			return adminApps;
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			return null;
+		}
+	}
+
+	@Override
+	public List<EPApp> getAppsFullList() {
+		@SuppressWarnings("unchecked")
+		List<EPApp> apps = dataAccessService.getList(EPApp.class, null);
+		return apps;
+	}
+
+	@Override
+	public List<EcompApp> getEcompAppAppsFullList() {
+		return transformAppsToEcompApps(getAppsFullList());
+	}
+
+	@Override
+	public List<EcompApp> transformAppsToEcompApps(List<EPApp> appsList) {
+		List<EcompApp> ecompAppList = new ArrayList<EcompApp>();
+		for (EPApp app : appsList) {
+			EcompApp ecompApp = new EcompApp();
+			ecompApp.setId(app.getId());
+			ecompApp.setName(app.getName());
+			ecompApp.setImageUrl(app.getImageUrl());
+			ecompApp.setDescription(app.getDescription());
+			ecompApp.setNotes(app.getNotes());
+			ecompApp.setUrl(app.getUrl());
+			ecompApp.setAlternateUrl(app.getAlternateUrl());
+			ecompApp.setUebTopicName(app.getUebTopicName());
+			ecompApp.setUebKey(app.getUebKey());
+			ecompApp.setUebSecret(app.getUebSecret());
+			ecompApp.setEnabled(app.getEnabled());
+			ecompApp.setRestrictedApp(app.isRestrictedApp());
+			ecompAppList.add(ecompApp);
+		}
+		return ecompAppList;
+	}
+
+	@Override
+	public EPApp getApp(Long appId) {
+		try {
+			@SuppressWarnings("unchecked")
+			List<EPApp> apps = dataAccessService.getList(EPApp.class, " where id = " + appId, null, null);
+			return (apps.size() > 0) ? apps.get(0) : null;
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			return null;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<AppIdAndNameTransportModel> getAdminApps(EPUser user) {
+		if (adminRolesService.isAccountAdmin(user)) {
+			String format = "SELECT app.APP_ID, app.APP_NAME, app.APP_TYPE FROM FN_APP app inner join FN_USER_ROLE userrole ON userrole.APP_ID=app.APP_ID "
+					+ "where userrole.USER_ID = %d AND userrole.ROLE_ID=" + ACCOUNT_ADMIN_ROLE_ID
+					+ " AND (app.ENABLED = 'Y' OR app.APP_ID=1)";
+			String sql = String.format(format, user.getId());
+			// sql += " AND app.APP_REST_ENDPOINT IS NOT NULL AND
+			// app.APP_REST_ENDPOINT <> ''";
+			logQuery(sql);
+			try {
+				return dataAccessService.executeSQLQuery(sql, AppIdAndNameTransportModel.class, null);
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Exception occurred while fetching the adminApps for user " + user.getLoginId(), e);
+			}
+		}
+		return new ArrayList<AppIdAndNameTransportModel>();
+	}
+
+	@Override
+	public EPApp getAppDetail(String appName) {
+		final Map<String, String> params = new HashMap<String, String>();
+		try {
+			params.put("appName", appName);
+			@SuppressWarnings("unchecked")
+			List<EPApp> apps = (List<EPApp>) dataAccessService.executeNamedQuery("getAppDetails", params, null);
+			return (apps.size() > 0) ? apps.get(0) : null;
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			return null;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<AppIdAndNameTransportModel> getAppsForSuperAdminAndAccountAdmin(EPUser user) {
+		if (adminRolesService.isSuperAdmin(user) || adminRolesService.isAccountAdmin(user)) {
+			String format = "";
+			String sql = "";
+			if (adminRolesService.isSuperAdmin(user)) {
+				format = "SELECT app.APP_ID, app.APP_NAME, app.APP_TYPE FROM FN_APP app "
+						+ "where app.ENABLED = 'Y' AND app.app_type = 1";
+			} else {
+				format = "SELECT app.APP_ID, app.APP_NAME, APP_TYPE FROM FN_APP app inner join FN_USER_ROLE userrole ON userrole.APP_ID=app.APP_ID "
+						+ "where userrole.USER_ID = %d AND userrole.ROLE_ID=" + ACCOUNT_ADMIN_ROLE_ID
+						+ " AND app.ENABLED = 'Y' AND app.app_type = 1";
+			}
+			sql = String.format(format, user.getId());
+			// sql += " AND app.APP_REST_ENDPOINT IS NOT NULL AND
+			// app.APP_REST_ENDPOINT <> ''";
+			logQuery(sql);
+			try {
+				return dataAccessService.executeSQLQuery(sql, AppIdAndNameTransportModel.class, null);
+			} catch (Exception e) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"Exception occurred while fetching the adminApps for user " + user.getLoginId(), e);
+			}
+		}
+		return new ArrayList<AppIdAndNameTransportModel>();
+	}
+
+	protected void logQuery(String sql) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "logQuery: " + sql);
+	}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+	@Override
+	public List<AdminUserApplications> getAppsAdmins() {
+		String sql = "SELECT apps.APP_NAME, apps.APP_ID, user.USER_ID, user.FIRST_NAME, user.LAST_NAME, user.org_user_id FROM fn_user_role userrole "
+				+ "INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID "
+				+ "INNER JOIN fn_app apps ON apps.APP_ID = userrole.APP_ID " + "WHERE userrole.ROLE_ID = "
+				+ ACCOUNT_ADMIN_ROLE_ID + " AND (apps.ENABLED = 'Y' OR apps.APP_ID=1)";
+		logQuery(sql);
+		try {
+			@SuppressWarnings("unchecked")
+			List<AdminUserApp> adminApps = dataAccessService.executeSQLQuery(sql, AdminUserApp.class, null);
+			// DataAccessService does not use generic types.
+			return aggregateRowsResultsByUserId(adminApps);
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			return null;
+		}
+	}
+
+	private List<AdminUserApplications> aggregateRowsResultsByUserId(List<AdminUserApp> adminApps) {
+		HashMap<Long, AdminUserApplications> adminUserApplications = new HashMap<Long, AdminUserApplications>();
+		for (AdminUserApp app : adminApps) {
+			Long userId = app.getUser_Id();
+			if (adminUserApplications.get(userId) == null)
+				adminUserApplications.put(userId, new AdminUserApplications(app));
+			else
+				adminUserApplications.get(userId).addApp(app.getAppId(), app.getAppName());
+		}
+		return new ArrayList<AdminUserApplications>(adminUserApplications.values());
+	}
+
+	@Override
+	public List<AppsResponse> getAllApps(Boolean all) {
+		// If all is true, return both active and inactive apps. Otherwise, just
+		// active apps.
+		@SuppressWarnings("unchecked")
+		// Sort the list by application name so the drop-down looks pretty.
+		List<EPApp> apps = all
+				? (List<EPApp>) dataAccessService.getList(EPApp.class, " where id != " + ECOMP_APP_ID, "name", null)
+				: (List<EPApp>) dataAccessService.getList(EPApp.class,
+						" where ( enabled = 'Y' or id = " + ECOMP_APP_ID + ")", "name", null);
+
+		List<AppsResponse> appsModified = new ArrayList<AppsResponse>();
+		for (EPApp app : apps) {
+			appsModified.add(new AppsResponse(app.getId(), app.getName(), app.isRestrictedApp(), app.getEnabled()));
+		}
+		return appsModified;
+	}
+
+	@Override
+	public UserRoles getUserProfile(String loginId) {
+		String format = "SELECT DISTINCT user.USER_ID, role.ROLE_ID, user.org_user_id, user.FIRST_NAME, user.LAST_NAME, role.ROLE_NAME  FROM fn_user_role userrole "
+				+ "INNER JOIN fn_user user ON user.USER_ID = userrole.USER_ID "
+				+ "INNER JOIN fn_role role ON role.ROLE_ID = userrole.ROLE_ID "
+				+ "WHERE user.org_user_id = \"%s\" and (userrole.app_id = 1 or role.role_id = " + ACCOUNT_ADMIN_ROLE_ID
+				+ ") ";
+		String sql = String.format(format, loginId);
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<UserRole> userRoleList = dataAccessService.executeSQLQuery(sql, UserRole.class, null);
+		ArrayList<UserRoles> usersRolesList = aggregateUserProfileRowsResultsByRole(userRoleList);
+		if (usersRolesList == null || usersRolesList.size() < 1)
+			return null;
+
+		return usersRolesList.get(0);
+	}
+
+	@Override
+	public UserRoles getUserProfileNormalized(EPUser user) {
+		// Check database.
+		UserRoles userAndRoles = getUserProfile(user.getLoginId());
+		// If no roles are defined, treat this user as a guest.
+		if (user.isGuest() || userAndRoles == null) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "getUserProfile: treating user {} as guest",
+					user.getLoginId());
+			UserRole userRole = new UserRole();
+			userRole.setUser_Id(user.getId());
+			userRole.setOrgUserId(user.getLoginId());
+			userRole.setFirstName(user.getFirstName());
+			userRole.setLastName(user.getLastName());
+			userRole.setRoleId(-1L);
+			userRole.setRoleName("Guest");
+			userRole.setUser_Id(-1L);
+			userAndRoles = new UserRoles(userRole);
+		}
+
+		return userAndRoles;
+	}
+
+	protected ArrayList<UserRoles> aggregateUserProfileRowsResultsByRole(List<UserRole> userRoleList) {
+		HashMap<String, UserRoles> userRoles = new HashMap<String, UserRoles>();
+		for (UserRole user : userRoleList) {
+			String orgUserId = user.getOrgUserId();
+			if (userRoles.get(orgUserId) == null)
+				userRoles.put(orgUserId, new UserRoles(user));
+			else
+				userRoles.get(orgUserId).addRole(user.getRoleName());
+		}
+		return new ArrayList<UserRoles>(userRoles.values());
+	}
+
+	private boolean isRestrictedApp(Long appId) {
+		EPApp app = getApp(appId);
+		return app.isRestrictedApp();
+	}
+
+	// For the functional menu edit
+	@Override
+	public List<LocalRole> getAppRoles(Long appId) {
+		String sql = "";
+		if (isRestrictedApp(appId)) {
+			sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where ROLE_ID = '" + RESTRICTED_APP_ROLE_ID + "'";
+		} else {
+			sql = "SELECT ROLE_ID, ROLE_NAME from FN_ROLE where APP_ID = '" + appId + "'";
+		}
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<LocalRole> appRoles = dataAccessService.executeSQLQuery(sql, LocalRole.class, null);
+		return appRoles;
+	}
+
+	protected String userAppsQuery(EPUser user) {
+		StringBuilder query = new StringBuilder();
+		if (adminRolesService.isSuperAdmin(user)) {
+			query.append("SELECT * FROM FN_APP where FN_APP.ENABLED = 'Y' ORDER BY APP_NAME");
+		} else {
+			query.append("SELECT * FROM FN_APP join FN_USER_ROLE ON FN_USER_ROLE.APP_ID = FN_APP.APP_ID where ");
+			query.append(
+					"FN_USER_ROLE.USER_ID = " + user.getId() + " AND FN_USER_ROLE.ROLE_ID != " + SUPER_ADMIN_ROLE_ID);
+			query.append(" AND FN_APP.ENABLED = 'Y'");
+		}
+		return query.toString();
+	}
+
+	protected FieldsValidator onboardingAppFieldsChecker(OnboardingApp onboardingApp) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		if (onboardingApp.name == null || onboardingApp.name.length() == 0 || onboardingApp.url == null
+				|| onboardingApp.url.length() == 0 || onboardingApp.restrictedApp == null
+				|| onboardingApp.isOpen == null || onboardingApp.isEnabled == null
+				|| (onboardingApp.id != null && onboardingApp.id.equals(ECOMP_APP_ID))
+				// For a normal app (appType==1), these fields must be filled
+				// in.
+				// For a restricted app (appType==2), they will be empty.
+				|| ((!onboardingApp.restrictedApp)
+						&& (onboardingApp.username == null || onboardingApp.username.length() == 0
+								|| onboardingApp.appPassword == null || onboardingApp.appPassword.length() == 0))) {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+		}
+		return fieldsValidator;
+	}
+
+	@Override
+	public List<EPApp> getUserApps(EPUser user) {
+		List<EPApp> openApps = getOpenApps();
+
+		if (user.isGuest()) {
+			return openApps;
+		} else {
+			String sql = userAppsQuery(user);
+			logQuery(sql);
+
+			// TreeSet<EPApp> distinctApps = new TreeSet<EPApp>();
+			List<EPApp> appsList = new ArrayList<>();
+			@SuppressWarnings("unchecked")
+			List<EPApp> adminApps = dataAccessService.executeSQLQuery(sql, EPApp.class, null);
+			HashSet<EPApp> appSet = new HashSet<>();
+			for (EPApp app : adminApps) {
+				appSet.add(app);
+				appsList.add(app);
+			}
+
+			for (EPApp app : openApps) {
+				if (!appSet.contains(app))
+					appsList.add(app);
+			}
+
+			return appsList;
+		}
+	}
+
+	@Override
+	public List<EPApp> getPersAdminApps(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		params.put("userId", user.getId());
+		// Named query is stored in EP.hbm.xml, mapped to EPApp
+		@SuppressWarnings("unchecked")
+		List<EPApp> list = dataAccessService.executeNamedQuery("getPersAdminApps", params, null);
+		return list;
+	}
+
+	@Override
+	public List<EPApp> getPersUserApps(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		params.put("userId", user.getId());
+		// Named query is stored in EP.hbm.xml, mapped to EPApp
+		@SuppressWarnings("unchecked")
+		List<EPApp> list = dataAccessService.executeNamedQuery("getPersUserApps", params, null);
+		return list;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.openecomp.portalapp.portal.service.EPAppService#getAppCatalog(com.att
+	 * .fusionapp.ecomp.portal.domain.EPUser)
+	 */
+	@Override
+	public List<AppCatalogItem> getUserAppCatalog(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		params.put("userId", user.getId());
+		// Named query is stored in EP.hbm.xml, mapped to AppCatalogItem
+		@SuppressWarnings("unchecked")
+		List<AppCatalogItem> list = dataAccessService.executeNamedQuery("getUserAppCatalog", params, null);
+		return list;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * org.openecomp.portalapp.portal.service.EPAppService#getAdminAppCatalog(
+	 * org.openecomp.portalapp.portal.domain.EPUser)
+	 */
+	@Override
+	public List<AppCatalogItem> getAdminAppCatalog(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		params.put("userId", user.getId());
+		// Named query is stored in EP.hbm.xml, mapped to AppCatalogItem
+		@SuppressWarnings("unchecked")
+		List<AppCatalogItem> list = dataAccessService.executeNamedQuery("getAdminAppCatalog", params, null);
+		return list;
+	}
+
+	private List<EPApp> getOpenApps() {
+		@SuppressWarnings("unchecked")
+		List<EPApp> openApps = dataAccessService.getList(EPApp.class, " where open='Y' and enabled='Y'", null, null);
+		return openApps;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EPApp> getAppsOrderByName(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		List<EPApp> sortedAppsByName = null;
+		try {
+			if (adminRolesService.isSuperAdmin(user)) {
+				params.put("userId", user.getId());
+				sortedAppsByName = dataAccessService.executeNamedQuery("getPersAdminAppsOrderByName", params, null);
+			} else {
+				params.put("userId", user.getId());
+				sortedAppsByName = dataAccessService.executeNamedQuery("getPersUserAppsOrderByName", params, null);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppsOrderByName failed", e);
+		}
+		return sortedAppsByName;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EPApp> getAppsOrderByLastUsed(EPUser user) {
+
+		final Map<String, Long> params = new HashMap<>();
+		List<EPApp> sortedAppsByLastUsed = new ArrayList<EPApp>();
+		List<EPApp> finalsortedAppsByLastUsed = new ArrayList<EPApp>();
+		try {
+			if (adminRolesService.isSuperAdmin(user)) {
+				params.put("userId", user.getId());
+				sortedAppsByLastUsed = dataAccessService.executeNamedQuery("getAdminAppsOrderByLastUsed", params, null);
+			} else {
+				params.put("userId", user.getId());
+				sortedAppsByLastUsed = dataAccessService.executeNamedQuery("getUserAppsOrderByLastUsed", params, null);
+			}
+			Set<String> epAppSet = new HashSet<String>();
+			for (EPApp eapp : sortedAppsByLastUsed)
+				if (!epAppSet.contains(eapp.getName())) {
+					finalsortedAppsByLastUsed.add(eapp);
+					epAppSet.add(eapp.getName());
+				}
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppsOrderByLastUsed failed", e);
+		}
+		return finalsortedAppsByLastUsed;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EPApp> getAppsOrderByMostUsed(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		List<EPApp> sortedAppsByMostUsed = new ArrayList<EPApp>();
+		List<EPApp> finalsortedAppsByMostUsed = new ArrayList<EPApp>();
+		try {
+			if (adminRolesService.isSuperAdmin(user)) {
+				params.put("userId", user.getId());
+				sortedAppsByMostUsed = dataAccessService.executeNamedQuery("getAdminAppsOrderByMostUsed", params, null);
+			} else {
+				params.put("userId", user.getId());
+				sortedAppsByMostUsed = dataAccessService.executeNamedQuery("getUserAppsOrderByMostUsed", params, null);
+			}
+			Set<String> epAppSet = new HashSet<String>();
+
+			for (EPApp eapp : sortedAppsByMostUsed) {
+				if (!epAppSet.contains(eapp.getName())) {
+					finalsortedAppsByMostUsed.add(eapp);
+					epAppSet.add(eapp.getName());
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppsOrderByMostUsed failed", e);
+		}
+
+		return finalsortedAppsByMostUsed;
+	}
+
+	/*
+	 * This Method retrieves the User Apps by Sort Manual Preference
+	 *
+	 * @param: user--contains LoggedIn User Data
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EPApp> getAppsOrderByManual(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		List<EPApp> sortedAppsByManual = new ArrayList<EPApp>();
+		List<EPApp> finalsortedAppsByManual = new ArrayList<EPApp>();
+		try {
+			if (adminRolesService.isSuperAdmin(user)) {
+				params.put("userId", user.getId());
+				sortedAppsByManual = dataAccessService.executeNamedQuery("getAdminAppsOrderByManual", params, null);
+			} else {
+				params.put("userId", user.getId());
+				sortedAppsByManual = dataAccessService.executeNamedQuery("getUserAppsOrderByManual", params, null);
+			}
+			Set<String> epAppSet = new HashSet<String>();
+
+			for (EPApp eapp : sortedAppsByManual) {
+				if (!epAppSet.contains(eapp.getName())) {
+					finalsortedAppsByManual.add(eapp);
+					epAppSet.add(eapp.getName());
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getAppsOrderByManual failed", e);
+		}
+		return finalsortedAppsByManual;
+	}
+
+	@Override
+	public List<OnboardingApp> getOnboardingApps() {
+		@SuppressWarnings("unchecked")
+		List<EPApp> apps = dataAccessService.getList(EPApp.class, " where id!=" + ECOMP_APP_ID, null, null);
+		List<OnboardingApp> onboardingAppsList = new ArrayList<OnboardingApp>();
+		for (EPApp app : apps) {
+			OnboardingApp onboardingApp = new OnboardingApp();
+			createOnboardingFromApp(app, onboardingApp);
+			onboardingAppsList.add(onboardingApp);
+		}
+		return onboardingAppsList;
+	}
+
+	@Override
+	public List<OnboardingApp> getEnabledNonOpenOnboardingApps() {
+		@SuppressWarnings("unchecked")
+		List<EPApp> apps = dataAccessService.getList(EPApp.class,
+				" where enabled = true and open = false and id!=" + ECOMP_APP_ID, null, null);
+		List<OnboardingApp> onboardingAppsList = new ArrayList<OnboardingApp>();
+		for (EPApp app : apps) {
+			OnboardingApp onboardingApp = new OnboardingApp();
+			createOnboardingFromApp(app, onboardingApp);
+			onboardingAppsList.add(onboardingApp);
+		}
+		return onboardingAppsList;
+	}
+
+	@SuppressWarnings("unchecked")
+	private void validateOnboardingApp(OnboardingApp onboardingApp, FieldsValidator fieldsValidator) {
+		boolean duplicatedUrl = false;
+		boolean duplicatedName = false;
+		List<EPApp> apps;
+		if (onboardingApp.id == null) {
+			apps = dataAccessService.getList(EPApp.class,
+					" where url = '" + onboardingApp.url + "' or name = '" + onboardingApp.name + "'", null, null);
+		} else {
+			apps = dataAccessService.getList(EPApp.class, " where id = " + onboardingApp.id + " or url = '"
+					+ onboardingApp.url + "' or name = '" + onboardingApp.name + "'", null, null);
+		}
+		for (EPApp app : apps) {
+			if (onboardingApp.id != null && onboardingApp.id.equals(app.getId())) {
+				continue;
+			}
+			if (!duplicatedUrl && app.getUrl().equalsIgnoreCase(onboardingApp.url)) {
+				duplicatedUrl = true;
+				if (duplicatedName) {
+					break;
+				}
+			}
+			if (!duplicatedName && app.getName().equalsIgnoreCase(onboardingApp.name)) {
+				duplicatedName = true;
+				if (duplicatedUrl) {
+					break;
+				}
+			}
+		}
+		if (duplicatedUrl || duplicatedName) {
+			if (duplicatedUrl) {
+				fieldsValidator.addProblematicFieldName(urlField);
+			}
+			if (duplicatedName) {
+				fieldsValidator.addProblematicFieldName(nameField);
+			}
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_CONFLICT);
+			fieldsValidator.errorCode = new Long(EPCommonSystemProperties.DUBLICATED_FIELD_VALUE_ECOMP_ERROR);
+		}
+	}
+
+	@Override
+	public FieldsValidator modifyOnboardingApp(OnboardingApp modifiedOnboardingApp, EPUser user) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "LR: entering modifyOnboardingApp");
+		FieldsValidator fieldsValidator = onboardingAppFieldsChecker(modifiedOnboardingApp);
+		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+			validateOnboardingApp(modifiedOnboardingApp, fieldsValidator);
+		}
+		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+			if (modifiedOnboardingApp.id != null) {
+				updateApp(modifiedOnboardingApp.id, modifiedOnboardingApp, fieldsValidator, user);
+			} else {
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+			}
+		}
+		return fieldsValidator;
+	}
+
+	@Override
+	public FieldsValidator addOnboardingApp(OnboardingApp newOnboardingApp, EPUser user) {
+		FieldsValidator fieldsValidator = onboardingAppFieldsChecker(newOnboardingApp);
+		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+			validateOnboardingApp(newOnboardingApp, fieldsValidator);
+		}
+		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+			if (newOnboardingApp.id == null) {
+				updateApp(null, newOnboardingApp, fieldsValidator, user);
+			} else {
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+			}
+		}
+		return fieldsValidator;
+	}
+
+	@Override
+	public FieldsValidator deleteOnboardingApp(EPUser user, Long appid) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		if (!adminRolesService.isSuperAdmin(user)) {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_FORBIDDEN);
+			return fieldsValidator;
+		}
+		Boolean result = false;
+		Session localSession = null;
+		Transaction transaction = null;
+		try {
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+
+			// 1) Remove the URL for any functional menu item associated with
+			// this app
+			String sql = "UPDATE fn_menu_functional m, fn_menu_functional_roles mr SET m.url='' "
+					+ " WHERE m.menu_id=mr.menu_id " + " AND mr.app_id='" + appid + "'";
+			logQuery(sql);
+			Query query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove any favorites associated with a menu item that is
+			// associated with this app
+			sql = "Delete from fn_menu_favorites " + " using fn_menu_favorites inner join fn_menu_functional_roles "
+					+ " where fn_menu_functional_roles.app_id='" + appid + "' "
+					+ " AND fn_menu_functional_roles.menu_id=fn_menu_favorites.menu_id";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove all role, appid records from fn_menu_functional_role
+			// that are associated with this app
+			sql = "delete from fn_menu_functional_roles where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove all records from fn_user_role associated with this app
+			sql = "delete from fn_user_role where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove any widgets associated with this app
+			sql = "delete from ep_widget_catalog_role where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove any roles associated with this app
+			sql = "delete from ep_role_notification " + " using ep_role_notification inner join fn_role "
+					+ " where fn_role.app_id='" + appid + "' " + " and ep_role_notification.role_id= fn_role.role_id";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove all records from fn_role associated with this app
+			sql = "delete from fn_role where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove app contact us entries
+			sql = "delete from fn_app_contact_us where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove any widgets associated with this app
+			sql = "delete from fn_widget where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove rows in the app personalization selection table
+			sql = "delete from fn_pers_user_app_sel where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Remove rows in the app personalization sort table
+			sql = "delete from ep_pers_user_app_man_sort where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			// Delete the app
+			sql = "delete from fn_app where app_id='" + appid + "'";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+
+			transaction.commit();
+			result = true;
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteOnboardingApp failed", e);
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError);
+			EcompPortalUtils.rollbackTransaction(transaction, "deleteOnboardingApp rollback, exception = " + e);
+		} finally {
+			EcompPortalUtils.closeLocalSession(localSession, "deleteOnboardingApp");
+		}
+		if (!result) {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	private static Object syncRests = new Object();
+
+	// An app has been enabled/disabled. Must enable/disable all associated
+	// functional menu items.
+	private void setFunctionalMenuItemsEnabled(Session localSession, Boolean enabled, Long appId) {
+		String active_yn = enabled ? "Y" : "N";
+		String sql = "SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn "
+				+ "FROM fn_menu_functional m, fn_menu_functional_roles r " + "WHERE m.menu_id = r.menu_id "
+				+ " AND r.app_id = '" + appId + "' ";
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		for (FunctionalMenuItem menuItem : menuItems) {
+			FunctionalMenuItem myMenuItem = (FunctionalMenuItem) localSession.get(FunctionalMenuItem.class,
+					menuItem.menuId);
+			myMenuItem.active_yn = active_yn;
+			localSession.save(myMenuItem);
+		}
+	}
+
+	// Attention! If (appId == null) we use this function to create application
+	// otherwise we use it to modify existing application
+	private void updateApp(Long appId, OnboardingApp onboardingApp, FieldsValidator fieldsValidator, EPUser user) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "LR: entering updateApp");
+		// Separate out the code for a restricted app, since it doesn't need any
+		// of the UEB code.
+		if (onboardingApp.restrictedApp) {
+			boolean result = false;
+			Session localSession = null;
+			Transaction transaction = null;
+			try {
+				localSession = sessionFactory.openSession();
+				transaction = localSession.beginTransaction();
+				EPApp app;
+				if (appId == null) {
+					app = new EPApp();
+				} else {
+					app = (EPApp) localSession.get(EPApp.class, appId);
+					if (app == null || app.getId() == null) { // App is already
+						// deleted!
+						transaction.commit();
+						localSession.close();
+						fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_NOT_FOUND);
+						return;
+					}
+				}
+				createAppFromOnboarding(app, onboardingApp, localSession);
+				localSession.saveOrUpdate(app);
+				// Enable or disable all menu items associated with this app
+				setFunctionalMenuItemsEnabled(localSession, onboardingApp.isEnabled, appId);
+				transaction.commit();
+				result = true;
+			} catch (Exception e) {
+				EcompPortalUtils.rollbackTransaction(transaction,
+						"updateApp rollback, exception = " + EcompPortalUtils.getStackTrace(e));
+			} finally {
+				EcompPortalUtils.closeLocalSession(localSession, "updateApp");
+			}
+			if (!result) {
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			}
+
+		} else {
+			synchronized (syncRests) {
+				boolean result = false;
+				Session localSession = null;
+				Transaction transaction = null;
+				try {
+					localSession = sessionFactory.openSession();
+					transaction = localSession.beginTransaction();
+					EPApp app;
+					if (appId == null) {
+						app = new EPApp();
+						// -------------------------------------------------------------------------------------------
+						// Register this App with the UEB communication server.
+						// Save
+						// the App's unique mailbox/topic
+						// name and keys to the FN_APP table. The App's mailbox
+						// and
+						// keys will be visible to the
+						// admin on the ECOMP portal.
+						// -------------------------------------------------------------------------------------------
+						TopicManager topicManager = new TopicManager();
+						final CambriaIdentityManager im = new CambriaClientBuilders.IdentityManagerBuilder()
+								.usingHosts(Helper.uebUrlList()).build();
+						com.att.nsa.apiClient.credentials.ApiCredential credential = im.createApiKey(user.getEmail(),
+								"ECOMP Portal Owner");
+						String appKey = credential.getApiKey();
+						String appSecret = credential.getApiSecret();
+						String appMailboxName = null;
+
+						int maxNumAttemptsToCreateATopic = 3;
+						boolean successfullyCreatedMailbox = false;
+						for (int i = 0; i < maxNumAttemptsToCreateATopic; i++) {
+							appMailboxName = "ECOMP-PORTAL-OUTBOX-" + (int) (Math.random() * 100000.0);
+
+							try {
+								topicManager.createTopic(
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY),
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_SECRET),
+										appMailboxName, "ECOMP outbox for app" + onboardingApp.name);
+								successfullyCreatedMailbox = true;
+								logger.debug(EELFLoggerDelegate.debugLogger,
+										"Successfully created " + appMailboxName + " for App " + onboardingApp.name);
+								logger.debug(EELFLoggerDelegate.debugLogger, "    Key = " + appKey + " Secret = "
+										+ appSecret + " generated using = " + user.getEmail());
+								break;
+							} catch (HttpException e) {
+								EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebConnectionError, e);
+								if (e.getStatusCode() == 409) {
+									logger.error(EELFLoggerDelegate.errorLogger, "Topic/mailbox " + appMailboxName
+											+ " already exists. Will try using a different name", e);
+								} else {
+									logger.error(EELFLoggerDelegate.errorLogger, "HttpException when onboarding App: ",
+											e);
+								}
+							}
+						}
+
+						if (successfullyCreatedMailbox) {
+							onboardingApp.setUebTopicName(appMailboxName);
+							onboardingApp.setUebKey(appKey);
+							onboardingApp.setUebSecret(appSecret);
+
+							try {
+								/*
+								 * EP is a publisher to this App's new mailbox
+								 */
+								topicManager.addPublisher(
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY),
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_SECRET),
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY),
+										appMailboxName);
+
+								/*
+								 * This App is a subscriber of its own mailbox
+								 */
+								topicManager.addSubscriber(
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY),
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_SECRET), appKey,
+										appMailboxName);
+
+								/*
+								 * This App is a publisher to EP
+								 */
+								topicManager.addPublisher(
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY),
+										PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_SECRET), appKey,
+										PortalApiProperties.getProperty(PortalApiConstants.ECOMP_PORTAL_INBOX_NAME));
+							} catch (HttpException | CambriaApiException | IOException e) {
+								EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebRegisterOnboardingAppError, e);
+								logger.error(EELFLoggerDelegate.errorLogger,
+										"Error when configuring Publisher/Subscriber for App's new mailbox", e);
+								transaction.commit();
+								localSession.close();
+								fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_CONFLICT);
+								return;
+							}
+						} else {
+							transaction.commit();
+							localSession.close();
+							fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_CONFLICT);
+							return;
+						}
+					} else {
+						app = (EPApp) localSession.get(EPApp.class, appId);
+						if (app == null || app.getId() == null) {
+							// App is already deleted!
+							transaction.commit();
+							localSession.close();
+							fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_NOT_FOUND);
+							return;
+						}
+					}
+					logger.debug(EELFLoggerDelegate.debugLogger, "LR: about to call createAppFromOnboarding");
+					createAppFromOnboarding(app, onboardingApp, localSession);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"LR: updateApp: finished calling createAppFromOnboarding");
+					localSession.saveOrUpdate(app);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"LR: updateApp: finished calling localSession.saveOrUpdate");
+					// Enable or disable all menu items associated with this app
+					setFunctionalMenuItemsEnabled(localSession, onboardingApp.isEnabled, appId);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"LR: updateApp: finished calling setFunctionalMenuItemsEnabled");
+					transaction.commit();
+					logger.debug(EELFLoggerDelegate.debugLogger, "LR: updateApp: finished calling transaction.commit");
+					epUebHelper.addPublisher(app);
+					logger.debug(EELFLoggerDelegate.debugLogger,
+							"LR: updateApp: finished calling epUebHelper.addPublisher");
+					result = true;
+				} catch (Exception e) {
+					logger.error(EELFLoggerDelegate.errorLogger, "updateApp failed", e);
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebRegisterOnboardingAppError, e);
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+					EcompPortalUtils.rollbackTransaction(transaction,
+							"updateApp rollback, exception = " + EcompPortalUtils.getStackTrace(e));
+				} finally {
+					EcompPortalUtils.closeLocalSession(localSession, "updateApp");
+				}
+				if (!result) {
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Populates a transport model of the application from a database row model.
+	 * Leaves out the thumbnail because the FE fetches images via a different
+	 * API.
+	 * 
+	 * @param app
+	 *            Model of database row
+	 * @param onboardingApp
+	 *            Model for transport as JSON
+	 */
+	@Override
+	public void createOnboardingFromApp(EPApp app, OnboardingApp onboardingApp) {
+		onboardingApp.id = app.getId();
+		onboardingApp.name = app.getName();
+		onboardingApp.imageUrl = app.getImageUrl();
+		onboardingApp.description = app.getDescription();
+		onboardingApp.notes = app.getNotes();
+		onboardingApp.url = app.getUrl();
+		onboardingApp.alternateUrl = app.getAlternateUrl();
+		onboardingApp.restUrl = app.getAppRestEndpoint();
+		onboardingApp.isOpen = app.getOpen();
+		onboardingApp.isEnabled = app.getEnabled();
+		onboardingApp.username = app.getUsername();
+		onboardingApp.appPassword = decryptedPassword(app.getAppPassword(), app);
+		onboardingApp.uebTopicName = app.getUebTopicName();
+		onboardingApp.uebKey = app.getUebKey();
+		onboardingApp.uebSecret = app.getUebSecret();
+		onboardingApp.setRestrictedApp(app.isRestrictedApp());
+		// if (app.getThumbnail() != null)
+		// onboardingApp.thumbnail = new
+		// String(Base64.getEncoder().encode(app.getThumbnail()));
+	}
+
+	/**
+	 * Creates a database object for an application from an uploaded transport
+	 * model. Must decode the thumbnail, if any.
+	 * 
+	 * @param app
+	 * @param onboardingApp
+	 * @param localSession
+	 * @return The first argument.
+	 */
+	protected EPApp createAppFromOnboarding(EPApp app, OnboardingApp onboardingApp, Session localSession) {
+		app.setName(onboardingApp.name);
+		app.setDescription(onboardingApp.description);
+		app.setNotes(onboardingApp.notes);
+		app.setUrl(onboardingApp.url);
+		app.setAlternateUrl(onboardingApp.alternateUrl);
+		app.setAppRestEndpoint(onboardingApp.restUrl);
+		app.setOpen(onboardingApp.isOpen);
+		app.setEnabled(onboardingApp.isEnabled);
+		app.setUsername(onboardingApp.username);
+		app.setAppPassword(this.encryptedPassword(onboardingApp.appPassword, app));
+		app.setUebTopicName(onboardingApp.uebTopicName);
+		app.setUebKey(onboardingApp.uebKey);
+		app.setUebSecret(onboardingApp.uebSecret);
+		app.setRestrictedApp(onboardingApp.restrictedApp);
+		if (!StringUtils.isEmpty(onboardingApp.thumbnail)) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "createAppFromOnboarding: onboarding thumbnail is NOT empty");
+			String[] splitBase64Thumbnail = onboardingApp.thumbnail.split("base64,");
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"createAppFromOnboarding: length of splitBase64Thumbnail: " + splitBase64Thumbnail.length);
+			if (splitBase64Thumbnail.length > 1) {
+				// This occurs when we have a new image, not an existing image
+				byte[] decodedImage = Base64.getDecoder().decode(splitBase64Thumbnail[1].getBytes());
+				logger.debug(EELFLoggerDelegate.debugLogger, "createAppFromOnboarding: finished calling decode");
+				// This is basically a boolean indicator that an image is
+				// present.
+				app.setImageUrl(constructImageName(onboardingApp));
+				app.setThumbnail(decodedImage);
+			}
+		} else if (app.getThumbnail() != null) {
+			// The thumbnail that came in from the json is empty; the previous
+			// thumbnail is NOT empty. Must delete it.
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"createAppFromOnboarding: onboarding thumbnail is empty; db thumbnail is NOT null");
+			app.setImageUrl(null);
+			app.setThumbnail(null);
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					"createAppFromOnboarding: onboarding thumbnail is empty; db thumbnail is null");
+		}
+		return app;
+	}
+
+	protected String constructImageName(OnboardingApp onboardingApp) {
+		return "portal_" + String.valueOf(onboardingApp.url.hashCode() + "_" + (int) (Math.random() * 100000.0))
+				+ ".png";
+	}
+
+	// Don't encrypt or decrypt the password if it is null or the empty string
+	private String decryptedPassword(String encryptedAppPwd, EPApp app) {
+		String result = "";
+		if (encryptedAppPwd != null & encryptedAppPwd.length() > 0) {
+			try {
+				result = CipherUtil.decrypt(encryptedAppPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed for app " + app.getName(), e);
+			}
+		}
+		return result;
+	}
+
+	protected String encryptedPassword(String decryptedAppPwd, EPApp app) {
+		String result = "";
+		if (decryptedAppPwd != null & decryptedAppPwd.length() > 0) {
+			try {
+				result = CipherUtil.encrypt(decryptedAppPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "encryptedPassword failed for app " + app.getName(), e);
+			}
+		}
+		return result;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public FieldsValidator saveWidgetsSortManual(List<EPWidgetsSortPreference> widgetsSortManual, EPUser user) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		final Map<String, Long> params = new HashMap<>();
+		List<EPWidgetsManualSortPreference> epManualWidgets = new ArrayList<EPWidgetsManualSortPreference>();
+
+		try {
+			params.put("userId", user.getId());
+			epManualWidgets = dataAccessService.executeNamedQuery("userWidgetManualSortPrfQuery", params, null);
+			Map<Long, EPWidgetsManualSortPreference> existingWidgetsIds = new HashMap<Long, EPWidgetsManualSortPreference>();
+			for (EPWidgetsManualSortPreference userWidgetManualPref : epManualWidgets) {
+				existingWidgetsIds.put(userWidgetManualPref.getWidgetId(), userWidgetManualPref);
+			}
+			for (EPWidgetsSortPreference epWidgetsManPref : widgetsSortManual) {
+				if (epWidgetsManPref.getWidgetid() != null) {
+					Long widgetid = epWidgetsManPref.getWidgetid();
+					if (existingWidgetsIds.containsKey(widgetid)) {
+						EPWidgetsManualSortPreference epWidgetsManualSort = existingWidgetsIds.get(widgetid);
+						epWidgetsManualSort.setWidgetRow(epWidgetsManPref.getRow());
+						epWidgetsManualSort.setWidgetCol(epWidgetsManPref.getCol());
+						epWidgetsManualSort.setWidgetWidth(epWidgetsManPref.getSizeX());
+						epWidgetsManualSort.setWidgetHeight(epWidgetsManPref.getSizeY());
+						HashMap<String, Integer> additionalUpdateParam = new HashMap<String, Integer>();
+						additionalUpdateParam.put("userId", epWidgetsManualSort.getUserId());
+						dataAccessService.saveDomainObject(epWidgetsManualSort, additionalUpdateParam);
+					} else {
+						EPWidgetsManualSortPreference epWidgetsManualSort = new EPWidgetsManualSortPreference();
+						epWidgetsManualSort.setWidgetId(epWidgetsManPref.getWidgetid());
+						epWidgetsManualSort.setWidgetRow(epWidgetsManPref.getRow());
+						epWidgetsManualSort.setWidgetCol(epWidgetsManPref.getCol());
+						epWidgetsManualSort.setWidgetWidth(epWidgetsManPref.getSizeX());
+						epWidgetsManualSort.setWidgetHeight(epWidgetsManPref.getSizeY());
+						epWidgetsManualSort.setUserId(Ints.checkedCast(user.getId()));
+						dataAccessService.saveDomainObject(epWidgetsManualSort, null);
+					}
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveWidgetsSortManual failed", e);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public FieldsValidator deleteUserWidgetSortPref(List<EPWidgetsSortPreference> delWidgetSortPref, EPUser user) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		final Map<String, Long> params = new HashMap<>();
+		List<EPWidgetsManualSortPreference> epWidgets = new ArrayList<EPWidgetsManualSortPreference>();
+		try {
+			params.put("userId", user.getId());
+			epWidgets = dataAccessService.executeNamedQuery("userWidgetManualSortPrfQuery", params, null);
+			Map<Long, EPWidgetsManualSortPreference> existingWidgetIds = new HashMap<Long, EPWidgetsManualSortPreference>();
+			for (EPWidgetsManualSortPreference userWidgetSortPref : epWidgets) {
+				existingWidgetIds.put(userWidgetSortPref.getWidgetId(), userWidgetSortPref);
+			}
+			for (EPWidgetsSortPreference delEpWidgetsManPref : delWidgetSortPref) {
+				if (delEpWidgetsManPref.getWidgetid() != null) {
+					Long widgetId = delEpWidgetsManPref.getWidgetid();
+					if (existingWidgetIds.containsKey(widgetId)) {
+						dataAccessService.deleteDomainObjects(EPWidgetsManualSortPreference.class,
+								"widget_id=" + widgetId + " AND user_id=" + user.getId(), null);
+					}
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteUserWidgetSortPref failed", e);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	/*
+	 * This Method Stores the Sort Order of User Apps by Sort Manual Preference
+	 *
+	 * @param: appsSortManual--contains User Apps Data
+	 *
+	 * @param: user--contains LoggedIn User Data
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public FieldsValidator saveAppsSortManual(List<EPAppsManualPreference> appsSortManual, EPUser user) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		final Map<String, Long> params = new HashMap<>();
+		List<EPUserAppsManualSortPreference> epManualApps = new ArrayList<EPUserAppsManualSortPreference>();
+
+		try {
+			params.put("userId", user.getId());
+			epManualApps = dataAccessService.executeNamedQuery("userAppsManualSortPrfQuery", params, null);
+			Map<Long, EPUserAppsManualSortPreference> existingAppIds = new HashMap<Long, EPUserAppsManualSortPreference>();
+			for (EPUserAppsManualSortPreference userAppManualPref : epManualApps) {
+				existingAppIds.put(userAppManualPref.getAppId(), userAppManualPref);
+			}
+			for (EPAppsManualPreference epAppsManPref : appsSortManual) {
+				if (epAppsManPref.getAppid() != null) {
+					Long appid = epAppsManPref.getAppid();
+					if (existingAppIds.containsKey(appid)) {
+						EPUserAppsManualSortPreference epAppsManualSort = existingAppIds.get(appid);
+						epAppsManualSort
+								.setAppManualSortOrder((epAppsManPref.getCol() + (6 * epAppsManPref.getRow())) + 1);
+						HashMap<String, Integer> additionalUpdateParam = new HashMap<String, Integer>();
+						additionalUpdateParam.put("userId", epAppsManualSort.getUserId());
+						dataAccessService.saveDomainObject(epAppsManualSort, additionalUpdateParam);
+					} else {
+						EPUserAppsManualSortPreference epAppsManualSort = new EPUserAppsManualSortPreference();
+						epAppsManualSort.setAppId(epAppsManPref.getAppid());
+						epAppsManualSort
+								.setAppManualSortOrder((epAppsManPref.getCol() + (6 * epAppsManPref.getRow())) + 1);
+						epAppsManualSort.setUserId(Ints.checkedCast(user.getId()));
+						dataAccessService.saveDomainObject(epAppsManualSort, null);
+					}
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveAppsSortManual failed", e);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.openecomp.portalapp.portal.service.EPAppService#
+	 * deleteUserAppSortManual(java.lang.String,
+	 * org.openecomp.portalapp.portal.domain.EPUser)
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public FieldsValidator deleteUserAppSortManual(EPDeleteAppsManualSortPref delAppSortManual, EPUser user) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		final Map<String, Long> params = new HashMap<>();
+		List<EPUserAppsManualSortPreference> epManualApps = new ArrayList<EPUserAppsManualSortPreference>();
+		try {
+			params.put("userId", user.getId());
+			epManualApps = dataAccessService.executeNamedQuery("userAppsManualSortPrfQuery", params, null);
+			Map<Long, EPUserAppsManualSortPreference> existingAppIds = new HashMap<Long, EPUserAppsManualSortPreference>();
+			for (EPUserAppsManualSortPreference userAppPref : epManualApps) {
+				existingAppIds.put(userAppPref.getAppId(), userAppPref);
+			}
+			if (existingAppIds.containsKey(delAppSortManual.getAppId()) && !delAppSortManual.isSelect()) {
+				dataAccessService.deleteDomainObjects(EPUserAppsManualSortPreference.class,
+						"app_id=" + delAppSortManual.getAppId() + " AND user_id=" + user.getId(), null);
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteUserAppSortManual failed", e);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public FieldsValidator saveAppsSortPreference(EPAppsSortPreference appsSortPreference, EPUser user) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		final Map<String, Long> params = new HashMap<>();
+		List<EPUserAppsSortPreference> epSortTypes = new ArrayList<EPUserAppsSortPreference>();
+		EPUserAppsSortPreference usrSortPr = null;
+		try {
+			params.put("userId", user.getId());
+			epSortTypes = dataAccessService.executeNamedQuery("userAppsSortPreferenceQuery", params, null);
+			if (epSortTypes.size() == 0) {
+				usrSortPr = new EPUserAppsSortPreference();
+				usrSortPr.setUserId(Ints.checkedCast(user.getId()));
+				usrSortPr.setSortPref(appsSortPreference.getValue());
+				dataAccessService.saveDomainObject(usrSortPr, null);
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+			} else {
+				usrSortPr = epSortTypes.get(0);
+				usrSortPr.setSortPref(appsSortPreference.getValue());
+				HashMap<String, Integer> additionalUpdateParam = new HashMap<String, Integer>();
+				additionalUpdateParam.put("userId", usrSortPr.getUserId());
+				dataAccessService.saveDomainObject(usrSortPr, additionalUpdateParam);
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_OK);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveAppsSortPreference failed", e);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public String getUserAppsSortTypePreference(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		List<EPUserAppsSortPreference> userSortPrefs = new ArrayList<EPUserAppsSortPreference>();
+		try {
+			params.put("userId", user.getId());
+			userSortPrefs = dataAccessService.executeNamedQuery("userAppsSortPreferenceQuery", params, null);
+			if (userSortPrefs.size() > 0)
+				return userSortPrefs.get(0).getSortPref();
+			else
+				return null;
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserAppsSortTypePreference failed", e);
+		}
+		return null;
+
+	}
+
+	@Override
+	public List<EPApp> getUserRemoteApps(String id) {
+		throw new RuntimeException(" Cannot be called from parent class");
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java
new file mode 100644
index 00000000..c7bf680d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAppService.java
@@ -0,0 +1,213 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.AdminUserApplications;
+import org.openecomp.portalapp.portal.domain.AppIdAndNameTransportModel;
+import org.openecomp.portalapp.portal.domain.AppsResponse;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompApp;
+import org.openecomp.portalapp.portal.domain.UserRoles;
+import org.openecomp.portalapp.portal.ecomp.model.AppCatalogItem;
+import org.openecomp.portalapp.portal.transport.EPAppsManualPreference;
+import org.openecomp.portalapp.portal.transport.EPAppsSortPreference;
+import org.openecomp.portalapp.portal.transport.EPDeleteAppsManualSortPref;
+import org.openecomp.portalapp.portal.transport.EPWidgetsSortPreference;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.LocalRole;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+
+public interface EPAppService {
+
+	/**
+	 * Get all applications adminId is an admin
+	 * 
+	 * @param adminId
+	 *            - the admin
+	 * @return the admin's applications
+	 */
+	List<EPApp> getUserAsAdminApps(EPUser user);
+
+	List<EPApp> getUserByOrgUserIdAsAdminApps(String orgUserId);
+
+	/**
+	 * Gets all rows and all fields from the fn_app table.
+	 * 
+	 * @return list of EPApp objects
+	 */
+	List<EPApp> getAppsFullList();
+
+	/**
+	 * Gets all rows and most fields from the fn_app table.
+	 * 
+	 * @return list of EcompApp objects.
+	 */
+	List<EcompApp> getEcompAppAppsFullList();
+
+	/**
+	 * Get apps with app app admins
+	 * 
+	 * @return List of AdminUserApplications
+	 */
+	List<AdminUserApplications> getAppsAdmins();
+
+	/**
+	 * Get all apps from fn_app table (index, name, title only).
+	 * 
+	 * @param all
+	 *            If all is true, returns active and inactive apps; otherwise,
+	 *            just active apps.
+	 * @return List of AppsResponse objects.
+	 */
+	List<AppsResponse> getAllApps(Boolean all);
+
+	UserRoles getUserProfile(String loginId);
+
+	UserRoles getUserProfileNormalized(EPUser user);
+
+	List<LocalRole> getAppRoles(Long appId);
+
+	List<AppIdAndNameTransportModel> getAdminApps(EPUser user);
+
+	List<AppIdAndNameTransportModel> getAppsForSuperAdminAndAccountAdmin(EPUser user);
+
+	/**
+	 * Gets the applications accessible to the specified user, which includes
+	 * all enabled open applications, plus all enabled applications for which
+	 * the user has a defined role for that app.
+	 * 
+	 * @param user
+	 *            EPUser object with the user's ATT UID
+	 * @return the user's list of applications, which may be empty.
+	 */
+	List<EPApp> getUserApps(EPUser user);
+
+	/**
+	 * Gets the user-personalized list of applications for the Portal (super)
+	 * admin, which includes enabled open applications, enabled applications for
+	 * which the user has a defined role for that app, and/or enabled
+	 * applications which the user has chosen to show.
+	 * 
+	 * @param user
+	 *            EPUser object with the user's ATT UID
+	 * @return the user's personalized list of applications, which may be empty.
+	 */
+	List<EPApp> getPersAdminApps(EPUser user);
+
+	/**
+	 * Gets the user-personalized list of accessible applications, which
+	 * includes enabled open applications and/or enabled applications for which
+	 * the user has a defined role for that app. Personalization means the user
+	 * can indicate an accessible application should be excluded from this
+	 * result.
+	 * 
+	 * @param user
+	 *            EPUser object with the user's ATT UID
+	 * @return the user's personalized list of applications, which may be empty.
+	 */
+	List<EPApp> getPersUserApps(EPUser user);
+
+	/**
+	 * Gets the application catalog for the specified user who is a super admin.
+	 * This includes all enabled applications. Each item indicates whether the
+	 * user has access (open or via a role), and whether the application is
+	 * selected for showing in the user's home (applications) page. Admin sees
+	 * slightly different behavior - can force an app onto the home page using
+	 * the personalization feature (user-app-selection table).
+	 * 
+	 * @param user
+	 * @return list of all enabled applications, which may be empty
+	 */
+	List<AppCatalogItem> getAdminAppCatalog(EPUser user);
+
+	/**
+	 * Gets the application catalog for the specified user, who is a regular
+	 * user. This includes all enabled applications. Each item indicates whether
+	 * the user has access (open or via a role), and whether the application is
+	 * selected for showing in the user's home (applications) page.
+	 * 
+	 * @param user
+	 * @return list of all enabled applications, which may be empty
+	 */
+	List<AppCatalogItem> getUserAppCatalog(EPUser user);
+
+	List<OnboardingApp> getOnboardingApps();
+
+	List<OnboardingApp> getEnabledNonOpenOnboardingApps();
+
+	FieldsValidator modifyOnboardingApp(OnboardingApp modifiedOnboardingApp, EPUser user);
+
+	FieldsValidator addOnboardingApp(OnboardingApp newOnboardingApp, EPUser user);
+
+	/**
+	 * Deletes the specified application from all tables where the app_id is
+	 * used, and ultimately from the fn_app table.
+	 * 
+	 * @param user
+	 *            Must be Portal (super) administrator
+	 * @param onboardingAppId
+	 *            ID of application to be deleted
+	 * @return Status code
+	 */
+	FieldsValidator deleteOnboardingApp(EPUser user, Long onboardingAppId);
+
+	List<EcompApp> transformAppsToEcompApps(List<EPApp> appsList);
+
+	EPApp getApp(Long appId);
+
+	EPApp getAppDetail(String appName);
+
+	List<EPApp> getAppsOrderByName(EPUser user);
+
+	FieldsValidator saveAppsSortPreference(EPAppsSortPreference appsSortPreference, EPUser user);
+
+	FieldsValidator saveAppsSortManual(List<EPAppsManualPreference> appsSortManual, EPUser user);
+
+	FieldsValidator saveWidgetsSortManual(List<EPWidgetsSortPreference> widgetsSortManual, EPUser user);
+
+	/**
+	 * Deletes the sort order of user apps by sort manual preference
+	 * 
+	 * @param delAppSortManual
+	 *            User Apps Data
+	 * @param user
+	 *            LoggedIn User Data
+	 * @return FieldsValidator
+	 */
+	FieldsValidator deleteUserAppSortManual(EPDeleteAppsManualSortPref delAppSortManual, EPUser user);
+
+	FieldsValidator deleteUserWidgetSortPref(List<EPWidgetsSortPreference> delWidgetSortPref, EPUser user);
+
+	String getUserAppsSortTypePreference(EPUser user);
+
+	List<EPApp> getAppsOrderByLastUsed(EPUser user);
+
+	List<EPApp> getAppsOrderByMostUsed(EPUser user);
+
+	List<EPApp> getAppsOrderByManual(EPUser user);
+
+	List<EPApp> getUserRemoteApps(String id);
+
+	void createOnboardingFromApp(EPApp app, OnboardingApp onboardingApp);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAuditService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAuditService.java
new file mode 100644
index 00000000..a35a8ba2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAuditService.java
@@ -0,0 +1,27 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.Date;
+
+public interface EPAuditService {
+	public Date getGuestLastLogin(String userId);
+	public void delAuditLogFromDay();
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAuditServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAuditServiceImpl.java
new file mode 100644
index 00000000..1a343866
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPAuditServiceImpl.java
@@ -0,0 +1,96 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.domain.AuditLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+
+@Service("epAuditService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class EPAuditServiceImpl implements EPAuditService {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPAuditServiceImpl.class);
+
+	@Autowired
+	private DataAccessService  dataAccessService;
+
+	@Override
+	/* get the guest last login time with orgUserId as param.
+	 * If record not found in table, return null.
+	 *  
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.EPUserService#getGuestLastLogin(java.lang.String)
+	 */
+	public Date getGuestLastLogin(String userId) {
+		Map<String, String> params = new HashMap<>();
+		params.put("userId", userId);
+		List<Date> list = getDataAccessService().executeNamedQuery("getGuestLastLogin", params, null);	
+		Date date=null;
+		if(list!=null){
+			if(list.size()==1) /* if list only contains one item, meaning this is the first time user logs in or record not found in db*/
+				date = list.get(0); /*the guest's current log in time*/
+			else if(list.size()==2)
+				date = list.get(1); /*most recent login date from db*/
+		}
+		return date;   	
+	}
+
+	@Override
+	/* Clean all the records in fn_audit_log table that are less than defined date in system.property
+	 * 
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.EPAuditService#delAuditLogFromDay()
+	 */
+	public void delAuditLogFromDay(){	
+		if (EPCommonSystemProperties.containsProperty(EPCommonSystemProperties.AUDITLOG_DEL_DAY_FROM)) {
+			String day = EPCommonSystemProperties.getProperty(EPCommonSystemProperties.AUDITLOG_DEL_DAY_FROM);				
+			LocalDate removeDateFrom = LocalDate.now().minusDays(Integer.valueOf(day));
+			getDataAccessService().deleteDomainObjects(AuditLog.class, "audit_date  <'"+removeDateFrom+"'",null);
+		}else{
+			logger.error(EELFLoggerDelegate.errorLogger, "delAuditLogFromDay Exception = system.propertiy value is empty on" + EPCommonSystemProperties.AUDITLOG_DEL_DAY_FROM);
+		}	
+	}
+	
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLdapService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLdapService.java
new file mode 100644
index 00000000..c77684fa
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLdapService.java
@@ -0,0 +1,31 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import org.openecomp.portalsdk.core.command.support.SearchResult;
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+
+public interface EPLdapService {
+
+    // search POST for users based on the criteria selected in the Request
+    SearchResult searchPost(DomainVo searchCriteria, String sortBy1, String sortBy2, String sortBy3, int pageNo, int dataSize, int userId) throws Exception;
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLdapServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLdapServiceImpl.java
new file mode 100644
index 00000000..dfcc0c7f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLdapServiceImpl.java
@@ -0,0 +1,288 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.command.support.SearchResult;
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.support.FusionService;
+import org.openecomp.portalsdk.core.service.support.ServiceLocator;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Service("epLdapService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+public class EPLdapServiceImpl extends FusionService implements EPLdapService {
+	@Autowired
+	private ServiceLocator serviceLocator;
+	
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPLdapServiceImpl.class);
+
+	@EPAuditLog
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+	public SearchResult searchPost(DomainVo searchCriteria, String sortBy1, String sortBy2, String sortBy3, 
+    		int pageNo, int dataSize, int userId) throws Exception {
+
+    	String remoteHost = "";
+    	  	  	
+		// initialize the directory context to access POST
+        DirContext dirContext = serviceLocator.getDirContext(SystemProperties.getProperty(SystemProperties.POST_INITIAL_CONTEXT_FACTORY),
+                                                                  SystemProperties.getProperty(SystemProperties.POST_PROVIDER_URL),
+                                                                  SystemProperties.getProperty(SystemProperties.POST_SECURITY_PRINCIPAL));
+        
+        SearchResult searchResult = new SearchResult();
+
+        try {
+        
+        	remoteHost = String.format("%s/%s", SystemProperties.getProperty(SystemProperties.POST_PROVIDER_URL), 
+    									SystemProperties.getProperty(SystemProperties.POST_SECURITY_PRINCIPAL));
+        	MDC.put(EPCommonSystemProperties.FULL_URL, remoteHost);
+        	
+          String[] postAttributes =  {"nickname","givenName","initials","sn","employeeNumber","mail","telephoneNumber",
+        		  	"departmentNumber","a1","street","roomNumber","l","st","postalCode","zip4","physicalDeliveryOfficeName","bc",
+        		  	"friendlyCountryName","bd","bdname","bu","buname","jtname","mgrid","a2","compcode","compdesc",
+        		  	"costcenter","silo","b2"};
+
+          SearchControls searchControls = new SearchControls();
+          searchControls.setTimeLimit(5000);
+          searchControls.setReturningAttributes(postAttributes);
+
+          StringBuffer filterClause = new StringBuffer("(&(objectClass=*)");
+
+          EPUser user = (EPUser)searchCriteria;
+
+          if(Utilities.nvl(user.getFirstName()).length() > 0) {
+            filterClause.append("(givenName=").append(user.getFirstName()).append("*)");
+          }
+          if(Utilities.nvl(user.getLastName()).length() > 0) {
+            filterClause.append("(sn=").append(user.getLastName()).append("*)");
+          }
+          if(Utilities.nvl(user.getHrid()).length() > 0) {
+            filterClause.append("(employeeNumber=").append(user.getHrid()).append("*)");
+          }
+          if(Utilities.nvl(user.getOrgManagerUserId()).length() > 0) {
+              filterClause.append("(mgrid=").append(user.getOrgManagerUserId()).append("*)");
+            }
+          if(Utilities.nvl(user.getOrgCode()).length() > 0) {
+            filterClause.append("(departmentNumber=").append(user.getOrgCode()).append("*)");
+          }
+          if(Utilities.nvl(user.getEmail()).length() > 0) {
+            filterClause.append("(mail=").append(user.getEmail()).append("*)");
+          }
+          if(Utilities.nvl(user.getOrgUserId()).length() > 0) {
+            filterClause.append("(a1=").append(user.getOrgUserId()).append("*)");
+          }
+          filterClause.append("(c3=N)"); // this has been added to filter CP09 entries on the LDAP server that are duplicates of existing individuals
+          filterClause.append(")");
+
+          List list = new ArrayList();
+          if (!filterClause.toString().equals("(&(objectClass=*))")) {
+        	  NamingEnumeration e = dirContext.search(SystemProperties.getProperty(SystemProperties.POST_PROVIDER_URL) + "/" +
+                                                      SystemProperties.getProperty(SystemProperties.POST_SECURITY_PRINCIPAL),
+                                                      filterClause.toString(),
+                                                      searchControls);
+        	  list = processResults(e);
+          }
+          
+          Collections.sort(list);
+
+          searchResult = new SearchResult(list);
+          searchResult.setPageNo(pageNo);
+          if(dataSize >= 0) {
+            searchResult.setDataSize(dataSize);
+          }
+          else {
+            searchResult.setDataSize(list.size());
+          }
+        } catch(NamingException ne) {
+        	String stackTrace = EcompPortalUtils.getStackTrace(ne);
+        	logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing the LDAP search. Details: " + stackTrace);
+        } catch(Exception e) {
+        	String stackTrace = EcompPortalUtils.getStackTrace(e);
+        	logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing the LDAP search. Details: " + stackTrace);
+        }
+        finally {
+        	dirContext.close();
+        }
+
+        return searchResult;
+    }
+
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @EPMetricsLog
+	private ArrayList processResults(NamingEnumeration e) throws NamingException {
+      ArrayList results = new ArrayList();
+      int count = 0;
+
+      while (e.hasMore()) {
+        javax.naming.directory.SearchResult searchResult = (javax.naming.directory.SearchResult)e.next();
+        results.add(processAttributes(searchResult.getAttributes()));
+        count++;
+
+        if(count > Integer.parseInt(SystemProperties.getProperty(SystemProperties.POST_MAX_RESULT_SIZE))) {
+          break;
+        }
+      }
+      return results;
+    }
+
+
+    @SuppressWarnings("rawtypes")
+    @EPMetricsLog
+	private DomainVo processAttributes(Attributes resultAttributes) throws NamingException {
+      EPUser user = new EPUser();
+
+      try {
+        if (resultAttributes == null) {
+          logger.debug(EELFLoggerDelegate.debugLogger, "This result has no attributes");
+        } else {
+          for (NamingEnumeration e = resultAttributes.getAll(); e.hasMore();) { //why the nested loop?
+            Attribute attribute = (Attribute)e.next();
+            for (NamingEnumeration ie = attribute.getAll(); ie.hasMore();) {
+              if (attribute.getID().equalsIgnoreCase("nickname")) {
+                  user.setFirstName((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("initials")) {
+                  user.setMiddleInitial((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("sn")) {
+                  user.setLastName((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("employeeNumber")) {
+                  user.setHrid((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("mail")) {
+                  user.setEmail((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("telephoneNumber")) {
+                  user.setPhone((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("departmentNumber")) {
+                  user.setOrgCode((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("a1")) {
+                  user.setOrgUserId((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("street")) {
+                  user.setAddress1((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("roomNumber")) {
+                  user.setAddress2((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("l")) {
+                  user.setCity((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("st")) {
+                  user.setState((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("postalCode")) {
+                  user.setZipCode((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("zip4")) {
+                  user.setZipCodeSuffix((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("physicalDeliveryOfficeName")) {
+                  user.setLocationClli((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("bc")) {
+                  user.setBusinessCountryCode((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("friendlyCountryName")) {
+                  user.setBusinessCountryName((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("bd")) {
+                  user.setDepartment((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("bdname")) {
+                  user.setDepartmentName((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("jtname")) {
+                  user.setJobTitle((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("mgrid")) {
+                  user.setOrgManagerUserId((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("a2")) {
+                  user.setCommandChain((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("compcode")) {
+                  user.setCompanyCode((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("compdesc")) {
+                  user.setCompany((String) ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("bu")) {
+                  user.setBusinessUnit((String)ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("buname")) {
+                  user.setBusinessUnitName((String)ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("silo")) {
+                  user.setSiloStatus((String)ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("costcenter")) {
+                  user.setCostCenter((String)ie.next());
+              }
+              else if (attribute.getID().equalsIgnoreCase("b2")) {
+                  user.setFinancialLocCode((String)ie.next());
+              }
+              else { //we don't care about returned attribute, let's move on
+                ie.next();
+              }
+
+            }
+          }
+        }
+      } catch (NamingException e) {
+    	  String stackTrace = EcompPortalUtils.getStackTrace(e);
+    	  logger.error(EELFLoggerDelegate.errorLogger, "An error occurred while processing the following user from POST with an Organization User ID of " + user.getOrgUserId());
+    	  logger.error(EELFLoggerDelegate.errorLogger, "Exception occcurred while processing LDAP search results, Details: " + stackTrace);
+      } catch(Exception e) {
+    	  String stackTrace = EcompPortalUtils.getStackTrace(e);
+    	  logger.error(EELFLoggerDelegate.errorLogger, "Exception occcurred while processing LDAP search results, Details: " + stackTrace);
+      }
+      
+      return user;
+    }
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuService.java
new file mode 100644
index 00000000..ed9c3c4d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuService.java
@@ -0,0 +1,44 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.Set;
+
+import org.openecomp.portalsdk.core.domain.MenuData;
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+public interface EPLeftMenuService {
+	
+	/**
+	 * Builds a JSON suitable for populating the front-end left menu from the supplied set of menu items.
+	 * @param user 
+	 * 
+	 * @param fullMenuSet
+	 * @param roleFunctionSet 
+	 * @return JSON String of this form:
+	 * <PRE>
+	 * {"navItems":[
+	 * 		{"name":"Home","imageSrc":"icon-location-pin","state":"root.applicationsHome"},
+	 * 	...
+	 * ] }
+	 * </PRE>
+	 */
+	String getLeftMenuItems(EPUser user, Set<MenuData> fullMenuSet, Set<String> roleFunctionSet);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java
new file mode 100644
index 00000000..2a1f466a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLeftMenuServiceImpl.java
@@ -0,0 +1,195 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.domain.MenuData;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.UserRoles;
+//import org.openecomp.portalapp.portal.domain.Menu;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("leftMenuService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+
+public class EPLeftMenuServiceImpl implements EPLeftMenuService {
+
+	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPLeftMenuServiceImpl.class);
+
+	@Autowired
+	private EPAppService appService;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.openecomp.portalapp.portal.service.EPLeftMenuService#getLeftMenuItems
+	 * (java.util.Set)
+	 */
+	@Override
+	public String getLeftMenuItems(EPUser user, Set<MenuData> fullMenuSet, Set<String> roleFunctionSet) {
+		final Map<String, JSONObject> defaultNavMap = new LinkedHashMap<String, JSONObject>();
+
+		resetNavMap(defaultNavMap);
+
+		loadDefaultNavMap(defaultNavMap);
+
+		// Handle Account Administrator in a special way; soon this will
+		// be revised as Account Administrator may become obsolete
+		try {
+			if (user != null) {
+				UserRoles uRoles = appService.getUserProfileNormalized(user);
+				if (uRoles.getRoles().contains("Account Administrator"))
+					loadAccAdminNavMap(defaultNavMap);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"getLeftMenuItems: failed to get roles for user " + user.getOrgUserId(), e);
+		}
+
+		loadNavMapByRole(defaultNavMap, fullMenuSet);
+
+		return convertToSideBarModel(defaultNavMap);
+	}
+
+	/**
+	 * Clears the map
+	 * 
+	 * @param defaultNavMap
+	 */
+	private void resetNavMap(Map<String, JSONObject> defaultNavMap) {
+		defaultNavMap.clear();
+	}
+
+	/**
+	 * 
+	 * @param defaultNavMap
+	 * @param fullMenuSet
+	 */
+	private void loadNavMapByRole(Map<String, JSONObject> defaultNavMap, Set<MenuData> fullMenuSet) {
+
+		class SortOrderComparator implements Comparator<MenuData> {
+			@Override
+			public int compare(MenuData e1, MenuData e2) {
+				return e1.getSortOrder().compareTo(e2.getSortOrder());
+			}
+		}
+
+		SortedSet<MenuData> sortMenuSet = new TreeSet<MenuData>(new SortOrderComparator());
+		for (MenuData mn : fullMenuSet) {
+			sortMenuSet.add(mn);
+		}
+
+		for (MenuData mn : sortMenuSet) {
+			JSONObject navItemsDetails = new JSONObject();
+			navItemsDetails.put("name", mn.getLabel());
+			navItemsDetails.put("state", mn.getAction());
+			navItemsDetails.put("imageSrc", mn.getImageSrc());
+			defaultNavMap.put(mn.getAction(), navItemsDetails);
+		}
+	}
+
+	/**
+	 * 
+	 * @param defaultNavMap
+	 * @return
+	 */
+	private String convertToSideBarModel(Map<String, JSONObject> defaultNavMap) {
+		JSONObject sidebarModel = new JSONObject();
+		JSONArray navItems = new JSONArray();
+		Collection<JSONObject> jsonObjs = defaultNavMap.values();
+
+		for (JSONObject navItemsDetail : jsonObjs)
+			navItems.put(navItemsDetail);
+
+		sidebarModel.put("label", "ECOMP portal");
+		sidebarModel.put("navItems", navItems);
+		return sidebarModel.toString();
+	}
+
+	/**
+	 * Loads default entries for regular user.
+	 * 
+	 * @param defaultNavMap
+	 */
+	private void loadDefaultNavMap(Map<String, JSONObject> defaultNavMap) {
+
+		JSONObject navItemsDetails1 = new JSONObject();
+		navItemsDetails1.put("name", "Home");
+		navItemsDetails1.put("state", "root.applicationsHome");
+		navItemsDetails1.put("imageSrc", "icon-building-home");
+		defaultNavMap.put("root.applicationsHome", navItemsDetails1);
+
+		JSONObject navItemsDetails2 = new JSONObject();
+		navItemsDetails2.put("name", "Application Catalog");
+		navItemsDetails2.put("state", "root.appCatalog");
+		navItemsDetails2.put("imageSrc", "icon-apps-marketplace");
+		defaultNavMap.put("root.appCatalog", navItemsDetails2);
+
+		JSONObject navItemsDetails3 = new JSONObject();
+		navItemsDetails3.put("name", "Widget Catalog");
+		navItemsDetails3.put("state", "root.widgetCatalog");
+		navItemsDetails3.put("imageSrc", "icon-apps-marketplace");
+		defaultNavMap.put("root.widgetCatalog", navItemsDetails3);
+
+	}
+
+	/**
+	 * Loads default entries for application administrator.
+	 * 
+	 * @param defaultNavMap
+	 */
+	private void loadAccAdminNavMap(Map<String, JSONObject> defaultNavMap) {
+
+		JSONObject navItemsDetails1 = new JSONObject();
+		navItemsDetails1.put("name", "Users");
+		navItemsDetails1.put("state", "root.users");
+		navItemsDetails1.put("imageSrc", "icon-user");
+		defaultNavMap.put("root.users", navItemsDetails1);
+
+		// No more widget onboarding like this:
+		//
+		// JSONObject navItemsDetails2 = new JSONObject();
+		// navItemsDetails2.put("name", "Widget Onboarding");
+		// navItemsDetails2.put("state", "root.widgetOnboarding");
+		// navItemsDetails2.put("imageSrc", "icon-add-widget");
+		// defaultNavMap.put("root.widgetOnboarding", navItemsDetails2);
+
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLoginService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLoginService.java
new file mode 100644
index 00000000..4bdb2009
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLoginService.java
@@ -0,0 +1,70 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.HashMap;
+
+import org.openecomp.portalapp.command.EPLoginBean;
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+public interface EPLoginService {
+
+	/**
+	 * Calls {@link #findUser(EPLoginBean, String, HashMap, boolean)} with the
+	 * last parameter set to true.
+	 * 
+	 * @param bean
+	 * @param menuPropertiesFilename
+	 * @param additionalParams
+	 * @return EPUser object; null on error or if no match.
+	 * @throws Exception
+	 */
+	@SuppressWarnings("rawtypes")
+	EPLoginBean findUser(EPLoginBean bean, String menuPropertiesFilename, HashMap additionalParams) throws Exception;
+
+	/**
+	 * Searches the fn_user table for a row that matches information in the
+	 * bean. Uses the bean's Organization User ID property if present; if not, uses the bean's
+	 * LoginId property and (optionally, depending on matchPassword parameter)
+	 * loginPwd property.
+	 * 
+	 * @param bean
+	 *            EPLoginBean
+	 * @param menuPropertiesFileName
+	 *            Always ignored
+	 * @param additionalParams
+	 *            Used by DataAccessService when updating a matched user object
+	 * @param matchPassword
+	 *            If true, the search must match the password
+	 * @return EPUser object; null on error or if no match.
+	 */
+	@SuppressWarnings("rawtypes")
+	EPLoginBean findUser(EPLoginBean bean, String menuPropertiesFilename, HashMap additionalParams,
+			boolean matchPassword) throws Exception;
+
+	/**
+	 * Searches the fn_user table for a row with a value in column login_id that
+	 * matches the specified value.
+	 * 
+	 * @param loginId
+	 * @return EPUser object; null on error or if no match.
+	 */
+	public EPUser findUserWithoutPwd(String loginId);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLoginServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLoginServiceImpl.java
new file mode 100644
index 00000000..ba202d63
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPLoginServiceImpl.java
@@ -0,0 +1,234 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.menu.MenuBuilder;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.service.support.FusionService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.web.support.AppUtils;
+import org.openecomp.portalapp.command.EPLoginBean;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.util.EPUserUtils;
+
+@Service("eploginService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class EPLoginServiceImpl extends FusionService implements EPLoginService {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPLoginServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.EPLoginService#findUser(org.openecomp.portalapp.command.EPLoginBean, java.lang.String, java.util.HashMap)
+	 */
+	@SuppressWarnings("rawtypes")
+	public EPLoginBean findUser(EPLoginBean bean, String menuPropertiesFilename, HashMap additionalParams)
+			throws Exception {
+		return findUser(bean, menuPropertiesFilename, additionalParams, true);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.EPLoginService#findUser(org.openecomp.portalapp.command.EPLoginBean, java.lang.String, java.util.HashMap, boolean)
+	 */
+	@SuppressWarnings("rawtypes")
+	public EPLoginBean findUser(EPLoginBean bean, String menuPropertiesFilename_ignored, HashMap additionalParams,
+			boolean matchPassword) throws Exception {
+		EPUser user = null;
+		EPUser userCopy = null;
+
+		if (bean.getOrgUserId() != null) {
+			user = (EPUser) findUser(bean);
+		} else {
+			if (matchPassword)
+				user = (EPUser) findUser(bean.getLoginId(), bean.getLoginPwd());
+			else
+				user = (EPUser) findUserWithoutPwd(bean.getLoginId());
+		}
+
+		// run this command to fetch more information from the lazily loaded
+		// object
+
+		// This is funny - commenting out the following method call
+		// 1. What are we doing with the returned values of the following two
+		// methods? Nothing.
+		// 2. Use a guest user scenario - user object will be null - clealry,
+		// NPE.
+		// 3. A check of if(user !=null) is made AFTER these bogus calls :) - If
+		// these calls WERE doing anything significat (which they are not),
+		// shouln't they have been moved inside that if check?
+
+		// user.getEPUserApps();
+
+		// Comments
+		// 1. This method is clearly doing more than 'getting roles' - Not a
+		// good name -
+		// 2. Also, there is no null check - guest user scenarios will break the
+		// code with NPE - added the check - Do not want to remove the call
+		// altogether - not sure how it will effect things.
+
+		if (user != null) {
+			user.getEPRoles();
+
+			// raise an error if the portal application is locked and the user
+			// does not
+			// have system administrator privileges
+			if (AppUtils.isApplicationLocked()
+					&& !EPUserUtils.hasRole(user, SystemProperties.getProperty(SystemProperties.SYS_ADMIN_ROLE_ID))) {
+				bean.setLoginErrorMessage(SystemProperties.MESSAGE_KEY_LOGIN_ERROR_APPLICATION_LOCKED);
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUserAdminPrivilegesInfo, user.getLoginId());
+			}
+
+			// raise an error if the user is inactive
+			if (!user.getActive()) {
+				bean.setLoginErrorMessage(SystemProperties.MESSAGE_KEY_LOGIN_ERROR_USER_INACTIVE);
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUserInactiveWarning, user.getLoginId());
+			}
+
+			// only login the user if no errors have occurred
+			if (bean.getLoginErrorMessage() == null) {
+
+				// this will be a snapshot of the user's information as
+				// retrieved from the database
+				userCopy = (EPUser) user.clone();
+
+				// update the last logged in date for the user
+				user.setLastLoginDate(new Date());
+				getDataAccessService().saveDomainObject(user, additionalParams);
+
+				// create the application menu based on the user's privileges
+				MenuBuilder menuBuilder = new MenuBuilder();
+				Set appMenu = menuBuilder.getMenu(
+						SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_SET_NAME), dataAccessService);
+				bean.setMenu(appMenu != null ? appMenu : new HashSet());
+				Set businessDirectMenu = menuBuilder.getMenu(
+						SystemProperties.getProperty(SystemProperties.BUSINESS_DIRECT_MENU_SET_NAME),
+						dataAccessService);
+				bean.setBusinessDirectMenu(businessDirectMenu != null ? businessDirectMenu : new HashSet());
+
+				bean.setUser(userCopy);
+			}
+
+		} else {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUserMissingError, bean.getOrgUserId());
+		}
+
+		return bean;
+	}
+
+	/**
+	 * Searches the fn_user table for a row that matches the specified login_id
+	 * and login_pwd values.
+	 * 
+	 * @param loginId
+	 * @param password
+	 * @return EPUser object; null on error or if no match.
+	 */
+	private EPUser findUser(String loginId, String password) {
+		List<?> list = null;
+
+		StringBuffer criteria = new StringBuffer();
+		criteria.append(" where login_id = '").append(loginId).append("'").append(" and login_pwd = '").append(password)
+				.append("'");
+
+		try {
+			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "findUser(String) failed on " + loginId, e);
+		}
+
+		return (list == null || list.size() == 0) ? null : (EPUser) list.get(0);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.EPLoginService#findUserWithoutPwd(java.lang.String)
+	 */
+	@Override
+	public EPUser findUserWithoutPwd(String loginId) {
+		List<?> list = null;
+
+		StringBuffer criteria = new StringBuffer();
+		criteria.append(" where login_id = '").append(loginId).append("'");
+
+		try {
+			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			String message = "findUserWithoutPwd failed on " + loginId;
+			logger.error(EELFLoggerDelegate.errorLogger, message, e);
+		}
+
+		return (list == null || list.size() == 0) ? null : (EPUser) list.get(0);
+	}
+
+	/**
+	 * Searches the fn_user table for a row that matches the value of the bean's
+	 * Organization User ID property.
+	 * 
+	 * @param bean
+	 * @return EPUser object; null on error or if no match.
+	 */
+	private EPUser findUser(EPLoginBean bean) {
+		List<?> list = null;
+
+		StringBuffer criteria = new StringBuffer();
+		criteria.append(" where orgUserId = '").append(bean.getOrgUserId()).append("'");
+
+		try {
+			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "findUser(EPLoginBean) failed", e);
+		}
+
+		return (list == null || list.size() == 0) ? null : (EPUser) list.get(0);
+	}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleService.java
new file mode 100644
index 00000000..32dccbe0
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleService.java
@@ -0,0 +1,37 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalsdk.core.domain.RoleFunction;
+import org.openecomp.portalapp.portal.domain.EPRole;
+
+
+public interface EPRoleService {
+	
+	// Used by ECOMP. Get cached role by two columns used by ECOMP only. app id, and external app role id.
+	EPRole getRole(Long appId, Long appRoleid);
+	public void saveRole(EPRole domainRole);
+	EPRole getAppRole(String roleName, Long appId);
+	public List<RoleFunction> getRoleFunctions();
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleServiceImpl.java
new file mode 100644
index 00000000..d7661e9a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/EPRoleServiceImpl.java
@@ -0,0 +1,171 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.domain.RoleFunction;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("epRoleService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class EPRoleServiceImpl implements EPRoleService{
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPRoleServiceImpl.class);
+
+	@Autowired
+	private DataAccessService  dataAccessService;
+	
+	@SuppressWarnings("unchecked")	
+	public List<RoleFunction> getRoleFunctions() {
+		//List msgDB = getDataAccessService().getList(Profile.class, null);
+		return getDataAccessService().getList(RoleFunction.class, null);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public List<EPRole> getAvailableChildRoles(Long roleId) {
+		List<EPRole> availableChildRoles = (List<EPRole>)getDataAccessService().getList(EPRole.class,null);
+		if(roleId==null || roleId==0){
+			return availableChildRoles;
+		}
+		
+		EPRole currentRole = (EPRole)getDataAccessService().getDomainObject(EPRole.class,roleId,null);
+		Set<EPRole> allParentRoles = new TreeSet<EPRole>();
+		allParentRoles = getAllParentRolesAsList(currentRole, allParentRoles);
+
+		
+		Iterator<EPRole> availableChildRolesIterator = availableChildRoles.iterator();
+		while (availableChildRolesIterator.hasNext()) {
+			EPRole role = availableChildRolesIterator.next(); 
+			if(!role.getActive() || allParentRoles.contains(role) || role.getId().equals(roleId)){
+				availableChildRolesIterator.remove();
+			}
+		}
+		return availableChildRoles;
+	}
+	
+	private Set<EPRole> getAllParentRolesAsList(EPRole role, Set<EPRole> allParentRoles) {
+		Set<EPRole> parentRoles = role.getParentRoles();
+		allParentRoles.addAll(parentRoles);
+		Iterator<EPRole> parentRolesIterator = parentRoles.iterator();
+		while (parentRolesIterator.hasNext()) {
+			getAllParentRolesAsList(parentRolesIterator.next(),allParentRoles);
+		}
+		return allParentRoles;
+	}
+	
+	public RoleFunction getRoleFunction(String code) {
+		return (RoleFunction)getDataAccessService().getDomainObject(RoleFunction.class, code, null);
+	}
+	
+	public void saveRoleFunction(RoleFunction domainRoleFunction) {
+		getDataAccessService().saveDomainObject(domainRoleFunction, null);
+	}
+	
+	public void deleteRoleFunction(RoleFunction domainRoleFunction) {
+		getDataAccessService().deleteDomainObject(domainRoleFunction, null);
+	}
+	
+	public EPRole getRole(Long id) {
+		return (EPRole)getDataAccessService().getDomainObject(EPRole.class, id, null);
+	}
+	
+	// TODO: refactor
+	private static final String getAppRoleSqlFormat ="SELECT * FROM fn_role where APP_ID = %s AND APP_ROLE_ID = %s";
+	
+	@SuppressWarnings("unchecked")
+	public EPRole getRole(Long appId, Long appRoleid) {
+		if(appId == null || appRoleid == null){
+			logger.error(EELFLoggerDelegate.errorLogger, String.format("getRole does not support null appId or roleId. appRoleid=%s, appRoleid=%s", appId, appRoleid));
+			return null;
+		}
+		
+		String sql = String.format(getAppRoleSqlFormat, appId, appRoleid);
+		
+		List<EPRole> roles = (List<EPRole>)dataAccessService.executeSQLQuery(sql, EPRole.class, null);
+		int resultsCount = roles.size();
+		if(resultsCount > 1){
+			logger.error(EELFLoggerDelegate.errorLogger, String.format("search by appId=%s, appRoleid=%s should have returned 0 or 1 results. Got %d. This is an internal server error.", appId, appRoleid, resultsCount));
+			logger.error(EELFLoggerDelegate.errorLogger, "Trying to recover from duplicates by returning the first search result. This issue should be treated, it is probably not critical because duplicate roles should be similar.");
+			return roles.get(0);
+		} else if(resultsCount == 1){
+			return roles.get(0);
+		}
+		return null;
+	}
+		
+	@SuppressWarnings("unchecked")
+	public EPRole getAppRole(String roleName, Long appId) {
+			
+		final Map<String, String> params = new HashMap<String, String>();
+		params.put("appId", appId.toString());
+		params.put("roleName", roleName);
+		
+		List<EPRole> roles = (List<EPRole>)dataAccessService.executeNamedQuery("getAppRoles", params, null);
+		int resultsCount = roles.size();
+		if(resultsCount > 1){
+			logger.error(EELFLoggerDelegate.errorLogger, "Trying to recover from duplicates by returning the first search result. This issue should be treated, it is probably not critical because duplicate roles should be similar.");
+			return roles.get(0);
+		} else if(resultsCount == 1){
+			return roles.get(0);
+		}
+		return null;
+	}
+	
+	
+	public void saveRole(EPRole domainRole) {
+		getDataAccessService().saveDomainObject(domainRole, null);
+	}
+	
+	public void deleteRole(EPRole domainRole) {
+		getDataAccessService().deleteDomainObject(domainRole, null);
+	}
+	
+	@SuppressWarnings("unchecked")
+	public List<EPRole> getAvailableRoles() {
+		return getDataAccessService().getList(EPRole.class, null);
+	}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+}
+
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuService.java
new file mode 100644
index 00000000..0fa790c5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuService.java
@@ -0,0 +1,58 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.FunctionalMenuItemWithAppID;
+import org.openecomp.portalapp.portal.transport.BusinessCardApplicationRole;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItemJson;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItemWithRoles;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuRole;
+
+public interface FunctionalMenuService {
+	List<FunctionalMenuItem> getFunctionalMenuItems (EPUser user);
+	// return all active menu items
+	List<FunctionalMenuItem> getFunctionalMenuItems ();
+	// return all active menu items. If all is true, return all active and inactive menu items.
+	List<FunctionalMenuItem> getFunctionalMenuItems(Boolean all);
+	// return all active Functional menu items for Notification Tree in User Notification . If all is true, return all active menu items.
+	List<FunctionalMenuItem> getFunctionalMenuItemsForNotificationTree(Boolean all);
+	List<FunctionalMenuItem> getFunctionalMenuItemsForApp (Integer appId);
+	List<FunctionalMenuItem> getFunctionalMenuItemsForUser (String orgUserId);
+	FunctionalMenuItem getFunctionalMenuItemDetails (Integer menuid);
+	FieldsValidator createFunctionalMenuItem (FunctionalMenuItemWithRoles menuItemJson);
+	FieldsValidator editFunctionalMenuItem (FunctionalMenuItemWithRoles menuItemJson);
+	FieldsValidator deleteFunctionalMenuItem (Long menuId);
+	FieldsValidator regenerateAncestorTable ();
+	//Methods relevant to favorites
+	FieldsValidator setFavoriteItem(FavoritesFunctionalMenuItem menuItemJson);
+	List<FavoritesFunctionalMenuItemJson> getFavoriteItems(Long userId);
+	FieldsValidator removeFavoriteItem (Long userId, Long menuId);
+	List<FunctionalMenuItem> transformFunctionalMenuItemWithAppIDToFunctionalMenuItem(List<FunctionalMenuItemWithAppID> functionalMenuItemWithAppIDList);
+	List<FunctionalMenuRole> getFunctionalMenuRole();
+	//Assign URLs under Help Menu
+	void assignHelpURLs(List<FunctionalMenuItem> menuItems);
+	List<BusinessCardApplicationRole> getUserAppRolesList(String userId);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java
new file mode 100644
index 00000000..a6a11209
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/FunctionalMenuServiceImpl.java
@@ -0,0 +1,963 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Criteria;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.FunctionalMenuItemWithAppID;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.transport.BusinessCardApplicationRole;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.FavoritesFunctionalMenuItemJson;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItem;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuItemWithRoles;
+import org.openecomp.portalapp.portal.transport.FunctionalMenuRole;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Service("functionalMenuService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class FunctionalMenuServiceImpl implements FunctionalMenuService {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FunctionalMenuServiceImpl.class);
+
+	private Long ACCOUNT_ADMIN_ROLE_ID = 999L;
+	private String RESTRICTED_APP_ROLE_ID = "900";
+
+	@Autowired
+	private DataAccessService dataAccessService;
+	@Autowired
+	private SessionFactory sessionFactory;
+
+	@PostConstruct
+	private void init() {
+		try {
+			ACCOUNT_ADMIN_ROLE_ID = Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID));
+			RESTRICTED_APP_ROLE_ID = SystemProperties.getProperty(EPCommonSystemProperties.RESTRICTED_APP_ROLE_ID);
+		} catch(Exception e) {
+		}
+	}
+	
+	public List<FunctionalMenuItem> getFunctionalMenuItems(EPUser user) {
+		List<FunctionalMenuItem> menuItems = new ArrayList<FunctionalMenuItem>();
+		return menuItems;
+	}
+
+	public List<FunctionalMenuItem> getFunctionalMenuItems() {
+		return getFunctionalMenuItems(false);
+	}
+	
+	public List<FunctionalMenuItem> getFunctionalMenuItems(Boolean all) {
+		// Divide this into 2 queries: one which returns the bottom-level menu items associated with Restricted apps,
+		// and one that returns all the other menu items. Then we can easily add the boolean flag
+		// restrictedApp to each FunctionalMenuItem, to be used by the front end.
+		String activeWhereClause = "";
+		if (! all) {
+			activeWhereClause = " AND UPPER(m.active_yn) = 'Y' ";
+		}
+		String sql = "SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn, r.app_id "
+				+ "FROM fn_menu_functional m, fn_menu_functional_roles r "
+				+ "WHERE m.menu_id = r.menu_id "
+				+ activeWhereClause //" AND UPPER(m.active_yn) = 'Y' "
+				+ " AND r.role_id != '" + RESTRICTED_APP_ROLE_ID + "' "
+			+ " UNION "
+			+ " SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn,-1 app_id "
+				+ " FROM fn_menu_functional m "
+				+ " WHERE m.url='' "
+				+ activeWhereClause; //" AND UPPER(m.active_yn) = 'Y' ";
+		logQuery(sql);
+
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItemWithAppID> menuItemsWithAppIdList = dataAccessService.executeSQLQuery(sql,FunctionalMenuItemWithAppID.class, null);
+		List<FunctionalMenuItem> menuItems = new ArrayList<>();	
+		menuItems = transformFunctionalMenuItemWithAppIDToFunctionalMenuItem(menuItemsWithAppIdList);
+		for (FunctionalMenuItem menuItem : menuItems) {
+			menuItem.restrictedApp = false;
+		}
+		
+		sql = "SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn, r.app_id "
+				+ "FROM fn_menu_functional m, fn_menu_functional_roles r "
+				+ "WHERE m.menu_id = r.menu_id "
+				+ activeWhereClause //" AND UPPER(m.active_yn) = 'Y' "
+				+ " AND r.role_id = '" + RESTRICTED_APP_ROLE_ID + "' ";
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems2 = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		for (FunctionalMenuItem menuItem : menuItems2) {
+			menuItem.restrictedApp = true;
+			menuItems.add(menuItem);
+		}
+		
+		return menuItems;
+	}
+
+	
+	public List<FunctionalMenuItem> getFunctionalMenuItemsForNotificationTree(Boolean all) {
+		// Divide this into 2 queries: one which returns the bottom-level menu items associated with Restricted apps,
+		// and one that returns all the other menu items which are active. Then we can easily add the boolean flag
+		// restrictedApp to each FunctionalMenuItem, to be used by the front end.
+		String activeWhereClause = "";
+		if (! all) {
+			activeWhereClause = " AND UPPER(m.active_yn) = 'Y' ";
+		}
+		String sql = "SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn, r.app_id "
+				+ "FROM fn_menu_functional m, fn_menu_functional_roles r "
+				+ "WHERE m.menu_id = r.menu_id "
+				+ activeWhereClause + " AND UPPER(m.active_yn) = 'Y' "
+				+ " AND r.role_id != '" + RESTRICTED_APP_ROLE_ID + "' "
+			+ " UNION "
+			+ " SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn,-1 app_id "
+				+ " FROM fn_menu_functional m "
+				+ " WHERE m.url='' "
+				+ activeWhereClause + " AND UPPER(m.active_yn) = 'Y' ";
+		logQuery(sql);
+
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItemWithAppID> menuItemsWithAppIdList = dataAccessService.executeSQLQuery(sql,FunctionalMenuItemWithAppID.class, null);
+		List<FunctionalMenuItem> menuItems = new ArrayList<>();	
+		menuItems = transformFunctionalMenuItemWithAppIDToFunctionalMenuItem(menuItemsWithAppIdList);
+		for (FunctionalMenuItem menuItem : menuItems) {
+			menuItem.restrictedApp = false;
+		}
+		
+		sql = "SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn, r.app_id "
+				+ "FROM fn_menu_functional m, fn_menu_functional_roles r "
+				+ "WHERE m.menu_id = r.menu_id "
+				+ activeWhereClause + " AND UPPER(m.active_yn) = 'Y' "
+				+ " AND r.role_id = '" + RESTRICTED_APP_ROLE_ID + "' ";
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems2 = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		for (FunctionalMenuItem menuItem : menuItems2) {
+			menuItem.restrictedApp = true;
+			menuItems.add(menuItem);
+		}
+		
+		return menuItems;
+	}
+
+	public List<FunctionalMenuItem> getFunctionalMenuItemsForApp(Integer appId) {
+		String sql = "SELECT DISTINCT m1.menu_id, m1.column_num, m1.text, m1.parent_menu_id, m1.url, m.active_yn "
+				+ " FROM fn_menu_functional m, fn_menu_functional m1, fn_menu_functional_ancestors a, fn_menu_functional_roles mr "
+				+ " WHERE " + " mr.app_id='" + appId + "' " + " AND mr.menu_id = m.menu_id " + " AND UPPER(m.active_yn) = 'Y'"
+				+ " AND UPPER(m1.active_yn) ='Y'" + " AND a.menu_id = m.menu_id " + " AND a.ancestor_menu_id = m1.menu_id";
+		logQuery(sql);
+		logger.debug(EELFLoggerDelegate.debugLogger, "getFunctionalMenuItemsForApp: logged the query");
+
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		
+		return menuItems;
+	}
+	/**
+	 * convert List of FunctionalMenuItemWithAppID into List of FunctionalMenuItem
+	 * 
+	 */
+	public List<FunctionalMenuItem> transformFunctionalMenuItemWithAppIDToFunctionalMenuItem(List<FunctionalMenuItemWithAppID> functionalMenuItemWithAppIDList) {
+		List<FunctionalMenuItem> functionalMenuItemList = new ArrayList<FunctionalMenuItem>();
+		for (FunctionalMenuItemWithAppID functionalMenuItemWithAppID : functionalMenuItemWithAppIDList) {
+			FunctionalMenuItem menuItem = new FunctionalMenuItem();
+			menuItem.menuId=functionalMenuItemWithAppID.menuId;
+			menuItem.column=functionalMenuItemWithAppID.column;
+			menuItem.text=functionalMenuItemWithAppID.text;
+			menuItem.parentMenuId=functionalMenuItemWithAppID.parentMenuId;
+			menuItem.url=functionalMenuItemWithAppID.url;
+			menuItem.active_yn=functionalMenuItemWithAppID.active_yn;
+			menuItem.appid=functionalMenuItemWithAppID.appid;
+			menuItem.setRoles(functionalMenuItemWithAppID.roles);
+			menuItem.restrictedApp=functionalMenuItemWithAppID.restrictedApp;
+			functionalMenuItemList.add(menuItem);
+		}
+		return functionalMenuItemList;
+	}
+	
+	public List<FunctionalMenuItem> getFunctionalMenuItemsForUser(String orgUserId) {
+		// m represents the functional menu items that are the leaf nodes
+		// m1 represents the functional menu items for all the nodes
+
+		// Divide this into 2 queries: one which returns the bottom-level menu items associated with Restricted apps,
+		// and one that returns all the other menu items. Then we can easily add the boolean flag
+		// restrictedApp to each FunctionalMenuItem, to be used by the front end.
+		String sql = "SELECT DISTINCT m1.menu_id, m1.column_num, m1.text, m1.parent_menu_id, m1.url, m.active_yn "
+				+ " FROM fn_menu_functional m, fn_menu_functional m1, fn_menu_functional_ancestors a, "
+				+ " fn_menu_functional_roles mr, fn_user u , fn_user_role ur " + " WHERE " + " u.org_user_id='" + orgUserId
+				+ "' " + " AND u.user_id = ur.user_id " + " AND ur.app_id = mr.app_id " +
+				// " AND ur.role_id = mr.role_id " +
+				" AND (ur.role_id = mr.role_id " + "     OR ur.role_id = '" + ACCOUNT_ADMIN_ROLE_ID + "') "
+				+ " AND m.menu_id = mr.menu_id " + " AND UPPER(m.active_yn) = 'Y'" + " AND UPPER(m1.active_yn) ='Y' "
+				+ " AND a.menu_id = m.menu_id " + " AND a.ancestor_menu_id = m1.menu_id "
+				+ " UNION "
+				// the ancestors of the restricted app menu items
+				+ " select m1.menu_id, m1.column_num, m1.text, m1.parent_menu_id, m1.url, m1.active_yn "
+				+ " FROM fn_menu_functional m, fn_menu_functional_roles mr, fn_menu_functional m1, "
+				+ " fn_menu_functional_ancestors a "
+				+ " where a.menu_id = m.menu_id "
+				+ " AND a.ancestor_menu_id = m1.menu_id "
+				+ " AND m.menu_id != m1.menu_id "
+				+ " AND m.menu_id = mr.menu_id "
+				+ " AND mr.role_id = '" + RESTRICTED_APP_ROLE_ID + "' "
+				+ " AND UPPER(m.active_yn) = 'Y'" + " AND UPPER(m1.active_yn) ='Y' "
+				// Add the Favorites menu item
+				+ " UNION "
+				+ " SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn "
+				+ " FROM fn_menu_functional m "
+				+ " WHERE m.text in ('Favorites','Get Access','Contact Us','Support','User Guide','Help')";
+		
+		logQuery(sql);
+		logger.debug(EELFLoggerDelegate.debugLogger, "getFunctionalMenuItemsForUser: logged the query");
+
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		for (FunctionalMenuItem menuItem : menuItems) {
+			menuItem.restrictedApp = false;
+		}
+		
+		sql = " SELECT m.menu_id, m.column_num, m.text, m.parent_menu_id, m.url, m.active_yn "
+			+ " FROM fn_menu_functional m, fn_menu_functional_roles r "
+			+ " WHERE m.menu_id = r.menu_id "
+			+ " AND UPPER(m.active_yn) = 'Y' "
+			+ " AND r.role_id = '" + RESTRICTED_APP_ROLE_ID + "' ";
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems2 = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		for (FunctionalMenuItem menuItem : menuItems2) {
+			menuItem.restrictedApp = true;
+			menuItems.add(menuItem);
+		}
+		
+		return menuItems;
+	}
+
+	public FunctionalMenuItem getFunctionalMenuItemDetails(Integer menuid) {
+		// First, fill in the fields that apply to all menu items
+
+		String sql = "SELECT * FROM fn_menu_functional WHERE menu_id = '" + menuid + "'";
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuItem> menuItems = dataAccessService.executeSQLQuery(sql, FunctionalMenuItem.class, null);
+		FunctionalMenuItem menuItem = (menuItems == null || menuItems.isEmpty() ? null : menuItems.get(0));
+		// If it is a bottom-level menu item, must fill in the appid and the
+		// roles
+		sql = "SELECT * FROM fn_menu_functional_roles WHERE menu_id = '" + menuid + "'";
+		logQuery(sql);
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuRole> roleItems = dataAccessService.executeSQLQuery(sql, FunctionalMenuRole.class, null);
+		if (roleItems.size() > 0) {
+			Integer appid = roleItems.get(0).appId;
+			menuItem.appid = appid;
+			List<Integer> roles = new ArrayList<Integer>();
+			for (FunctionalMenuRole roleItem : roleItems) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "LR: app_id: " + roleItem.appId + "; role_id: " + roleItem.roleId + "\n");
+				roles.add(roleItem.roleId);
+			}
+			menuItem.setRoles(roles);
+		}
+		
+		return menuItem;
+	}
+
+	private FieldsValidator menuItemFieldsChecker(FunctionalMenuItemWithRoles menuItemJson) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		try {
+			// TODO: validate all the fields
+			@SuppressWarnings("unchecked")
+			List<FunctionalMenuItem> functionalMenuItems = dataAccessService.getList(FunctionalMenuItem.class,
+					" where text = '" + menuItemJson.text + "'", null, null);
+			
+			boolean dublicatedName = false;
+			for (FunctionalMenuItem fnMenuItem : functionalMenuItems) {
+				if (menuItemJson.menuId != null && menuItemJson.menuId.equals(fnMenuItem.menuId)) {
+					// FunctionalMenuItem should not be compared with itself
+					continue;
+				}
+
+				if (!dublicatedName && fnMenuItem.text.equalsIgnoreCase(menuItemJson.text)) {
+					dublicatedName = true;
+					break;
+				}
+			}
+			if (dublicatedName) {
+				fieldsValidator.addProblematicFieldName("text");
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_CONFLICT);
+				fieldsValidator.errorCode = new Long(EPCommonSystemProperties.DUBLICATED_FIELD_VALUE_ECOMP_ERROR);
+				logger.debug(EELFLoggerDelegate.debugLogger, "In menuItemFieldsChecker, Error: we have an duplicate text field");
+			} else if (StringUtils.isEmpty(menuItemJson.text) && menuItemJson.menuId == null) { 
+				// text must be non empty for a create. For an edit, can be empty, which means it is a move request.
+				// a null menuId indicates a create.
+				fieldsValidator.addProblematicFieldName("text");
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+				logger.debug(EELFLoggerDelegate.debugLogger, "In menuItemFieldsChecker, Error: we have an empty text field");
+			} else {
+				// The url, appid, and roles must either be all filled or all empty.
+				Boolean urlIsEmpty = StringUtils.isEmpty(menuItemJson.url);
+				Boolean rolesIsEmpty = menuItemJson.getRoles() == null || menuItemJson.getRoles().isEmpty();
+				Boolean appidIsEmpty = menuItemJson.appid == null || menuItemJson.appid == 0;
+				logger.debug(EELFLoggerDelegate.debugLogger, "LR: menuItemfieldsChecker: urlIsEmpty: " + urlIsEmpty + "; rolesIsEmpty: " + rolesIsEmpty + "; appidIsEmpty: " + appidIsEmpty +"\n");
+				if (!((urlIsEmpty && rolesIsEmpty && appidIsEmpty) || (!urlIsEmpty && !rolesIsEmpty && !appidIsEmpty)))
+				{
+					fieldsValidator.addProblematicFieldName("url,roles,appid");
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+					logger.debug(EELFLoggerDelegate.debugLogger, "In menuItemFieldsChecker, Error: we don't have: either all 3 fields empty or all 3 fields nonempty");
+				} else {
+					logger.debug(EELFLoggerDelegate.debugLogger, "In menuItemFieldsChecker, Success: either all 3 fields empty or all 3 fields nonempty");
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while validating the FunctionalMenuItems. Details: " + EcompPortalUtils.getStackTrace(e));
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		
+		return fieldsValidator;
+	}
+	
+	// Turn foreign key checks on or off
+	protected void setForeignKeys(Session localSession, Boolean on) {
+		String keyCheck = "0";
+		if (on) {
+			keyCheck = "1";
+		}
+		String sql = "set FOREIGN_KEY_CHECKS="+keyCheck;
+		logQuery(sql);
+		Query query = localSession.createSQLQuery(sql);
+		query.executeUpdate();
+	}
+
+	public FieldsValidator createFunctionalMenuItem(FunctionalMenuItemWithRoles menuItemJson) {
+		FieldsValidator fieldsValidator = menuItemFieldsChecker(menuItemJson);
+		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "LR: createFunctionalMenuItem: test 1");
+			boolean result = false;
+			Session localSession = null;
+			Transaction transaction = null;
+			try {
+				FunctionalMenuItem menuItem = new FunctionalMenuItem();
+				menuItem.appid = menuItemJson.appid;
+				menuItem.setRoles(menuItemJson.getRoles());
+				menuItem.url = menuItemJson.url;
+				menuItem.text = menuItemJson.text;
+				menuItem.parentMenuId = menuItemJson.parentMenuId;
+				menuItem.active_yn = "Y";
+				localSession = sessionFactory.openSession();
+				
+				// If the app is disabled, deactivate the menu item.
+				if (menuItemJson.appid != null) {
+					Long appidLong = Long.valueOf(menuItemJson.appid);
+					EPApp app = (EPApp) localSession.get(EPApp.class, appidLong);
+					if (app != null && ! app.getEnabled()) {
+						menuItem.active_yn = "N";
+					}
+				}
+
+				// Set the column number to 1 higher than the highest column
+				// number under this parent.
+				Criteria criteria = localSession.createCriteria(FunctionalMenuItem.class);
+				criteria.setProjection(Projections.max("column"));
+				criteria.add(Restrictions.eq("parentMenuId", menuItem.parentMenuId));
+				Integer maxColumn = (Integer) criteria.uniqueResult();
+				if (maxColumn == null) {
+					maxColumn = 0;
+				}
+				menuItem.column = maxColumn + 1;
+				logger.debug(EELFLoggerDelegate.debugLogger, "about to create menu item: " + menuItem.toString());
+
+				transaction = localSession.beginTransaction();
+				// localSession.saveOrUpdate(newMenuItem);
+				localSession.save(menuItem);
+				Long menuid = menuItem.menuId;
+				menuItemJson.menuId = menuid;
+				logger.debug(EELFLoggerDelegate.debugLogger, "after saving menu object, new id: " + menuid);
+
+				// Next, save all the roles
+
+				addRoles(menuItemJson, localSession);
+				transaction.commit();
+				result = true;
+			} catch (Exception e) {
+				EcompPortalUtils.rollbackTransaction(transaction, 
+						"createFunctionalMenuItem rollback, exception = " + e);
+				logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+			} finally {
+				EcompPortalUtils.closeLocalSession(localSession, "createFunctionalMenuItem");
+			}
+			if (result) {
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "LR: createFunctionalMenuItem: no result. setting httpStatusCode to "
+						+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			}
+		} else {
+			logger.error(EELFLoggerDelegate.errorLogger, "FunctionalMenuServiceImpl.createFunctionalMenuItem: bad request");
+		}
+		return fieldsValidator;
+	}
+
+	/* Add all the roles in the menu item to the database */
+	public void addRoles(FunctionalMenuItemWithRoles menuItemJson, Session localSession) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "entering addRoles.");
+		List<Integer> roles = menuItemJson.getRoles();
+		if (roles != null && roles.size() > 0) {
+			Integer appid = menuItemJson.appid;
+			Long menuid = menuItemJson.menuId;
+			for (Integer roleid : roles) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "about to create record for role: " + roleid);
+				FunctionalMenuRole role = new FunctionalMenuRole();
+				role.appId = appid;
+				role.menuId = menuid;
+				role.roleId = roleid;
+				localSession.save(role);
+				logger.debug(EELFLoggerDelegate.debugLogger, "after saving role menu object, new id: " + role.id);
+			}
+		}
+	}
+
+	/* Delete all the roles associated with the menu item from the database */
+	public void deleteRoles(Long menuId) {
+		dataAccessService.deleteDomainObjects(FunctionalMenuRole.class, "menu_id='" + menuId + "'", null);
+	}
+
+	/* Delete all favorites associated with the menu item from the database */
+	public void deleteFavorites(Long menuId) {
+		dataAccessService.deleteDomainObjects(FavoritesFunctionalMenuItem.class, "menu_id='" + menuId + "'", null);
+	}
+	
+	private Boolean parentMenuIdEqual(Integer menuId1, Integer menuId2) {
+		return ((menuId1 == null && menuId2 == null) || (menuId1 != null && menuId1.equals(menuId2)));
+	}
+
+	private void updateColumnForSiblings(Session localSession, Long menuId, Integer oldParentMenuId,
+			Integer newParentMenuId, Integer oldColumn, Integer newColumn) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "entering updateColumnForSiblings");
+		Criteria criteria = localSession.createCriteria(FunctionalMenuItem.class);
+		criteria.add(Restrictions.ne("menuId", menuId));
+		if (parentMenuIdEqual(oldParentMenuId, newParentMenuId)) {
+			logger.debug(EELFLoggerDelegate.debugLogger, "moving under the same parent");
+			// We are moving to a new position under the same parent
+			if (newParentMenuId == null) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "newParentMenuId is null, so using isNull");
+				criteria.add(Restrictions.isNull("parentMenuId"));
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "newParentMenuId is NOT null, so using eq");
+				criteria.add(Restrictions.eq("parentMenuId", newParentMenuId));
+			}
+			if (oldColumn > newColumn) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "moving to a lower column under the same parent");
+				// We are moving to a lower column under the same parent
+				criteria.add(Restrictions.ge("column", newColumn));
+				criteria.add(Restrictions.lt("column", oldColumn));
+				@SuppressWarnings("unchecked")
+				List<FunctionalMenuItem> menuItems = criteria.list();
+				for (FunctionalMenuItem menuItem : menuItems) {
+					menuItem.column += 1;
+					localSession.save(menuItem);
+				}
+			} else if (oldColumn < newColumn) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "moving to a higher column under the same parent");
+				// We are moving to a higher column under the same parent
+				criteria.add(Restrictions.gt("column", oldColumn));
+				criteria.add(Restrictions.le("column", newColumn));
+				@SuppressWarnings("unchecked")
+				List<FunctionalMenuItem> menuItems = criteria.list();
+				for (FunctionalMenuItem menuItem : menuItems) {
+					menuItem.column -= 1;
+					localSession.save(menuItem);
+				}
+			} else {
+				// No info has changed
+				logger.debug(EELFLoggerDelegate.debugLogger, "no info has changed, so we are not moving");
+			}
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger, "moving under a new parent");
+			// We are moving under a new parent.
+
+			// Adjust the children under the old parent
+			logger.debug(EELFLoggerDelegate.debugLogger, "about to adjust the children under the old parent");
+
+			// If the parentId is null, must check for its children differently
+			if (oldParentMenuId == null) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "oldParentMenuId is null, so using isNull");
+				criteria.add(Restrictions.isNull("parentMenuId"));
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "oldParentMenuId is NOT null, so using eq");
+				criteria.add(Restrictions.eq("parentMenuId", oldParentMenuId));
+			}
+
+			criteria.add(Restrictions.gt("column", oldColumn));
+			@SuppressWarnings("unchecked")
+			List<FunctionalMenuItem> menuItems1 = criteria.list();
+			for (FunctionalMenuItem menuItem : menuItems1) {
+				menuItem.column -= 1;
+				localSession.save(menuItem);
+			}
+			// Adjust the children under the new parent.
+			logger.debug(EELFLoggerDelegate.debugLogger, "about to adjust the children under the new parent");
+			logger.debug(EELFLoggerDelegate.debugLogger, "get all menu items where menuId!=" + menuId + "; parentMenuId==" + newParentMenuId
+					+ "; column>=" + newColumn);
+			criteria = localSession.createCriteria(FunctionalMenuItem.class);
+			criteria.add(Restrictions.ne("menuId", menuId));
+			if (newParentMenuId == null) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "newParentMenuId is null, so using isNull");
+				criteria.add(Restrictions.isNull("parentMenuId"));
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "newParentMenuId is NOT null, so using eq");
+				criteria.add(Restrictions.eq("parentMenuId", newParentMenuId));
+			}
+
+			criteria.add(Restrictions.ge("column", newColumn));
+			@SuppressWarnings("unchecked")
+			List<FunctionalMenuItem> menuItems2 = criteria.list();
+			if (menuItems2 != null) {
+				logger.debug(EELFLoggerDelegate.debugLogger, "found " + menuItems2.size() + " menu items");
+			} else {
+				logger.debug(EELFLoggerDelegate.debugLogger, "found null menu items");
+			}
+			for (FunctionalMenuItem menuItem : menuItems2) {
+				menuItem.column += 1;
+				localSession.save(menuItem);
+			}
+		}
+		logger.debug(EELFLoggerDelegate.debugLogger, "done with updateColumnForSiblings");
+	}
+
+	public void removeAppInfo(Session localSession, Long menuId) {
+		// Remove the url, role, and app info from a menu item
+		FunctionalMenuItem menuItem = (FunctionalMenuItem) localSession.get(FunctionalMenuItem.class, menuId);
+		menuItem.url = "";
+		deleteRoles(menuId);
+	}
+
+	public FieldsValidator editFunctionalMenuItem(FunctionalMenuItemWithRoles menuItemJson) {
+		boolean result 			= false;
+		Session localSession 	= null;
+		Transaction transaction = null;
+		Long menuId 			= menuItemJson.menuId;
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "LR: editFunctionalMenuItem: test 1");
+		FieldsValidator fieldsValidator = menuItemFieldsChecker(menuItemJson);
+		if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+			// TODO: make sure menuId is here. And, it might not already exist
+			// in db table.
+			if (menuId == null) {
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+				logger.error(EELFLoggerDelegate.errorLogger, "FunctionalMenuServiceImpl.editFunctionalMenuItem: bad request");
+			} else {
+				// To simplify the code, assume we will have a transaction
+				try {
+					localSession = sessionFactory.openSession();
+					transaction = localSession.beginTransaction();
+
+					// Get the existing info associated with menuItem from the DB
+					FunctionalMenuItem menuItem = (FunctionalMenuItem) localSession.get(FunctionalMenuItem.class, menuId);
+					Integer oldColumn = menuItem.column;
+					Integer oldParentMenuId = menuItem.parentMenuId;
+					Integer newColumn = menuItemJson.column;
+					Integer newParentMenuId = menuItemJson.parentMenuId;
+
+					logger.debug(EELFLoggerDelegate.debugLogger, "prev info: column: " + oldColumn + "; parentMenuId: " + oldParentMenuId);
+
+					if (menuItemJson.appid != null && menuItemJson.getRoles() != null && !menuItemJson.getRoles().isEmpty()
+							&& menuItemJson.url != null && !menuItemJson.url.isEmpty() && menuItemJson.text != null
+							&& !menuItemJson.text.isEmpty()) {
+						// Scenario: appid, roles, url and text are all non-null.
+						// This menu item is associated with an app.
+						// (Note: this should only occur for a bottom-level menu
+						// item with no children.)
+						// 1) Remove all the records from fn_menu_functional_role
+						// for this menuId.
+						// 2) Add records to the fn_menu_function_role table for the
+						// appId and each roleId
+						// 3) Update the url and text for this menu item.
+
+						// Because of foreign key constraints, delete the roles,
+						// then update the menuItem then add the roles.
+						deleteRoles(menuId);
+						// Assumption: this is not a Move, so don't change the
+						// parentMenuId and column.
+						menuItem.appid = menuItemJson.appid;
+						menuItem.setRoles(menuItemJson.getRoles());
+						menuItem.url = menuItemJson.url;
+						menuItem.text = menuItemJson.text;
+						
+						// If the app is disabled, deactivate the menu item.
+						Long appidLong = Long.valueOf(menuItemJson.appid);
+						EPApp app = (EPApp) localSession.get(EPApp.class, appidLong);
+						if (app != null && ! app.getEnabled()) {
+							menuItem.active_yn = "N";
+						} else {
+							menuItem.active_yn = "Y";
+						}
+
+
+						localSession.update(menuItem);
+						addRoles(menuItemJson, localSession);
+
+					} else if (menuItemJson.appid == null && (menuItemJson.getRoles() == null || menuItemJson.getRoles().isEmpty())
+							&& (menuItemJson.url == null || menuItemJson.url.isEmpty()) && menuItemJson.text != null
+							&& !menuItemJson.text.isEmpty()) {
+						// Scenario: appid, roles and url are all null; text is
+						// non-null.
+						// This menu item is NOT associated with an app.
+						// 1) Remove all the records from fn_menu_functional_role
+						// for this menuId
+						// (in case it was previously associated with an app).
+						// 2) Update the text for this menu item.
+						// 3) Set the url to ""
+						deleteRoles(menuId);
+						// Assumption: this is not a Move, so don't change the
+						// parentMenuId and column.
+						menuItem.text = menuItemJson.text;
+						menuItem.url = "";
+						menuItem.active_yn = "Y";
+						localSession.update(menuItem);
+
+					} else if (newColumn != null) {
+						// This is a "move" request.
+						// Menu item has been moved to a different position under
+						// the same parent, or under a new parent.
+						logger.debug(EELFLoggerDelegate.debugLogger, "Doing a move operation.");
+						if (parentMenuIdEqual(oldParentMenuId, newParentMenuId)) {
+							// The parent is the same. We have just changed the
+							// column
+							logger.debug(EELFLoggerDelegate.debugLogger, "moving under the same parent");
+							menuItem.column = newColumn;
+							localSession.update(menuItem);
+						} else {
+							logger.debug(EELFLoggerDelegate.debugLogger, "moving under a different parent");
+							menuItem.parentMenuId = newParentMenuId;
+							menuItem.column = newColumn;
+							localSession.update(menuItem);
+							// If we are moving under a new parent, must delete any
+							// app/role info from
+							// the new parent, since it is no longer a leaf menu
+							// item and cannot have app info
+							// associated with it. The front end will have warned
+							// the user and gotten confirmation.
+							if (menuItemJson.parentMenuId != null) {
+								Long parentMenuIdLong = new Long(menuItemJson.parentMenuId);
+								removeAppInfo(localSession, parentMenuIdLong);
+								// deleteRoles(parentMenuIdLong);
+							}
+						}
+						// must update the column for all old and new sibling menu
+						// items
+						updateColumnForSiblings(localSession, menuId, oldParentMenuId, newParentMenuId, oldColumn,
+								newColumn);
+					}
+
+					transaction.commit();
+					logger.debug(EELFLoggerDelegate.debugLogger, "LR: editFunctionalMenuItem: finished committing transaction");
+					result = true;
+				} catch (Exception e) {
+					EcompPortalUtils.rollbackTransaction(transaction,
+							"createFunctionalMenuItem rollback, exception = " + e);
+					logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+				} finally {
+					EcompPortalUtils.closeLocalSession(localSession, "editFunctionalMenuItem");
+				}
+				
+				if (result) {
+				} else {
+					logger.debug(EELFLoggerDelegate.debugLogger, "LR: createFunctionalMenuItem: no result. setting httpStatusCode to "
+							+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+				}
+			}
+		}	
+		
+		return fieldsValidator;
+	}
+
+	public FieldsValidator deleteFunctionalMenuItem(Long menuId) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		logger.debug(EELFLoggerDelegate.debugLogger, "LR: deleteFunctionalMenuItem: test 1");
+		boolean result = false;
+		Session localSession = null;
+		Transaction transaction = null;
+
+		try {
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+			// We must turn off foreign keys before deleting a menu item. Otherwise there will be a 
+			// constraint violation from the ancestors table.
+			setForeignKeys(localSession, false);
+			deleteRoles(menuId);
+			logger.debug(EELFLoggerDelegate.debugLogger, "deleteFunctionalMenuItem: after deleting roles");
+			deleteFavorites(menuId);
+			logger.debug(EELFLoggerDelegate.debugLogger, "deleteFunctionalMenuItem: after deleting favorites");
+			localSession.delete(localSession.get(FunctionalMenuItem.class, menuId));
+			logger.debug(EELFLoggerDelegate.debugLogger, "deleteFunctionalMenuItem: about to commit");
+			transaction.commit();
+			result = true;
+		} catch (Exception e) {
+			EcompPortalUtils.rollbackTransaction(transaction,
+					"deleteFunctionalMenuItem rollback, exception = " + e);
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		} finally {
+			EcompPortalUtils.closeLocalSession(localSession, "deleteFunctionalMenuItem");
+		}
+		if (result) {
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger, "LR: deleteFunctionalMenuItem: no result. setting httpStatusCode to "
+					+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+	
+	// Regenerate the fn_menu_functional_ancestors table, which is used
+	// by the queries that return the functional menu items.
+	public FieldsValidator regenerateAncestorTable() {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		Session localSession = null;
+		Transaction transaction = null;
+
+		try {
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+			String sql = "DELETE FROM fn_menu_functional_ancestors";
+			logQuery(sql);
+			Query query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+			logger.debug(EELFLoggerDelegate.debugLogger, "regenerateAncestorTable: finished query 1");
+			
+			sql = "ALTER TABLE fn_menu_functional_ancestors AUTO_INCREMENT=1";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+			logger.debug(EELFLoggerDelegate.debugLogger, "regenerateAncestorTable: reset AUTO_INCREMENT to 1");
+
+			int depth = 0;
+			sql = "INSERT INTO fn_menu_functional_ancestors(menu_id, ancestor_menu_id, depth) "
+					+ "SELECT m.menu_id, m.menu_id, " + depth + " FROM fn_menu_functional m";
+			logQuery(sql);
+			query = localSession.createSQLQuery(sql);
+			query.executeUpdate();
+			logger.debug(EELFLoggerDelegate.debugLogger, "regenerateAncestorTable: finished query 2");
+			for (depth = 0; depth < 3; depth++) {
+				int depthPlusOne = depth + 1;
+				sql = "INSERT INTO fn_menu_functional_ancestors(menu_id, ancestor_menu_id, depth) "
+						+ " SELECT a.menu_id, m.parent_menu_id, " + depthPlusOne
+						+ " FROM fn_menu_functional m, fn_menu_functional_ancestors a " + " WHERE a.depth='" + depth
+						+ "' AND " + " a.ancestor_menu_id = m.menu_id AND " + " m.parent_menu_id != '-1'";
+				logQuery(sql);
+				query = localSession.createSQLQuery(sql);
+				query.executeUpdate();
+			}
+			logger.debug(EELFLoggerDelegate.debugLogger, "regenerateAncestorTable: finished query 3");
+			transaction.commit();
+		} catch (Exception e) {
+			EcompPortalUtils.rollbackTransaction(transaction,
+					"regenerateAncestorTable rollback, exception = " + e);
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		} finally {
+			EcompPortalUtils.closeLocalSession(localSession, "regenerateAncestorTable");
+		}
+		return fieldsValidator;
+	}
+
+	private void logQuery(String sql) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql);
+	}
+
+	public FieldsValidator setFavoriteItem(FavoritesFunctionalMenuItem menuItemJson) {
+		boolean result = false;
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		
+		Session localSession = null;
+		Transaction transaction = null;
+		
+		try {
+            logger.debug(EELFLoggerDelegate.debugLogger, String.format("Before adding favorite for user id:{0} and menu id:{1} ",menuItemJson.userId,menuItemJson.menuId));
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+			localSession.save(menuItemJson);
+			transaction.commit();				
+			result = true;
+            logger.debug(EELFLoggerDelegate.debugLogger, String.format("After adding favorite for user id:{0} and menu id:{1} ",menuItemJson.userId,menuItemJson.menuId));								
+		} catch (Exception e) {
+			EcompPortalUtils.rollbackTransaction(transaction,"setFavoriteItem rollback, exception = " + e);
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		} finally {
+			EcompPortalUtils.closeLocalSession(localSession, "setFavoriteItem");
+		}											
+		
+		if(result) {
+		}
+		else {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		
+		return fieldsValidator;
+	}
+	
+	public List<FavoritesFunctionalMenuItemJson> getFavoriteItems(Long userId) {		
+		try {
+			logger.debug(EELFLoggerDelegate.debugLogger, "Before getting favorites for user id: " + userId);
+			
+			// Divide this into 2 queries: one which returns the favorites items associated with Restricted apps,
+			// and one that returns all the other favorites items. Then we can easily add the boolean flag
+			// restrictedApp to each FavoritesFunctionalMenuItemJson, to be used by the front end.
+
+			String sql = "SELECT f.user_id,f.menu_id,m.text,m.url "
+					+ " FROM fn_menu_favorites f, fn_menu_functional m, fn_menu_functional_roles mr "
+					+ " WHERE f.user_id='" + userId + "' AND f.menu_id = m.menu_id "
+					+ " AND f.menu_id = mr.menu_id "
+					+ " AND mr.role_id = '" + RESTRICTED_APP_ROLE_ID + "' ";
+
+			@SuppressWarnings("unchecked")
+			List<FavoritesFunctionalMenuItemJson> menuItems = dataAccessService.executeSQLQuery(sql, FavoritesFunctionalMenuItemJson.class, null);
+			for (FavoritesFunctionalMenuItemJson menuItem : menuItems) {
+				menuItem.restrictedApp = true;
+			}
+			
+			sql = "SELECT DISTINCT f.user_id,f.menu_id,m.text,m.url "
+					+ " FROM fn_menu_favorites f, fn_menu_functional m, fn_menu_functional_roles mr "
+					+ " WHERE f.user_id='" + userId + "' AND f.menu_id = m.menu_id "
+					+ " AND f.menu_id = mr.menu_id "
+					+ " AND mr.role_id != '" + RESTRICTED_APP_ROLE_ID + "' ";
+			@SuppressWarnings("unchecked")
+			List<FavoritesFunctionalMenuItemJson> menuItems2 = dataAccessService.executeSQLQuery(sql, FavoritesFunctionalMenuItemJson.class, null);
+			for (FavoritesFunctionalMenuItemJson menuItem : menuItems2) {
+				menuItem.restrictedApp = false;
+				menuItems.add(menuItem);
+			}
+			
+			return menuItems;
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred in FunctionalMenuServiceImpl.getFavoriteItems. Details: " + EcompPortalUtils.getStackTrace(e));
+			List<FavoritesFunctionalMenuItemJson> menuItems = new ArrayList<FavoritesFunctionalMenuItemJson>();
+			return menuItems;
+		}																	
+	}
+	
+	public FieldsValidator removeFavoriteItem(Long userId, Long menuId) {
+		boolean result = false;
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		
+		Session localSession = null;
+		Transaction transaction = null;
+		
+		try {			
+			
+			FavoritesFunctionalMenuItem menuItemJson = new FavoritesFunctionalMenuItem();
+			menuItemJson.userId = userId;
+			menuItemJson.menuId = menuId;
+			
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+			localSession.delete(menuItemJson);
+			localSession.flush();
+			transaction.commit();				
+			result = true;
+			logger.debug(EELFLoggerDelegate.debugLogger, String.format("After removing favorite for user id: " + userId + "; menu id: " + menuId));								
+		} catch (Exception e) {
+			EcompPortalUtils.rollbackTransaction(transaction,"removeFavoriteItem rollback, exception = " + e);
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		} finally {								
+			EcompPortalUtils.closeLocalSession(localSession, "removeFavoriteItem");
+		}											
+		
+		if(result) {
+		}
+		else {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		
+		return fieldsValidator;
+	}
+	
+	@Override
+	public void assignHelpURLs(List<FunctionalMenuItem> menuItems) {
+		try {
+			String user_guide_link = SystemProperties.getProperty(EPCommonSystemProperties.USER_GUIDE_URL);
+			
+			for(FunctionalMenuItem menuItem: menuItems){
+				if(menuItem.text.equalsIgnoreCase("Contact Us")){
+					menuItem.setUrl("contactUs");
+					//menuItem.setRestrictedApp(true);
+				}
+				if(menuItem.text.equalsIgnoreCase("Get Access")) {
+					menuItem.setUrl("getAccess");
+				}
+				if(menuItem.text.equalsIgnoreCase("User Guide")) {
+					menuItem.setUrl(user_guide_link);
+					menuItem.setRestrictedApp(true);
+				}
+			}
+		} catch (Exception e) {		
+			logger.error(EELFLoggerDelegate.errorLogger, "assignHelpURLs process failed. Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		
+	}
+
+	public List<FunctionalMenuRole> getFunctionalMenuRole() {
+		String sql = "SELECT * from fn_menu_functional_roles";
+		logQuery(sql);
+		logger.debug(EELFLoggerDelegate.debugLogger, "getFunctionalMenuRole: logged the query");
+
+		@SuppressWarnings("unchecked")
+		List<FunctionalMenuRole> functionalMenuRole = dataAccessService.executeSQLQuery(sql, FunctionalMenuRole.class, null);
+		
+		return functionalMenuRole;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<BusinessCardApplicationRole> getUserAppRolesList(String userId) {
+		Map<String, String> params = new HashMap<>();
+		params.put("userId", userId);
+
+		List<BusinessCardApplicationRole> userAppRoles = null;
+		try {
+			userAppRoles = dataAccessService
+					.executeNamedQuery("getUserApproles", params, null);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			logger.error(EELFLoggerDelegate.errorLogger, "getUserAppRolesList failed", e);
+		}		
+		return userAppRoles;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/GetAccessService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/GetAccessService.java
new file mode 100644
index 00000000..8b5e72e5
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/GetAccessService.java
@@ -0,0 +1,33 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.GetAccessResult;
+
+public interface GetAccessService {
+	/**
+	 * @return One entry per application function AND role; i.e., each application
+	 *         appears many times.
+	 */
+	List<GetAccessResult> getAppAccessList(EPUser user);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/GetAccessServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/GetAccessServiceImpl.java
new file mode 100644
index 00000000..37af1dab
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/GetAccessServiceImpl.java
@@ -0,0 +1,61 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.GetAccessResult;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("getAccessService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class GetAccessServiceImpl implements GetAccessService{
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.GetAccessService#getAppAccessList()
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<GetAccessResult> getAppAccessList(EPUser user) {
+		final Map<String, Long> params = new HashMap<>();
+		List<GetAccessResult> appAccessList = null;
+		params.put("userId", user.getId());
+		appAccessList = dataAccessService
+				.executeNamedQuery("getAppAccessFunctionRole", params, null);
+		return appAccessList;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ManifestService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ManifestService.java
new file mode 100644
index 00000000..7a10568d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ManifestService.java
@@ -0,0 +1,33 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.io.IOException;
+import java.util.jar.Attributes;
+
+public interface ManifestService {
+	/**
+	 * Gets the content of the webapp manifest file META-INF/MANIFEST.MF.
+	 *
+	 * @return Attributes object with key-value pairs from the manifest
+	 * @throws IOException
+	 */
+	public Attributes getWebappManifest() throws IOException;
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ManifestServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ManifestServiceImpl.java
new file mode 100644
index 00000000..3d0f34a2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/ManifestServiceImpl.java
@@ -0,0 +1,62 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
+import javax.servlet.ServletContext;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("manifestService")
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class ManifestServiceImpl implements ManifestService {
+	@Autowired
+	ServletContext context;
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.ManifestService#getWebappManifest()
+	 */
+	public Attributes getWebappManifest() throws IOException {
+		EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ManifestServiceImpl.class);
+		// Path to resource on classpath
+		final String MANIFEST_RESOURCE_PATH = "/META-INF/MANIFEST.MF";
+		// Manifest is formatted as Java-style properties
+		try {
+			InputStream inputStream = context.getResourceAsStream(MANIFEST_RESOURCE_PATH);
+			Manifest manifest = new Manifest(inputStream);
+			inputStream.close();
+			return manifest.getMainAttributes();
+		} catch (IOException e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getWebappManifest: failed to read/find manifest");
+			throw e;
+		}
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceProxyService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceProxyService.java
new file mode 100644
index 00000000..00fc9ad8
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceProxyService.java
@@ -0,0 +1,59 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.springframework.web.client.RestClientException;
+
+public interface MicroserviceProxyService {
+
+	/**
+	 * Gets the specific microservice from table ep_microservice, communicates
+	 * to microservice with the specified security type. The microservice sends
+	 * back the response.
+	 * 
+	 * Gets the data while testing the microservice with no widget associated with
+	 * 
+	 * @param serviceId
+	 *            Id of microservice to be used
+	 * @return response sent from microservice
+	 * @throws Exception
+	 */
+	String proxyToDestination(long serviceId, EPUser user, HttpServletRequest request) throws Exception;
+	
+	
+	
+	/**
+	 * Gets the microservice data based on the user id and widget id. Different
+	 * users have his/her own parameters for one widget. The method sends back
+	 * the response.
+	 * 
+	 * @param widgetId
+	 * 			  Id of widget to be used
+	 * @param user
+	 * 			  User information
+	 * @param request
+	 * @return response sent from microserivce 
+	 * @throws Exception
+	 */
+	String proxyToDestinationByWidgetId(long widgetId, EPUser user, HttpServletRequest request) throws Exception;
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceProxyServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceProxyServiceImpl.java
new file mode 100644
index 00000000..3a520c88
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceProxyServiceImpl.java
@@ -0,0 +1,222 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.codec.binary.Base64;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.MicroserviceData;
+import org.openecomp.portalapp.portal.domain.MicroserviceParameter;
+import org.openecomp.portalapp.portal.domain.WidgetCatalog;
+import org.openecomp.portalapp.portal.domain.WidgetCatalogParameter;
+import org.openecomp.portalapp.portal.domain.WidgetServiceHeaders;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+@Service("microserviceProxyService")
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class MicroserviceProxyServiceImpl implements MicroserviceProxyService {
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MicroserviceProxyServiceImpl.class);
+	private static final String BASIC_AUTH = "Basic Authentication";
+	private static final String NO_AUTH = "No Authentication";
+	private static final String COOKIE_AUTH = "Cookie based Authentication";
+	private static final String QUESTION_MARK = "?";
+	private static final String ADD_MARK = "&";
+
+	String whatService = "widgets-service";
+
+	@Autowired
+	private ConsulHealthService consulHealthService;
+	
+	@Autowired
+	MicroserviceService microserviceService;
+
+	@Autowired
+	WidgetParameterService widgetParameterService;
+
+	RestTemplate template = new RestTemplate();
+
+	@Override
+	public String proxyToDestination(long serviceId, EPUser user, HttpServletRequest request) throws Exception {
+
+		String response = null;
+		
+		// get the microservice object by the id
+		MicroserviceData data = microserviceService.getMicroserviceDataById(serviceId);
+
+		// No such microservice available
+		if (data == null) {
+			return response;
+		}
+		List<MicroserviceParameter> params = data.getParameterList();
+		if (data.getSecurityType().equals(NO_AUTH)) {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+			String url = microserviceUrlConverter(data, params);
+			response = template.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+
+		} else if (data.getSecurityType().equals(BASIC_AUTH)) {
+			// encoding the username and password
+			String plainCreds = data.getUsername() + ":" + decryptedPassword(data.getPassword());
+			byte[] plainCredsBytes = plainCreds.getBytes();
+			byte[] base64CredsBytes = Base64.encodeBase64(plainCredsBytes);
+			String base64Creds = new String(base64CredsBytes);
+
+			HttpHeaders headers = new HttpHeaders();
+			headers.add("Authorization", "Basic " + base64Creds);
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+			String url = microserviceUrlConverter(data, params);
+			response = template.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+		} else if (data.getSecurityType().equals(COOKIE_AUTH)) {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			String rawCookie = request.getHeader("Cookie");
+			headers.add("Cookie", rawCookie);
+			HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+			String url = microserviceUrlConverter(data, params);
+			response = template.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+		}
+		return response;
+	}
+	
+	@Override
+	public String proxyToDestinationByWidgetId(long widgetId, EPUser user, HttpServletRequest request) throws Exception {
+
+		String response = null;
+		
+		ResponseEntity<Long> ans = (ResponseEntity<Long>) template.exchange(
+				"https://" + consulHealthService.getServiceLocation(whatService)
+						+ "/widget/microservices/widgetCatalog/parameters/" + widgetId,
+				HttpMethod.GET, new HttpEntity(WidgetServiceHeaders.getInstance()), Long.class);
+		Long serviceId = ans.getBody();
+		
+		// get the microservice object by the id
+		MicroserviceData data = microserviceService.getMicroserviceDataById(serviceId);
+
+		// No such microservice available
+		if (data == null) {
+			return response;
+		}
+
+		List<MicroserviceParameter> params = data.getParameterList();
+
+		for (MicroserviceParameter p : params) {
+			WidgetCatalogParameter userValue = widgetParameterService.getUserParamById(widgetId, user.getId(), p.getId());
+			if (userValue != null)
+				p.setPara_value(userValue.getUser_value());
+		}
+
+		if (data.getSecurityType().equals(NO_AUTH)) {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+			String url = microserviceUrlConverter(data, params);
+			try {
+				response = template.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+			} catch (HttpClientErrorException e) {
+				throw e;
+			}
+		} else if (data.getSecurityType().equals(BASIC_AUTH)) {
+			// encoding the username and password
+			String plainCreds = data.getUsername() + ":" + decryptedPassword(data.getPassword());
+			byte[] plainCredsBytes = plainCreds.getBytes();
+			byte[] base64CredsBytes = Base64.encodeBase64(plainCredsBytes);
+			String base64Creds = new String(base64CredsBytes);
+
+			HttpHeaders headers = new HttpHeaders();
+			headers.add("Authorization", "Basic " + base64Creds);
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+			String url = microserviceUrlConverter(data, params);
+			try {
+				response = template.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+			} catch (HttpClientErrorException e) {
+				throw e;
+			}
+		} else if (data.getSecurityType().equals(COOKIE_AUTH)) {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setContentType(MediaType.APPLICATION_JSON);
+			String rawCookie = request.getHeader("Cookie");
+			headers.add("Cookie", rawCookie);
+			HttpEntity<String> entity = new HttpEntity<String>(headers);
+
+			String url = microserviceUrlConverter(data, params);
+			try {
+				response = template.exchange(url, HttpMethod.GET, entity, String.class).getBody();
+			} catch (HttpClientErrorException e) {
+				throw e;
+			}
+		}
+		return response;
+	}
+
+	private String decryptedPassword(String encryptedPwd) throws Exception {
+		String result = "";
+		if (encryptedPwd != null & encryptedPwd.length() > 0) {
+			try {
+				result = CipherUtil.decrypt(encryptedPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e);
+				throw e;
+			}
+		}
+		return result;
+	}
+
+	private String microserviceUrlConverter(MicroserviceData data, List<MicroserviceParameter> params) {
+		String url = data.getUrl();
+		for (int i = 0; i < params.size(); i++) {
+			if (i == 0) {
+				url += QUESTION_MARK;
+			}
+			url += params.get(i).getPara_key() + "=" + params.get(i).getPara_value();
+			if (i != (params.size() - 1)) {
+				url += ADD_MARK;
+			}
+		}
+		return url;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceService.java
new file mode 100644
index 00000000..cfc7ddb1
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceService.java
@@ -0,0 +1,86 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.MicroserviceData;
+import org.openecomp.portalapp.portal.domain.MicroserviceParameter;
+
+public interface MicroserviceService {
+
+	/**
+	 * Get all microservices from the ep_microservice
+	 * 
+	 * @return list of all microservices
+	 * @throws Exception
+	 */
+	List<MicroserviceData> getMicroserviceData() throws Exception;
+
+	/**
+	 * Gets the specified microservice with id from ep_microservice
+	 * 
+	 * @param id
+	 *            ID of microservice to be fetched
+	 * @return the microservice with the specified id
+	 */
+	MicroserviceData getMicroserviceDataById(long id);
+
+	/**
+	 * Saves the specified microservice to the table ep_microservice
+	 * 
+	 * @param newService
+	 *            Content of microservice to be saved
+	 * @return new microservice id
+	 * @throws Exception
+	 */
+	Long saveMicroservice(MicroserviceData newService) throws Exception;
+
+	void saveServiceParameters(long serviceId, List<MicroserviceParameter> list) throws Exception;
+
+	/**
+	 * Deletes the specified microservice from all tables where the serviceId is
+	 * used
+	 * 
+	 * @param serviceId
+	 * @throws Exception
+	 */
+	void deleteMicroservice(long serviceId) throws Exception;
+
+	/**
+	 * Updates the specified microservice from all tables where the serviceId is
+	 * used
+	 * 
+	 * @param serviceId
+	 *            Id of microservice to be updated
+	 * @param newService
+	 *            Content of microservice to be updated
+	 * @throws Exception
+	 */
+	void updateMicroservice(long serviceId, MicroserviceData newService) throws Exception;
+	
+	/**
+	 * Gets the Service parameters by the service Id
+	 * @param serviceId
+	 * @return
+	 */
+	List<MicroserviceParameter> getParametersById(long serviceId);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java
new file mode 100644
index 00000000..c0a2fa41
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java
@@ -0,0 +1,212 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.openecomp.portalapp.portal.domain.BasicAuthCredentials;
+import org.openecomp.portalapp.portal.domain.EPUserAppRolesRequestDetail;
+import org.openecomp.portalapp.portal.domain.MicroserviceData;
+import org.openecomp.portalapp.portal.domain.MicroserviceParameter;
+import org.openecomp.portalapp.portal.domain.WidgetCatalog;
+import org.openecomp.portalapp.portal.domain.WidgetServiceHeaders;
+import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.transport.CommonWidgetMeta;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service("microserviceService")
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class MicroserviceServiceImpl implements MicroserviceService {
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MicroserviceServiceImpl.class);
+
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	@Autowired
+	private SessionFactory sessionFactory;
+
+	public Long saveMicroservice(MicroserviceData newService) throws Exception {
+		if (newService.getPassword() != null)
+			newService.setPassword(encryptedPassword(newService.getPassword()));
+		getDataAccessService().saveDomainObject(newService, null);
+		return newService.getId();
+	}
+
+	public void saveServiceParameters(long serviceId, List<MicroserviceParameter> list) throws Exception {
+		for (int i = 0; i < list.size(); i++) {
+			MicroserviceParameter para = list.get(i);
+			para.setServiceId(serviceId);
+			getDataAccessService().saveDomainObject(para, null);
+		}
+	}
+
+	@Override
+	public MicroserviceData getMicroserviceDataById(long id) {
+		MicroserviceData data = null;
+		try {
+			data = (MicroserviceData) dataAccessService
+					.getList(MicroserviceData.class, " where id = '" + id + "'", null, null).get(0);
+			data.setParameterList(getServiceParameters(id));
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "getMicroserviceDataById failed", e);
+			throw e;
+		}
+		return data;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<MicroserviceData> getMicroserviceData() throws Exception {
+		List<MicroserviceData> list = (List<MicroserviceData>) dataAccessService.getList(MicroserviceData.class, null);
+		for (int i = 0; i < list.size(); i++) {
+			if (list.get(i).getPassword() != null)
+				list.get(i).setPassword(decryptedPassword(list.get(i).getPassword()));
+			list.get(i).setParameterList(getServiceParameters(list.get(i).getId()));
+		}
+		return list;
+	}
+
+	@SuppressWarnings("unchecked")
+	private List<MicroserviceParameter> getServiceParameters(long serviceId) {
+		List<MicroserviceParameter> list = (List<MicroserviceParameter>) dataAccessService
+				.getList(MicroserviceParameter.class, " where service_id = '" + serviceId + "'", null, null);
+		return list;
+	}
+
+	@Override
+	public void deleteMicroservice(long serviceId) throws Exception {
+
+		try {
+			Map<String, String> params = new HashMap<String, String>();
+			params.put("serviceId", Long.toString(serviceId));
+
+			dataAccessService.executeNamedQuery("deleteMicroserviceParameter", params, null);
+			dataAccessService.executeNamedQuery("deleteMicroservice", params, null);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error(EELFLoggerDelegate.errorLogger, "deleteMicroservice failed", e);
+			throw e;
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void updateMicroservice(long serviceId, MicroserviceData newService) throws Exception {
+		try {
+			newService.setId(serviceId);
+			if (newService.getPassword() != null)
+				newService.setPassword(encryptedPassword(newService.getPassword()));
+			getDataAccessService().saveDomainObject(newService, null);
+			List<MicroserviceParameter> oldService = getServiceParameters(serviceId);
+			boolean foundParam;
+			for (int i = 0; i < oldService.size(); i++) {
+				foundParam = false;
+				for (int n = 0; n < newService.getParameterList().size(); n++) {
+					if (newService.getParameterList().get(n).getId() == oldService.get(i).getId()) {
+						foundParam = true;
+						break;
+					}
+				}
+				if (foundParam == false) {
+					MicroserviceParameter pd = oldService.get(i);
+					Session localSession = sessionFactory.openSession();
+					localSession.delete(pd);
+					localSession.flush();
+					localSession.clear();
+				}
+
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "updateMicroservice failed", e);
+			throw e;
+		}
+		saveServiceParameters(serviceId, newService.getParameterList());
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<MicroserviceParameter> getParametersById(long serviceId) {
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion contextIdCrit = Restrictions.eq("serviceId", serviceId);
+		restrictionsList.add(contextIdCrit);
+		List<MicroserviceParameter> list = (List<MicroserviceParameter>) dataAccessService
+				.getList(MicroserviceParameter.class, null, restrictionsList, null);
+		logger.debug(EELFLoggerDelegate.debugLogger,
+				"getParametersById: microservice parameters list size: " + list.size());
+		return list;
+	}
+
+	private String decryptedPassword(String encryptedPwd) throws Exception {
+		String result = "";
+		if (encryptedPwd != null & encryptedPwd.length() > 0) {
+			try {
+				result = CipherUtil.decrypt(encryptedPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e);
+				throw e;
+			}
+		}
+		return result;
+	}
+
+	private String encryptedPassword(String decryptedPwd) throws Exception {
+		String result = "";
+		if (decryptedPwd != null & decryptedPwd.length() > 0) {
+			try {
+				result = CipherUtil.encrypt(decryptedPwd,
+						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "encryptedPassword failed", e);
+				throw e;
+			}
+		}
+		return result;
+	}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserAppService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserAppService.java
new file mode 100644
index 00000000..7874fa74
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserAppService.java
@@ -0,0 +1,42 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+public interface PersUserAppService {
+
+	/**
+	 * Sets the appropriate code in the user personalization table to indicate
+	 * the application is (de)selected and/or pending.
+	 * 
+	 * @param user
+	 *            EP User
+	 * @param app
+	 *            EP Application
+	 * @param select
+	 *            True or false
+	 * @param select
+	 *            True or false
+	 */
+	void setPersUserAppValue(EPUser user, EPApp app, boolean select, boolean pending);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserAppServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserAppServiceImpl.java
new file mode 100644
index 00000000..6ff10ab4
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserAppServiceImpl.java
@@ -0,0 +1,141 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserApp;
+import org.openecomp.portalapp.portal.domain.PersUserAppSelection;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("persUserAppService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class PersUserAppServiceImpl implements PersUserAppService {
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PersUserAppServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+	@Autowired
+	private AdminRolesService adminRolesService;
+	@Autowired
+	private UserRolesService userRolesService;
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.UserAppSelectService#
+	 * setAppCatalogSelection(org.openecomp.portalapp.portal.domain.EPUser,
+	 * org.openecomp.portalapp.portal.transport.AppCatalogSelection)
+	 */
+	@Override
+	public void setPersUserAppValue(EPUser user, EPApp app, boolean select, boolean pending) {
+		if (user == null || app == null)
+			throw new IllegalArgumentException("setPersUserAppValue: Null values");
+
+		// Find the record for this user-app combo, if any
+		String filter = " where user_id = " + Long.toString(user.getId()) + " and app_id = "
+				+ Long.toString(app.getId());
+		@SuppressWarnings("unchecked")
+		List<PersUserAppSelection> persList = dataAccessService.getList(PersUserAppSelection.class, filter, null, null);
+
+		// Key constraint limits to 1 row
+		PersUserAppSelection persRow = null;
+		if (persList.size() == 1)
+			persRow = persList.get(0);
+		else
+			persRow = new PersUserAppSelection(null, user.getId(), app.getId(), null);
+
+		if (app.getOpen()) {
+			// Pending status is not meaningful for open apps.
+			if (pending)
+				logger.error(EELFLoggerDelegate.errorLogger,
+						"setPersUserAppValue: invalid request, ignoring set-pending for open app");
+
+			// Open apps have same behavior for regular and admin users
+			if (select) {
+				// Selection of an open app requires a record
+				persRow.setStatusCode("S"); // show
+				dataAccessService.saveDomainObject(persRow, null);
+			} else {
+				// De-selection of an open app requires no record
+				if (persRow.getId() != null)
+					dataAccessService.deleteDomainObject(persRow, null);
+			}
+		} else {
+			// Non-open app.
+
+			// Pending overrides select.
+			if (pending) {
+				persRow.setStatusCode("P");
+				dataAccessService.saveDomainObject(persRow, null);
+			} else {
+				// Behavior depends on Portal (super) admin status, bcos an
+				// admin can force an app onto the dashboard.
+				boolean isPortalAdmin = adminRolesService.isSuperAdmin(user);
+				boolean adminUserHasAppRole = false;
+				if (isPortalAdmin) {
+					List<EPUserApp> roles = userRolesService.getCachedAppRolesForUser(app.getId(), user.getId());
+					adminUserHasAppRole = (roles.size() > 0);
+					logger.debug(EELFLoggerDelegate.debugLogger, "setPersUserAppValue: app {}, admin user {}, role count {}",
+							app.getId(), user.getId(), roles.size());
+				}
+
+				if (select) {
+					if (isPortalAdmin && !adminUserHasAppRole) {
+						// The special case: portal admin, no role
+						persRow.setStatusCode("S"); // show
+						dataAccessService.saveDomainObject(persRow, null);
+					} else {
+						// User has role-based access to the app.
+						// Showing an accessible app requires no record.
+						if (persRow.getId() != null)
+							dataAccessService.deleteDomainObject(persRow, null);
+					}
+				} // select
+				else {
+					if (isPortalAdmin && !adminUserHasAppRole) {
+						// The special case: portal admin, no role
+						if (persRow.getId() != null)
+							dataAccessService.deleteDomainObject(persRow, null);
+					} else {
+						// User has role-based access to the app.
+						// Hiding an accessible app requires a record
+						persRow.setStatusCode("H"); // hide
+						dataAccessService.saveDomainObject(persRow, null);
+					}
+				} // deselect
+			}
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserWidgetService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserWidgetService.java
new file mode 100644
index 00000000..d3a46d98
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserWidgetService.java
@@ -0,0 +1,41 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+public interface PersUserWidgetService {
+	
+	/**
+	 * Sets the appropriate code in the user personalization table to indicate
+	 * the application is (de)selected and/or pending.
+	 * 
+	 * @param user
+	 *            EP User
+	 * @param app
+	 *            EP Application
+	 * @param select
+	 *            True or false
+	 * @param select
+	 *            True or false
+	 */
+	void setPersUserAppValue(EPUser user, Long widgetId, boolean select);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserWidgetServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserWidgetServiceImpl.java
new file mode 100644
index 00000000..9a45dea6
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PersUserWidgetServiceImpl.java
@@ -0,0 +1,81 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.PersUserWidgetSelection;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("persUserWidgetService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class PersUserWidgetServiceImpl implements PersUserWidgetService{
+	
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PersUserAppServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+	
+	@Override
+	public void setPersUserAppValue(EPUser user, Long widgetId, boolean select) {
+		if (user == null || widgetId == null)
+			throw new IllegalArgumentException("setPersUserAppValue: Null values");
+
+		String filter = " where user_id = " + Long.toString(user.getId()) + " and widget_id = "
+				+ Long.toString(widgetId);
+		@SuppressWarnings("unchecked")
+		List<PersUserWidgetSelection> persList = dataAccessService.getList(PersUserWidgetSelection.class, filter, null, null);
+
+		// Key constraint limits to 1 row
+		PersUserWidgetSelection persRow = null;
+		if (persList.size() == 1){
+			persRow = persList.get(0);
+		}
+		else {
+			persRow = new PersUserWidgetSelection(null, user.getId(), widgetId, null);
+		}			
+		if(select){
+			if (persRow.getId() != null){
+				dataAccessService.deleteDomainObject(persRow, null);				
+			}
+			persRow.setStatusCode("S"); // show
+			dataAccessService.saveDomainObject(persRow, null);			
+		} else{
+			if (persRow.getId() != null){
+				dataAccessService.deleteDomainObject(persRow, null);
+			} 
+			persRow.setStatusCode("H"); // Hide
+			dataAccessService.saveDomainObject(persRow, null);			
+		}
+		
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminService.java
new file mode 100644
index 00000000..55b3afd6
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminService.java
@@ -0,0 +1,31 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.PortalAdmin;
+
+public interface PortalAdminService {
+	List<PortalAdmin> getPortalAdmins ();
+	FieldsValidator createPortalAdmin(String orgUserId);
+	FieldsValidator deletePortalAdmin(Long userId);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java
new file mode 100644
index 00000000..639bfc4c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/PortalAdminServiceImpl.java
@@ -0,0 +1,210 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.PortalAdmin;
+import org.openecomp.portalapp.portal.transport.PortalAdminUserRole;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Service("portalAdminService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class PortalAdminServiceImpl implements PortalAdminService {
+
+	private String SYS_ADMIN_ROLE_ID = "1";
+	private String ECOMP_APP_ID = "1";
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PortalAdminServiceImpl.class);
+
+	@Autowired
+	private SessionFactory sessionFactory;
+	@Autowired
+	private DataAccessService dataAccessService;
+	@Autowired
+	SearchService searchService;
+
+	@PostConstruct
+	private void init() {
+		SYS_ADMIN_ROLE_ID = SystemProperties.getProperty(SystemProperties.SYS_ADMIN_ROLE_ID);
+		ECOMP_APP_ID = SystemProperties.getProperty(EPCommonSystemProperties.ECOMP_APP_ID);
+	}
+
+	public List<PortalAdmin> getPortalAdmins() {
+		try {
+			String sql = "SELECT u.user_id, u.first_name, u.last_name, u.login_id "
+					+ " FROM fn_user u, fn_user_role ur WHERE u.user_id = ur.user_id AND ur.role_id="
+					+ SYS_ADMIN_ROLE_ID;
+			logQuery(sql);
+
+			@SuppressWarnings("unchecked")
+			List<PortalAdmin> portalAdmins = dataAccessService.executeSQLQuery(sql, PortalAdmin.class, null);
+			logger.debug(EELFLoggerDelegate.debugLogger, "getPortalAdmins was successful");
+			return portalAdmins;
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred while performing getPortalAdmins operation, Details: "
+							+ EcompPortalUtils.getStackTrace(e));
+			return null;
+		}
+	}
+
+	@SuppressWarnings("unchecked") 
+	public FieldsValidator createPortalAdmin(String orgUserId) {
+		FieldsValidator fieldsValidator = new FieldsValidator(); 
+		logger.debug(EELFLoggerDelegate.debugLogger, "LR: createPortalAdmin: test 1"); 
+		boolean result = false; 
+		EPUser user = null; 
+		boolean createNewUser = false; 
+		List<EPUser> localUserList = dataAccessService.getList(EPUser.class, " where orgUserId='" + orgUserId + "'",
+				null, null); 
+		if (localUserList.size() > 0) { 
+			user = localUserList.get(0); 
+		} else { 
+			createNewUser = true; 
+		} 
+ 
+		if (user!=null && isLoggedInUserPortalAdmin(user.getId())) { 
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_CONFLICT); 
+			logger.error(EELFLoggerDelegate.errorLogger, "User '" + user.getOrgUserId() + "' already has PortalAdmin role assigned."); 
+		} 
+		else if (user != null || createNewUser) { 
+			Session localSession = null; 
+			Transaction transaction = null; 
+			try { 
+				localSession = sessionFactory.openSession(); 
+ 
+				transaction = localSession.beginTransaction(); 
+				if (createNewUser) { 
+				user = this.searchService.searchUserByUserId(orgUserId);
+					if (user != null) { 
+						// insert the user with active true in order to 
+						// pass login phase. 
+						user.setActive(true); 
+						localSession.save(EPUser.class.getName(), user); 
+					} 
+				} 
+				if (user != null) { 
+					Long userid = user.getId(); 
+					PortalAdminUserRole userRole = new PortalAdminUserRole(); 
+					userRole.userId = userid; 
+					userRole.roleId = Long.valueOf(SYS_ADMIN_ROLE_ID); 
+					userRole.appId = Long.valueOf(ECOMP_APP_ID); 
+ 
+					localSession.save(PortalAdminUserRole.class.getName(), userRole); 
+				} 
+	//			logger.debug(EELFLoggerDelegate.debugLogger, "after saving menu object, new id: " + userid); 
+ 
+				transaction.commit(); 
+				result = true; 
+			} catch (Exception e) { 
+				EcompPortalUtils.rollbackTransaction(transaction, 
+						"createPortalAdmin rollback, exception = " + e); 
+				logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e)); 
+			} finally { 
+				EcompPortalUtils.closeLocalSession(localSession, "createPortalAdmin"); 
+			} 
+			if (!result) { 
+				logger.debug(EELFLoggerDelegate.debugLogger, "LR: createPortalAdmin: no result. setting httpStatusCode to " 
+						+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR); 
+				fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); 
+				logger.error(EELFLoggerDelegate.errorLogger, "PortalAdminServiceImpl.createPortalAdmin: bad request"); 
+			} 
+		} 
+		return fieldsValidator; 
+	}
+	
+	public FieldsValidator deletePortalAdmin(Long userId) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		logger.debug(EELFLoggerDelegate.debugLogger, "deletePortalAdmin: test 1");
+		boolean result = false;
+		Session localSession = null;
+		Transaction transaction = null;
+
+		try {
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+			dataAccessService.deleteDomainObjects(PortalAdminUserRole.class,
+					"user_id='" + userId + "' AND role_id='" + SYS_ADMIN_ROLE_ID + "'", null);
+			transaction.commit();
+			result = true;
+		} catch (Exception e) {
+			EcompPortalUtils.rollbackTransaction(transaction, "deletePortalAdmin rollback, exception = " + e);
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		} finally {
+			EcompPortalUtils.closeLocalSession(localSession, "deletePortalAdmin");
+		}
+		if (result) {
+		} else {
+			logger.debug(EELFLoggerDelegate.debugLogger, "deletePortalAdmin: no result. setting httpStatusCode to "
+					+ HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+		return fieldsValidator;
+	}
+
+	private void logQuery(String sql) {
+		logger.debug(EELFLoggerDelegate.debugLogger, "Executing query: " + sql);
+	}
+	
+	private boolean isLoggedInUserPortalAdmin(Long userId) { 
+		try { 
+			String sql = "SELECT u.user_id, u.first_name, u.last_name, u.login_id " + 
+					" FROM fn_user u, fn_user_role ur " + 
+					" WHERE u.user_id = ur.user_id " + 
+					" AND ur.user_id=" + userId + 
+					" AND ur.role_id=" + SYS_ADMIN_ROLE_ID;
+ 
+			logQuery(sql); 
+ 
+			@SuppressWarnings("unchecked") 
+			List<PortalAdmin> portalAdmins = dataAccessService.executeSQLQuery(sql, PortalAdmin.class, null); 
+			logger.debug(EELFLoggerDelegate.debugLogger, portalAdmins.toString()); 
+			if (portalAdmins==null || portalAdmins.size()<=0) { 
+				return false; 
+			} 
+			return true; 
+ 
+		} catch (Exception e) { 
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing isLoggedInUserPortalAdmin operation, Details: " + EcompPortalUtils.getStackTrace(e)); 
+			return false; 
+		} 
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SearchService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SearchService.java
new file mode 100644
index 00000000..9aa24692
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SearchService.java
@@ -0,0 +1,30 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+public interface SearchService {
+
+	public String searchUsersInPhoneBook(String searchString);
+
+	public EPUser searchUserByUserId(String orgUserId);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SearchServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SearchServiceImpl.java
new file mode 100644
index 00000000..88dc299f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SearchServiceImpl.java
@@ -0,0 +1,175 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.transport.UserWithNameSurnameTitle;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@Service("searchService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class SearchServiceImpl implements SearchService {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SearchServiceImpl.class);
+	
+	// TODO: the values below should be defined in other place
+	private static final int maxSizeOfSearchResult = 100;
+
+
+	@Autowired
+	EPLdapService ldapService;
+
+	@Override
+	public String searchUsersInPhoneBook(String searchString) {
+		String orgUserId = null;
+		List<String> tokens = EcompPortalUtils.parsingByRegularExpression(searchString, " ");
+		for (int i = 0; i < tokens.size(); i++) { // find orgUserId if possible and remove it from tokens
+			if (tokens.get(i).matches(".*\\d+.*")) {
+				orgUserId = tokens.get(i);
+				tokens.remove(i);
+			}
+		}
+		while (tokens.size() > 2) { // we use no more then first 2 tokens (orgUserId is removed, see above)
+			tokens.remove(tokens.size() - 1);
+		}
+		EPUser attrUser = new EPUser();
+		attrUser.setOrgUserId(orgUserId);
+		List<UserWithNameSurnameTitle> resultOfSearch = new ArrayList<UserWithNameSurnameTitle>(), resultOfAdditionalSearch = null;
+		if (tokens.size() == 2) {
+			attrUser.setFirstName(tokens.get(0));
+			attrUser.setLastName(tokens.get(1));
+			resultOfSearch = this.searchUsersByAttrs(attrUser);
+			resultOfSearch = this.removeWrongFirstNames(resultOfSearch, tokens.get(0));
+			resultOfSearch = this.removeWrongLastNames(resultOfSearch, tokens.get(1));
+			if (resultOfSearch.size() < maxSizeOfSearchResult) {
+				attrUser.setFirstName(tokens.get(1));
+				attrUser.setLastName(tokens.get(0));
+				resultOfAdditionalSearch = this.searchUsersByAttrs(attrUser);
+				resultOfAdditionalSearch = this.removeWrongFirstNames(resultOfAdditionalSearch, tokens.get(1));
+				resultOfAdditionalSearch = this.removeWrongLastNames(resultOfAdditionalSearch, tokens.get(0));
+			}
+		} else if (tokens.size() == 1) {
+			attrUser.setFirstName(tokens.get(0));
+			resultOfSearch = this.searchUsersByAttrs(attrUser);
+			resultOfSearch = this.removeWrongFirstNames(resultOfSearch, tokens.get(0));
+			if (resultOfSearch.size() < maxSizeOfSearchResult) {
+				attrUser.setFirstName(null);
+				attrUser.setLastName(tokens.get(0));
+				resultOfAdditionalSearch = this.searchUsersByAttrs(attrUser);
+				resultOfAdditionalSearch = this.removeWrongLastNames(resultOfAdditionalSearch, tokens.get(0));
+			}
+		} else if (orgUserId != null) {
+			resultOfSearch = this.searchUsersByAttrs(attrUser);
+		}
+		if (resultOfAdditionalSearch != null) {
+			resultOfSearch.addAll(resultOfAdditionalSearch);
+		}
+		resultOfSearch = this.cutSearchResultToMaximumSize(resultOfSearch);
+		ObjectMapper mapper = new ObjectMapper();
+		String result = "[]";
+		try {
+			result = mapper.writeValueAsString(resultOfSearch);
+		} catch (JsonProcessingException e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "searchUsersInPhoneBook Exception = " + EcompPortalUtils.getStackTrace(e));
+		}
+		return result;
+	}
+
+	private List<UserWithNameSurnameTitle> searchUsersByAttrs(EPUser attrUser) {
+		List<UserWithNameSurnameTitle> foundUsers = new ArrayList<UserWithNameSurnameTitle>();
+		try {
+			org.openecomp.portalsdk.core.command.support.SearchResult searchResult = this.ldapService.searchPost(attrUser, null, null, null, 0, 0, -1);
+			for (Object obj : searchResult) {
+				EPUser user = (EPUser) obj;
+				UserWithNameSurnameTitle foundUser = new UserWithNameSurnameTitle(user.getOrgUserId(), user.getFirstName(), user.getLastName(), user.getJobTitle());
+				foundUsers.add(foundUser);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "searchInPhoneBookWithToken Exception = " + EcompPortalUtils.getStackTrace(e));
+		}
+		return foundUsers;
+	}
+
+	private List<UserWithNameSurnameTitle> removeWrongFirstNames(List<UserWithNameSurnameTitle> resultOfSearch, String firstName) {
+		firstName = firstName.toUpperCase();
+		for (int i = resultOfSearch.size() - 1; i >= 0; i--) {
+			UserWithNameSurnameTitle user = resultOfSearch.get(i);
+			if ((user.firstName == null) || !user.firstName.toUpperCase().startsWith(firstName)) {
+				resultOfSearch.remove(i);
+			}
+		}
+		return resultOfSearch;
+	}
+
+	private List<UserWithNameSurnameTitle> removeWrongLastNames(List<UserWithNameSurnameTitle> resultOfSearch, String lastName) {
+		lastName = lastName.toUpperCase();
+		for (int i = resultOfSearch.size() - 1; i >= 0; i--) {
+			UserWithNameSurnameTitle user = resultOfSearch.get(i);
+			if ((user.lastName == null) || !user.lastName.toUpperCase().startsWith(lastName)) {
+				resultOfSearch.remove(i);
+			}
+		}
+		return resultOfSearch;
+	}
+
+	private List<UserWithNameSurnameTitle> cutSearchResultToMaximumSize(List<UserWithNameSurnameTitle> resultOfSearch) {
+		for (int i = resultOfSearch.size() - 1; i >= maxSizeOfSearchResult; i--) {
+			resultOfSearch.remove(i);
+		}
+		return resultOfSearch;
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public EPUser searchUserByUserId(String orgUserId) {
+		EPUser user = null;
+		EPUser searchedUser = new EPUser();
+		searchedUser.setOrgUserId(orgUserId);
+		try {
+			List<Object> searchResult = ldapService.searchPost(searchedUser, "", null, null, 0, -1, 1);
+			for (Object obj : searchResult) {
+				if (obj instanceof EPUser) {
+					user = (EPUser) obj;
+					// This assignment should be checked later!
+					user.setLoginId(orgUserId);
+					break;
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "searchUserBy orgUserId exception = " + EcompPortalUtils.getStackTrace(e));
+		}
+		return user;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextService.java
new file mode 100644
index 00000000..0b1a6df7
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextService.java
@@ -0,0 +1,98 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.SharedContext;
+
+/**
+ * Defines the methods exposed by the service that manages shared context
+ * objects in the database via Hibernate.
+ */
+public interface SharedContextService {
+
+	/**
+	 * Gets all shared context objects for the specified context ID.
+	 * 
+	 * @return List of SharedContext objects
+	 */
+	List<SharedContext> getSharedContexts(String contextId);
+
+	/**
+	 * Gets the shared context with the specified context ID and key.
+	 * 
+	 * @param contextId
+	 *            Context ID; usually a session ID
+	 * @param key
+	 *            Key for the key-value pair
+	 * @return Value found in the database, null if any parameter is null or no
+	 *         shared context exists with that context ID - key pair.
+	 */
+	SharedContext getSharedContext(String contextId, String key);
+
+	/**
+	 * Creates a new shared context in the database with the specified context
+	 * ID, key and value.
+	 * 
+	 * @param context
+	 *            SharedContext object to save.
+	 * @param key
+	 *            Key for the key-value pair.
+	 * @param value
+	 *            Value for the key-value pair.
+	 */
+	void addSharedContext(String contextId, String key, String value);
+
+	/**
+	 * Saves the specified shared context to the database.
+	 * 
+	 * @param context
+	 *            SharedContext object to save.
+	 */
+	void saveSharedContext(SharedContext context);
+
+	/**
+	 * Deletes the specified shared context from the database.
+	 * 
+	 * @param context
+	 *            SharedContext object to delete.
+	 */
+	void deleteSharedContext(SharedContext context);
+
+	/**
+	 * Deletes all shared contexts with the specified context ID.
+	 * 
+	 * @param contextId
+	 *            Context ID; usually a session ID
+	 * @return number of shared-context objects deleted
+	 */
+	int deleteSharedContexts(String contextId);
+
+	/**
+	 * Deletes all shared contexts with a creation time that is older than the
+	 * specified value.
+	 * 
+	 * @param ageInSeconds
+	 *            Expiration threshold in seconds
+	 */
+	void expireSharedContexts(int ageInSeconds);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java
new file mode 100644
index 00000000..428f1354
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/SharedContextServiceImpl.java
@@ -0,0 +1,177 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.SharedContext;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+/**
+ * Implementation of the shared-context service that talks to the database.
+ */
+@Service("sharedContextService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class SharedContextServiceImpl implements SharedContextService {
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SharedContextServiceImpl.class);
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalsdk.core.service.SharedContextService#
+	 * getSharedContexts()
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<SharedContext> getSharedContexts(String contextId) {
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion contextIdCrit = Restrictions.eq("context_id", contextId);
+		restrictionsList.add(contextIdCrit);
+		List<SharedContext> contexts = (List<SharedContext>) getDataAccessService().getList(SharedContext.class, null,
+				restrictionsList, null);
+
+		return contexts;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalsdk.core.service.SharedContextService#
+	 * getSharedContext(java. lang.String, java.lang.String)
+	 */
+	@Override
+	public SharedContext getSharedContext(String contextId, String key) {
+		SharedContext context = null;
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion contextIdCrit = Restrictions.eq("context_id", contextId);
+		Criterion keyCrit = Restrictions.eq("ckey", key);
+		restrictionsList.add(contextIdCrit);
+		restrictionsList.add(keyCrit);
+		@SuppressWarnings("unchecked")
+		List<SharedContext> contexts = (List<SharedContext>) getDataAccessService().getList(SharedContext.class, null,
+				restrictionsList, null);
+		if (contexts != null && contexts.size() == 1)
+			context = contexts.get(0);
+
+		return context;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.SharedContextService#
+	 * addSharedContext(java.lang.String, java.lang.String, java.lang.String)
+	 */
+	@Override
+	public void addSharedContext(String contextId, String key, String value) {
+		SharedContext context = new SharedContext(contextId, key, value);
+		saveSharedContext(context);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalsdk.core.service.SharedContextService#
+	 * saveSharedContext(com. att.fusion.core.domain.SharedContext)
+	 */
+	@Override
+	public void saveSharedContext(SharedContext context) {
+		getDataAccessService().saveDomainObject(context, null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalsdk.core.service.SharedContextService#
+	 * deleteSharedContext(com. att.fusion.core.domain.SharedContext)
+	 */
+	@Override
+	public void deleteSharedContext(SharedContext context) {
+		getDataAccessService().deleteDomainObject(context, null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.SharedContextService#
+	 * deleteSharedContexts(java.lang.String)
+	 */
+	@Override
+	public int deleteSharedContexts(String contextId) {
+		// Uses an inefficient method to avoid a where clause
+		// that could be used to mount a SQL injection attack.
+		List<SharedContext> contexts = getSharedContexts(contextId);
+		if (contexts == null)
+			return 0;
+
+		logger.debug(EELFLoggerDelegate.debugLogger, "deleteSharedContexts: count is " + contexts.size());
+		for (SharedContext sc : contexts)
+			deleteSharedContext(sc);
+
+		return contexts.size();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.SharedContextService#
+	 * expireSharedContexts(int)
+	 */
+	@Override
+	public void expireSharedContexts(int ageInSeconds) {
+		// Specific to the MySQL database.
+		// final String whereClause = " where create_time < ADDDATE(NOW(),
+		// INTERVAL - " + ageInSeconds + " SECOND)";
+		final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date expiredDateTime = new Date(System.currentTimeMillis() - ageInSeconds * 1000);
+		logger.debug(EELFLoggerDelegate.debugLogger,
+				"expireSharedContexts: expire time is " + expiredDateTime.toString());
+		final String whereClause = " create_time < '" + dateFormat.format(expiredDateTime) + "'";
+		getDataAccessService().deleteDomainObjects(SharedContext.class, whereClause, null);
+	}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserNotificationService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserNotificationService.java
new file mode 100644
index 00000000..063fdf07
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserNotificationService.java
@@ -0,0 +1,55 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EcompAppRole;
+import org.openecomp.portalapp.portal.transport.EpNotificationItem;
+import org.openecomp.portalapp.portal.transport.EpNotificationItemVO;
+import org.openecomp.portalapp.portal.transport.EpRoleNotificationItem;
+
+public interface UserNotificationService {
+
+	List<EpNotificationItem> getNotifications(Long userId);
+
+	List<EpRoleNotificationItem> getNotificationRoles(Long notificationId);
+
+	List<EcompAppRole> getAppRoleList();
+	/**
+	 * Marks the notification as viewed by the specified user.
+	 * 
+	 * @param notificationId
+	 * @param userId
+	 */
+	void setNotificationRead(Long notificationId, int userId);
+
+	String saveNotification(EpNotificationItem notificationItem) throws Exception;
+
+	List<EpNotificationItemVO> getNotificationHistoryVO(Long userId);
+
+	List<EpNotificationItemVO> getAdminNotificationVOS();
+	
+	List<EPUser> getUsersByOrgIds(List<String> OrgIds);
+
+	List<String> getMessageRecipients(Long notificationId);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserNotificationServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserNotificationServiceImpl.java
new file mode 100644
index 00000000..4017b2fc
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserNotificationServiceImpl.java
@@ -0,0 +1,211 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.hibernate.SessionFactory;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserNotification;
+import org.openecomp.portalapp.portal.domain.EcompAppRole;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.transport.EpNotificationItem;
+import org.openecomp.portalapp.portal.transport.EpNotificationItemVO;
+import org.openecomp.portalapp.portal.transport.EpRoleNotificationItem;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+@Service("userNotificationService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class UserNotificationServiceImpl implements UserNotificationService {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FunctionalMenuServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+	@Autowired
+	private SessionFactory sessionFactory;
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#getNotifications(java.lang.Long)
+	 */
+	@Override
+	public List<EpNotificationItem> getNotifications(Long userId) {
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("user_id", userId.toString());
+		@SuppressWarnings("unchecked")
+		List<EpNotificationItem> notificationList = dataAccessService.executeNamedQuery("getNotifications", params,
+				null);
+		// set the roles to null for pure retrieval of all notifications
+		for (EpNotificationItem item : notificationList) {
+			item.setRoles(null);
+		}
+		return notificationList;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#getNotificationHistoryVO(java.lang.Long)
+	 */
+	@Override
+	public List<EpNotificationItemVO> getNotificationHistoryVO(Long userId) {
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("user_id", userId.toString());
+		@SuppressWarnings("unchecked")
+		List<EpNotificationItemVO> notificationList = dataAccessService.executeNamedQuery("getNotificationHistoryVO",
+				params, null);
+		return notificationList;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#getAdminNotificationVOS()
+	 */
+	@Override
+	public List<EpNotificationItemVO> getAdminNotificationVOS() {
+		Map<String, String> params = new HashMap<String, String>();
+		@SuppressWarnings("unchecked")
+		List<EpNotificationItemVO> notificationList = dataAccessService
+				.executeNamedQuery("getAdminNotificationHistoryVO", params, null);
+		return notificationList;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#getNotificationRoles(java.lang.Long)
+	 */
+	@Override
+	public List<EpRoleNotificationItem> getNotificationRoles(Long notificationId) {
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("notificationId", Long.toString(notificationId));
+		@SuppressWarnings("unchecked")
+		List<EpRoleNotificationItem> roleNotifList = dataAccessService.executeNamedQuery("getNotificationRoles", params,
+				null);
+		return roleNotifList;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#getAppRoleList()
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EcompAppRole> getAppRoleList() {
+		List<EcompAppRole> appRoleList = (List<EcompAppRole>) dataAccessService.executeNamedQuery("getEpNotificationAppRoles", null, null);		
+		return appRoleList;		
+	}	
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#
+	 * setNotificationsRead(java.lang.Long, int)
+	 */
+	@Override
+	public void setNotificationRead(Long notificationId, int userId) {
+		EPUserNotification userNotification = new EPUserNotification();
+		userNotification.setNotificationId(notificationId);
+		userNotification.setUpdateTime(new Date());
+		userNotification.setViewed("Y");
+		userNotification.setUserId((long) userId);
+		getDataAccessService().saveDomainObject(userNotification, null);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.openecomp.portalapp.portal.service.UserNotificationService#saveNotification(org.openecomp.portalapp.portal.transport.EpNotificationItem)
+	 */
+	@Override
+	public String saveNotification(EpNotificationItem notificationItem) throws Exception {
+
+		// gather the roles
+		if (notificationItem.getRoleIds() != null && !notificationItem.getIsForAllRoles().equals("Y")) {
+			if (notificationItem.getRoles() == null) {
+				Set<EpRoleNotificationItem> roleSet = new HashSet<EpRoleNotificationItem>();
+				notificationItem.setRoles(roleSet);
+			}
+			for (Long roleId : notificationItem.getRoleIds()) {
+				EpRoleNotificationItem roleItem = new EpRoleNotificationItem();
+				roleItem.setNotificationId(notificationItem.getNotificationId());
+				roleItem.setRoleId(roleId.intValue());
+				notificationItem.getRoles().add(roleItem);
+			}
+		}
+
+		
+			// for updates fetch roles and then save
+			if (notificationItem.getNotificationId() != null) {
+				EpNotificationItem updateNotificationItem = (EpNotificationItem) getDataAccessService()
+						.getDomainObject(EpNotificationItem.class, notificationItem.getNotificationId(), null);
+				notificationItem.setRoles(updateNotificationItem.getRoles());
+			}
+			 if(notificationItem.msgSource == null)
+	            {
+	                notificationItem.setMsgSource("EP");
+	            }
+			getDataAccessService().saveDomainObject(notificationItem, null);
+			 return "" ;
+
+		} 
+	  @Override
+	    public List<EPUser> getUsersByOrgIds(List<String> OrgIds) {
+	        Map<String, Object> params = new HashMap<String, Object>();
+	        params.put("OrgIds", OrgIds);
+	        @SuppressWarnings("unchecked")
+	        List<EPUser> userList = dataAccessService.executeNamedQuery("getUsersByOrgIdsNotifications", params,    null);
+	        return userList;
+	    }
+	  
+	  @Override
+			public List<String> getMessageRecipients(Long notificationId) {
+				Map<String, String> params = new HashMap<>();
+				params.put("notificationId", Long.toString(notificationId));
+				@SuppressWarnings("unchecked")
+				List<String> activeUsers = dataAccessService.executeNamedQuery("messageRecipients", params, null);
+				return activeUsers;
+			}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+	public SessionFactory getSessionFactory() {
+		return sessionFactory;
+	}
+
+	public void setSessionFactory(SessionFactory sessionFactory) {
+		this.sessionFactory = sessionFactory;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesService.java
new file mode 100644
index 00000000..1b9dfd04
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserRolesService.java
@@ -0,0 +1,67 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.apache.cxf.transport.http.HTTPException;
+import org.openecomp.portalapp.externalsystemapproval.model.ExternalSystemUser;
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserApp;
+import org.openecomp.portalapp.portal.domain.EPUserAppCatalogRoles;
+import org.openecomp.portalapp.portal.domain.ExternalSystemAccess;
+import org.openecomp.portalapp.portal.transport.AppWithRolesForUser;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.RoleInAppForUser;
+import org.openecomp.portalapp.portal.transport.UserApplicationRoles;
+
+public interface UserRolesService {
+
+	public List<RoleInAppForUser> getAppRolesForUser(Long appId, String userId);
+
+	public boolean setAppWithUserRoleStateForUser(EPUser user, AppWithRolesForUser newAppRolesForUser);
+
+	public List<UserApplicationRoles> getUsersFromAppEndpoint(Long appId) throws HTTPException;
+
+	public List<EPRole> importRolesFromRemoteApplication(Long appId) throws HTTPException;
+	
+	/**
+	 * Gets entries from the local fn_user_role table for the specified user and
+	 * app.
+	 * 
+	 * @param appId
+	 *            ID of row in fn_app
+	 * @param userid
+	 *            ID of row in fn_user
+	 * @return List of EPRole; empty if none found.
+	 */
+	public List<EPUserApp> getCachedAppRolesForUser(Long appId, Long userId);
+	
+	public FieldsValidator putUserAppRolesRequest(AppWithRolesForUser userAppRolesData, EPUser user);
+
+	String setAppWithUserRoleStateForUser(ExternalSystemUser newAppRolesForUser);
+
+	public List<EPUserAppCatalogRoles> getUserAppCatalogRoles(EPUser user, String appName);
+	
+	public String updateRemoteUserProfile(String orgUserId, Long appId);
+	
+	public ExternalSystemAccess getExternalRequestAccess();
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserService.java
new file mode 100644
index 00000000..2d8e9112
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserService.java
@@ -0,0 +1,34 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+public interface UserService {
+	
+	List<EPUser> getUserByUserId(String orgUserId);
+	
+	List<EPUser> getUserByFirstLastName(String firstName, String lastName);
+	
+	public String saveNewUser(EPUser newUser, String checkDuplicate) throws Exception;
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserServiceImpl.java
new file mode 100644
index 00000000..4de2c497
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/UserServiceImpl.java
@@ -0,0 +1,260 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalsdk.core.FusionObject.Utilities;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service("userService")
+@Transactional
+public class UserServiceImpl implements UserService {
+
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EPUser> getUserByUserId(String userId) {
+
+		if (SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM).trim().equalsIgnoreCase("OIDC")) {
+			List<EPUser> users = new ArrayList<EPUser>();
+			List<EPUser> filterdUsers = new ArrayList<EPUser>();
+			BufferedReader in = null;
+			HttpURLConnection con = null;
+			try {
+				String url = EPCommonSystemProperties.getProperty(EPCommonSystemProperties.AUTH_USER_SERVER);
+				URL obj = new URL(url);
+
+				con = (HttpURLConnection) obj.openConnection();
+
+				// optional default is GET
+				con.setRequestMethod("GET");
+				con.setConnectTimeout(3000);
+				con.setReadTimeout(8000);
+
+				StringBuffer response = new StringBuffer();
+
+				in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
+				String inputLine;
+				while ((inputLine = in.readLine()) != null)
+					response.append(inputLine);
+				JSONObject jObject = new JSONObject(response.toString()); // json
+				JSONArray jsonUsers = jObject.getJSONArray("response"); // get
+																		// data
+																		// object
+				for (int i = 0; i < jsonUsers.length(); i++) {
+					JSONObject eachObject = jsonUsers.getJSONObject(i);
+					EPUser eachUser = new EPUser();
+					eachUser.setOrgUserId(eachObject.get("id").toString());
+					eachUser.setFirstName(eachObject.get("givenName").toString());
+					eachUser.setLastName(eachObject.get("familyName").toString());
+					eachUser.setEmail(eachObject.get("email").toString());
+					users.add(eachUser);
+				}
+
+				for (int i = 0; i < users.size(); i++) {
+					if (Utilities.nvl(userId).length() > 0) {
+						if (!userId.equalsIgnoreCase(users.get(i).getOrgUserId())) {
+							continue;
+						}
+					}
+					filterdUsers.add(users.get(i));
+				}
+
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId failed", e);
+			} finally {
+				try {
+					in.close();
+					con.disconnect();
+				} catch (IOException e) {
+					logger.error(EELFLoggerDelegate.errorLogger,"getUserByUserId failed to close", e);
+				}
+			}
+
+			return filterdUsers;
+
+		} else {
+
+			List<EPUser> list = null;
+			StringBuffer criteria = new StringBuffer();
+			criteria.append(" where org_user_id = '").append(userId).append("'");
+			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
+			return (list == null || list.size() == 0) ? null : list;
+
+		}
+
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<EPUser> getUserByFirstLastName(String firstName, String lastName) {
+
+		if (!SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM).trim().equalsIgnoreCase("OIDC")) {
+
+			List<EPUser> list = null;
+			StringBuffer criteria = new StringBuffer();
+			if (firstName != null)
+				criteria.append(" where first_name = '").append(firstName).append("'");
+			if (lastName != null)
+				criteria.append(" where last_name = '").append(lastName).append("'");
+			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
+			return (list == null || list.size() == 0) ? null : list;
+
+		} else {
+
+			List<EPUser> users = new ArrayList<EPUser>();
+			List<EPUser> filterdUsers = new ArrayList<EPUser>();
+			BufferedReader in = null;
+			HttpURLConnection con = null;
+			try {
+				String url = EPCommonSystemProperties.getProperty(EPCommonSystemProperties.AUTH_USER_SERVER);
+				URL obj = new URL(url);
+
+				con = (HttpURLConnection) obj.openConnection();
+
+				// optional default is GET
+				con.setRequestMethod("GET");
+				con.setConnectTimeout(3000);
+				con.setReadTimeout(8000);
+
+				StringBuffer response = new StringBuffer();
+
+				in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
+				String inputLine;
+				while ((inputLine = in.readLine()) != null)
+					response.append(inputLine);
+				JSONObject jObject = new JSONObject(response.toString()); // json
+				JSONArray jsonUsers = jObject.getJSONArray("response"); // get
+																		// data
+																		// object
+				for (int i = 0; i < jsonUsers.length(); i++) {
+					JSONObject eachObject = jsonUsers.getJSONObject(i);
+					EPUser eachUser = new EPUser();
+					eachUser.setOrgUserId(eachObject.get("id").toString());// getString("id"));
+					eachUser.setFirstName(eachObject.get("givenName").toString());
+					eachUser.setLastName(eachObject.get("familyName").toString());
+					eachUser.setEmail(eachObject.get("email").toString());
+					users.add(eachUser);
+				}
+
+				for (int i = 0; i < users.size(); i++) {
+
+					if (Utilities.nvl(firstName).length() > 0) {
+						if (!firstName.equalsIgnoreCase(users.get(i).getFirstName())) {
+							continue;
+						}
+					}
+					if (Utilities.nvl(lastName).length() > 0) {
+						if (!lastName.equalsIgnoreCase(users.get(i).getLastName())) {
+							continue;
+						}
+					}
+
+					filterdUsers.add(users.get(i));
+
+				}
+
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed", e);
+			} finally {
+				try {
+					in.close();
+					con.disconnect();
+				} catch (IOException e) {
+					logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed to close", e);
+				}
+			}
+
+			return filterdUsers;
+		}
+
+	}
+
+	@SuppressWarnings("unchecked")
+	public String saveNewUser(EPUser newUser, String checkDuplicate) throws Exception {
+
+		try {
+
+			List<EPUser> list = null;
+			StringBuffer criteria = new StringBuffer();
+			criteria.append(" where org_user_id = '").append(newUser.getLoginId()).append("'");
+			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
+			if (list == null || list.size() == 0) {
+				newUser.setActive(true);
+				newUser.setOrgUserId(newUser.getLoginId());
+				newUser.setLoginPwd(CipherUtil.encrypt(newUser.getLoginPwd()));
+				getDataAccessService().saveDomainObject(newUser, null);
+			} else {
+				if (checkDuplicate.equals("Yes")) {
+					// userId already exist in database
+					return "Record already exist";
+				} else {
+
+					EPUser oldUser = (EPUser) list.get(0);
+					oldUser.setFirstName(newUser.getFirstName());
+					oldUser.setLastName(newUser.getLastName());
+					oldUser.setMiddleInitial(newUser.getMiddleInitial());
+					if (!oldUser.getLoginPwd().equals(newUser.getLoginPwd()))
+						oldUser.setLoginPwd(CipherUtil.encrypt(newUser.getLoginPwd()));
+					else
+						oldUser.setLoginPwd(newUser.getLoginPwd());
+					getDataAccessService().saveDomainObject(oldUser, null);
+
+				}
+
+			}
+
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "saveNewUser failed", e);
+			throw new Exception(e);
+		}
+		return "success";
+	};
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterService.java
new file mode 100644
index 00000000..df01fb96
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterService.java
@@ -0,0 +1,64 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.WidgetCatalogParameter;
+
+public interface WidgetParameterService {
+	
+	/**
+	 * Saves the specified user-defined widget parameters to the table ep_widget_parameters
+	 * 
+	 * @param newParameter
+	 */
+	void saveUserParameter(WidgetCatalogParameter newParameter);
+	
+	/**
+	 * Gets the specified user-defined widget parameter where paramId is used from all users 
+	 * 
+	 * @param paramId
+	 * @return
+	 * List of widget parameters
+	 */
+	List<WidgetCatalogParameter> getUserParameterById(Long paramId);
+	
+	
+	/**
+	 * Deletes the specified user-defined widget parameters from ep_widget_parameters table 
+	 * where paramId is used
+	 * 
+	 * @param paramId
+	 */
+	void deleteUserParameterById(Long paramId);
+
+	
+	/**
+	 * Gets the specified user-defined widget parameter where paramId is used from the specified
+	 * user with userId 
+	 * @param widgetId
+	 * @param userId
+	 * @param paramId
+	 * @return
+	 */
+	WidgetCatalogParameter getUserParamById(Long widgetId, Long userId, Long paramId);
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java
new file mode 100644
index 00000000..a3e9c61c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetParameterServiceImpl.java
@@ -0,0 +1,92 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Restrictions;
+import org.openecomp.portalapp.portal.domain.WidgetCatalogParameter;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+@Service("widgetParameterService")
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class WidgetParameterServiceImpl implements WidgetParameterService{
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetParameterServiceImpl.class);
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public WidgetCatalogParameter getUserParamById(Long widgetId, Long userId, Long paramId) {
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion widgetIdCrit = Restrictions.eq("widgetId", widgetId);
+		restrictionsList.add(widgetIdCrit);
+		Criterion attIdCrit = Restrictions.eq("userId", userId);
+		restrictionsList.add(attIdCrit);
+		Criterion paramIdCrit = Restrictions.eq("paramId", paramId);
+		restrictionsList.add(paramIdCrit);
+		
+		
+		WidgetCatalogParameter widgetParam = null;
+		List<WidgetCatalogParameter> list = (List<WidgetCatalogParameter>) dataAccessService
+				.getList(WidgetCatalogParameter.class, null, restrictionsList, null);
+		if(list.size() != 0)
+			widgetParam = list.get(0);
+		logger.debug(EELFLoggerDelegate.debugLogger,
+				"getUserParamById: widget parameters: " + widgetParam);
+		return widgetParam;
+	}
+
+	@Override
+	public void saveUserParameter(WidgetCatalogParameter newParameter) {
+		dataAccessService.saveDomainObject(newParameter, null);
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<WidgetCatalogParameter> getUserParameterById(Long paramId) {
+		List<Criterion> restrictionsList = new ArrayList<Criterion>();
+		Criterion paramIdCrit = Restrictions.eq("paramId", paramId);
+		restrictionsList.add(paramIdCrit);
+		List<WidgetCatalogParameter> list = (List<WidgetCatalogParameter>) dataAccessService
+				.getList(WidgetCatalogParameter.class, null, restrictionsList, null);
+		return list;
+	}
+
+	@Override
+	public void deleteUserParameterById(Long paramId) {
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("paramId", Long.toString(paramId));
+		dataAccessService.executeNamedQuery("deleteWidgetCatalogParameter", params, null);
+		dataAccessService.executeNamedQuery("deleteMicroserviceParameterById", params, null);
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetService.java
new file mode 100644
index 00000000..b44a19f3
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetService.java
@@ -0,0 +1,36 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.List;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.OnboardingWidget;
+
+public interface WidgetService {
+
+	List<OnboardingWidget> getOnboardingWidgets(EPUser user, boolean managed);
+
+	FieldsValidator setOnboardingWidget(EPUser user, OnboardingWidget onboardingWidget);
+
+	FieldsValidator deleteOnboardingWidget(EPUser user, Long onboardingWidgetId);
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetServiceImpl.java
new file mode 100644
index 00000000..484bef4f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/WidgetServiceImpl.java
@@ -0,0 +1,276 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.http.HttpServletResponse;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserApp;
+import org.openecomp.portalapp.portal.domain.Widget;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.transport.FieldsValidator;
+import org.openecomp.portalapp.portal.transport.OnboardingWidget;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Service("widgetService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class WidgetServiceImpl implements WidgetService {
+
+	private static final String baseSqlToken = " widget.WIDGET_ID, widget.WDG_NAME, widget.APP_ID, app.APP_NAME, widget.WDG_WIDTH, widget.WDG_HEIGHT, widget.WDG_URL"
+			+ " from FN_WIDGET widget join FN_APP app ON widget.APP_ID = app.APP_ID";
+
+	private String validAppsFilter = "";
+
+	private Long LONG_ECOMP_APP_ID = 1L;
+	private Long ACCOUNT_ADMIN_ROLE_ID = 999L;
+	private static final Long DUBLICATED_FIELD_VALUE_ECOMP_ERROR = new Long(EPCommonSystemProperties.DUBLICATED_FIELD_VALUE_ECOMP_ERROR);
+
+	private static final String urlField = "url";
+
+	private static final String nameField = "name";
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetServiceImpl.class);
+
+	@Autowired
+	AdminRolesService adminRolesService;
+	@Autowired
+	private SessionFactory sessionFactory;
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	@PostConstruct
+	private void init() {
+		try {
+			validAppsFilter = " AND app.ENABLED = 'Y' AND app.APP_ID != " + SystemProperties.getProperty(EPCommonSystemProperties.ECOMP_APP_ID);
+			ACCOUNT_ADMIN_ROLE_ID = Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ACCOUNT_ADMIN_ROLE_ID));
+			LONG_ECOMP_APP_ID = Long.valueOf(SystemProperties.getProperty(EPCommonSystemProperties.ECOMP_APP_ID));
+		} catch(Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		}
+	}
+	
+	private String sqlWidgetsForAllApps() {
+		return "SELECT" + baseSqlToken + validAppsFilter;
+	}
+
+	private String sqlWidgetsForAllAppsWhereUserIsAdmin(Long userId) {
+		return "SELECT" + baseSqlToken + " join FN_USER_ROLE ON FN_USER_ROLE.APP_ID = app.APP_ID where FN_USER_ROLE.USER_ID = " + userId
+				+ " AND FN_USER_ROLE.ROLE_ID = " + ACCOUNT_ADMIN_ROLE_ID + validAppsFilter;
+	}
+
+	private String sqlWidgetsForAllAppsWhereUserHasAnyRole(Long userId) {
+		return "SELECT DISTINCT" + baseSqlToken + " join FN_USER_ROLE ON FN_USER_ROLE.APP_ID = app.APP_ID where FN_USER_ROLE.USER_ID = "
+				+ userId + validAppsFilter;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<OnboardingWidget> getOnboardingWidgets(EPUser user, boolean managed) {
+		List<OnboardingWidget> onboardingWidgets = new ArrayList<OnboardingWidget>();
+		String sql = null;
+		if (adminRolesService.isSuperAdmin(user)) {
+			sql = this.sqlWidgetsForAllApps();
+		} else if (managed) {
+			if (adminRolesService.isAccountAdmin(user)) {
+				sql = this.sqlWidgetsForAllAppsWhereUserIsAdmin(user.getId());
+			}
+		} else if (adminRolesService.isAccountAdmin(user) || adminRolesService.isUser(user)) {
+			sql = this.sqlWidgetsForAllAppsWhereUserHasAnyRole(user.getId());
+		}
+		if (sql != null) {
+			onboardingWidgets = dataAccessService.executeSQLQuery(sql, OnboardingWidget.class, null);
+		}
+		return onboardingWidgets;
+	}
+
+	private static final Object syncRests = new Object();
+
+	private boolean isUserAdminOfAppForWidget(boolean superAdmin, Long userId, Long appId) {
+		if (!superAdmin) {
+			@SuppressWarnings("unchecked")
+			List<EPUserApp> userRoles = dataAccessService.getList(EPUserApp.class,
+					" where userId = " + userId + " and role.id = " + ACCOUNT_ADMIN_ROLE_ID + " and app.id = " + appId, null, null);
+			return (userRoles.size() > 0);
+		}
+		return true;
+	}
+
+	private void validateOnboardingWidget(OnboardingWidget onboardingWidget, FieldsValidator fieldsValidator) {
+		@SuppressWarnings("unchecked")
+		List<Widget> widgets = dataAccessService.getList(Widget.class,
+				" where url = '" + onboardingWidget.url + "'" + " or name = '" + onboardingWidget.name + "'", null, null);
+		boolean dublicatedUrl = false;
+		boolean dublicatedName = false;
+		for (Widget widget : widgets) {
+			if (onboardingWidget.id != null && onboardingWidget.id.equals(widget.getId())) {
+				// widget should not be compared with itself
+				continue;
+			}
+			if (!dublicatedUrl && widget.getUrl().equals(onboardingWidget.url)) {
+				dublicatedUrl = true;
+				if (dublicatedName) {
+					break;
+				}
+			}
+			if (!dublicatedName && widget.getName().equalsIgnoreCase(onboardingWidget.name) && widget.getAppId().equals(onboardingWidget.appId)) {
+				dublicatedName = true;
+				if (dublicatedUrl) {
+					break;
+				}
+			}
+		}
+		if (dublicatedUrl || dublicatedName) {
+			if (dublicatedUrl) {
+				fieldsValidator.addProblematicFieldName(urlField);
+			}
+			if (dublicatedName) {
+				fieldsValidator.addProblematicFieldName(nameField);
+			}
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_CONFLICT);
+			fieldsValidator.errorCode = DUBLICATED_FIELD_VALUE_ECOMP_ERROR;
+		}
+	}
+
+	private void applyOnboardingWidget(OnboardingWidget onboardingWidget, FieldsValidator fieldsValidator) {
+		boolean result = false;
+		Session localSession = null;
+		Transaction transaction = null;
+		try {
+			localSession = sessionFactory.openSession();
+			transaction = localSession.beginTransaction();
+			Widget widget;
+			if (onboardingWidget.id == null) {
+				widget = new Widget();
+			} else {
+				widget = (Widget) localSession.get(Widget.class, onboardingWidget.id);
+			}
+			widget.setAppId(onboardingWidget.appId);
+			widget.setName(onboardingWidget.name);
+			widget.setWidth(onboardingWidget.width);
+			widget.setHeight(onboardingWidget.height);
+			widget.setUrl(onboardingWidget.url);
+			localSession.saveOrUpdate(widget);
+			transaction.commit();
+			result = true;
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+			EcompPortalUtils.rollbackTransaction(transaction, "applyOnboardingWidget rollback, exception = " + e);
+		} finally {
+			EcompPortalUtils.closeLocalSession(localSession, "applyOnboardingWidget");
+		}
+		if (!result) {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+		}
+	}
+
+	private FieldsValidator updateOrSaveWidget(boolean superAdmin, Long userId, OnboardingWidget onboardingWidget) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		if (!this.isUserAdminOfAppForWidget(superAdmin, userId, onboardingWidget.appId)) {
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_FORBIDDEN);
+			return fieldsValidator;
+		}
+		synchronized (syncRests) {
+			// onboardingWidget.id is null for POST and not null for PUT
+			if (onboardingWidget.id == null) {
+				this.validateOnboardingWidget(onboardingWidget, fieldsValidator);
+			} else {
+				Widget widget = (Widget) dataAccessService.getDomainObject(Widget.class, onboardingWidget.id, null);
+				if (widget == null || widget.getId() == null) {
+					// Widget not found
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_NOT_FOUND);
+					return fieldsValidator;
+				}
+				this.validateOnboardingWidget(onboardingWidget, fieldsValidator);
+			}
+			if (fieldsValidator.httpStatusCode.intValue() == HttpServletResponse.SC_OK) {
+				this.applyOnboardingWidget(onboardingWidget, fieldsValidator);
+			}
+		}
+		return fieldsValidator;
+	}
+
+	@Override
+	public FieldsValidator setOnboardingWidget(EPUser user, OnboardingWidget onboardingWidget) {
+		if (onboardingWidget.name.length() == 0 || onboardingWidget.url.length() == 0 || onboardingWidget.appId == null
+				|| onboardingWidget.appId.equals(LONG_ECOMP_APP_ID) || onboardingWidget.width.intValue() <= 0 || onboardingWidget.height.intValue() <= 0) {
+			if (onboardingWidget.appId.equals(LONG_ECOMP_APP_ID)) {
+				// logger.error("Alarm!!! Security breach attempt on user " + user.getFullName() + ", userId = " + user.getUserId());
+			}
+			FieldsValidator fieldsValidator = new FieldsValidator();
+			fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_BAD_REQUEST);
+			return fieldsValidator;
+		}
+		return this.updateOrSaveWidget(adminRolesService.isSuperAdmin(user), user.getId(), onboardingWidget);
+	}
+
+	@Override
+	public FieldsValidator deleteOnboardingWidget(EPUser user, Long onboardingWidgetId) {
+		FieldsValidator fieldsValidator = new FieldsValidator();
+		synchronized (syncRests) {
+			Widget widget = (Widget) dataAccessService.getDomainObject(Widget.class, onboardingWidgetId, null);
+			if (widget != null && widget.getId() != null) { // widget exists
+				if (!this.isUserAdminOfAppForWidget(adminRolesService.isSuperAdmin(user), user.getId(), widget.getAppId())) {
+					fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_FORBIDDEN);
+				} else {
+					boolean result = false;
+					Session localSession = null;
+					Transaction transaction = null;
+					try {
+						localSession = sessionFactory.openSession();
+						transaction = localSession.beginTransaction();
+						localSession.delete(localSession.get(Widget.class, onboardingWidgetId));
+						transaction.commit();
+						result = true;
+					} catch (Exception e) {
+						EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoSystemError, e);
+						EcompPortalUtils.rollbackTransaction(transaction, "deleteOnboardingWidget rollback, exception = " + e);
+					} finally {
+						EcompPortalUtils.closeLocalSession(localSession, "deleteOnboardingWidget");
+					}
+					if (!result) {
+						fieldsValidator.httpStatusCode = new Long(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+					}
+				}
+			}
+		}
+		return fieldsValidator;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AllAppsWithRolesForUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AllAppsWithRolesForUser.java
new file mode 100644
index 00000000..da776ded
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AllAppsWithRolesForUser.java
@@ -0,0 +1,40 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.List;
+
+public class AllAppsWithRolesForUser {
+
+	public String orgUserId;
+
+	public List<AppWithUserRoles> apps;
+
+	public static class AppWithUserRoles {
+
+		public Long appId;
+
+		public String appName;
+		
+		public List<RoleInAppForUser> appRoles;
+
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/Analytics.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/Analytics.java
new file mode 100644
index 00000000..adc5ad2b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/Analytics.java
@@ -0,0 +1,66 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Analytics {
+	
+	private String action;
+	private String page;
+	private String function;
+	private String userId;
+	private String type;
+	
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public String getAction() {
+		return action;
+	}
+	public void setAction(String action) {
+		this.action = action;
+	}
+	public String getPage() {
+		return page;
+	}
+	public void setPage(String page) {
+		this.page = page;
+	}
+	public String getFunction() {
+		return function;
+	}
+	public void setFunction(String function) {
+		this.function = function;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppCatalogPersonalization.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppCatalogPersonalization.java
new file mode 100644
index 00000000..7c24917b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppCatalogPersonalization.java
@@ -0,0 +1,94 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+/**
+ * Model for the object PUT to the controller when the user takes an action on
+ * an application in the catalog.
+ */
+public class AppCatalogPersonalization {
+
+	public Long appId;
+	public Boolean select;
+	public Boolean pending;
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public Boolean getSelect() {
+		return select;
+	}
+
+	public void setSelect(Boolean select) {
+		this.select = select;
+	}
+
+	public Boolean getPending() {
+		return pending;
+	}
+
+	public void setPending(Boolean pending) {
+		this.pending = pending;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appId == null) ? 0 : appId.hashCode());
+		result = prime * result + ((pending == null) ? 0 : pending.hashCode());
+		result = prime * result + ((select == null) ? 0 : select.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AppCatalogPersonalization other = (AppCatalogPersonalization) obj;
+		if (appId == null) {
+			if (other.appId != null)
+				return false;
+		} else if (!appId.equals(other.appId))
+			return false;
+		if (pending == null) {
+			if (other.pending != null)
+				return false;
+		} else if (!pending.equals(other.pending))
+			return false;
+		if (select == null) {
+			if (other.select != null)
+				return false;
+		} else if (!select.equals(other.select))
+			return false;
+		return true;
+	}
+
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppNameIdIsAdmin.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppNameIdIsAdmin.java
new file mode 100644
index 00000000..484fffad
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppNameIdIsAdmin.java
@@ -0,0 +1,114 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class AppNameIdIsAdmin {
+
+	public Long id;
+
+	public String appName;
+
+	public Boolean isAdmin;
+
+	public Boolean restrictedApp;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public Boolean getIsAdmin() {
+		return isAdmin;
+	}
+
+	public void setIsAdmin(Boolean isAdmin) {
+		this.isAdmin = isAdmin;
+	}
+
+	public Boolean getRestrictedApp() {
+		return restrictedApp;
+	}
+
+	public void setRestrictedApp(Boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appName == null) ? 0 : appName.hashCode());
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((isAdmin == null) ? 0 : isAdmin.hashCode());
+		result = prime * result + ((restrictedApp == null) ? 0 : restrictedApp.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AppNameIdIsAdmin other = (AppNameIdIsAdmin) obj;
+		if (appName == null) {
+			if (other.appName != null)
+				return false;
+		} else if (!appName.equals(other.appName))
+			return false;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (isAdmin == null) {
+			if (other.isAdmin != null)
+				return false;
+		} else if (!isAdmin.equals(other.isAdmin))
+			return false;
+		if (restrictedApp == null) {
+			if (other.restrictedApp != null)
+				return false;
+		} else if (!restrictedApp.equals(other.restrictedApp))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "AppNameIdIsAdmin [id=" + id + ", appName=" + appName + ", isAdmin=" + isAdmin + ", restrictedApp="
+				+ restrictedApp + "]";
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppWithRolesForUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppWithRolesForUser.java
new file mode 100644
index 00000000..4e37ee00
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppWithRolesForUser.java
@@ -0,0 +1,73 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.List;
+
+public class AppWithRolesForUser {
+
+	public String orgUserId;
+
+	public Long appId;
+
+	public String appName;
+		
+	public List<RoleInAppForUser> appRoles;
+
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+	public List<RoleInAppForUser> getAppRoles() {
+		return appRoles;
+	}
+
+	public void setAppRoles(List<RoleInAppForUser> appRoles) {
+		this.appRoles = appRoles;
+	}
+
+	@Override
+	public String toString() {
+		return "AppWithRolesForUser [orgUserId=" + orgUserId + ", appId=" + appId + ", appName=" + appName
+				+ ", appRoles=" + appRoles + "]";
+	}
+
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppsListWithAdminRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppsListWithAdminRole.java
new file mode 100644
index 00000000..0000e2a7
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/AppsListWithAdminRole.java
@@ -0,0 +1,86 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.ArrayList;
+
+public class AppsListWithAdminRole {
+
+	public String orgUserId;
+
+	public ArrayList<AppNameIdIsAdmin> appsRoles;
+
+	public AppsListWithAdminRole() {
+		appsRoles = new ArrayList<AppNameIdIsAdmin>();
+	}
+
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+
+	public ArrayList<AppNameIdIsAdmin> getAppsRoles() {
+		return appsRoles;
+	}
+
+	public void setAppsRoles(ArrayList<AppNameIdIsAdmin> appsRoles) {
+		this.appsRoles = appsRoles;
+	}
+
+	@Override
+	public String toString() {
+		return "AppsListWithAdminRole [orgUserId=" + orgUserId + ", appsRoles=" + appsRoles + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appsRoles == null) ? 0 : appsRoles.hashCode());
+		result = prime * result + ((orgUserId == null) ? 0 : orgUserId.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AppsListWithAdminRole other = (AppsListWithAdminRole) obj;
+		if (appsRoles == null) {
+			if (other.appsRoles != null)
+				return false;
+		} else if (!appsRoles.equals(other.appsRoles))
+			return false;
+		if (orgUserId == null) {
+			if (other.orgUserId != null)
+				return false;
+		} else if (!orgUserId.equals(other.orgUserId))
+			return false;
+		return true;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BusinessCardApplicationRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BusinessCardApplicationRole.java
new file mode 100644
index 00000000..47658786
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BusinessCardApplicationRole.java
@@ -0,0 +1,108 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@Entity
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BusinessCardApplicationRole implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+
+	public BusinessCardApplicationRole() {
+	}
+
+	
+    @Id
+	@Column(name="app_name")
+	private String appName;
+	
+	@Id
+	@Column(name="role_name")
+	private String roleName;
+
+
+	public String getAppName() {
+		return appName;
+	}
+
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+
+
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	@Override
+	public String toString() {
+		return "BusinessCardUserApplicationRoles [appName=" + appName + ", roleName=" + roleName + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appName == null) ? 0 : appName.hashCode());
+		result = prime * result + ((roleName == null) ? 0 : roleName.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		BusinessCardApplicationRole other = (BusinessCardApplicationRole) obj;
+		if (appName == null) {
+			if (other.appName != null)
+				return false;
+		} else if (!appName.equals(other.appName))
+			return false;
+		if (roleName == null) {
+			if (other.roleName != null)
+				return false;
+		} else if (!roleName.equals(other.roleName))
+			return false;
+		return true;
+	}	
+	
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BusinessCardApplicationRolesList.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BusinessCardApplicationRolesList.java
new file mode 100644
index 00000000..15c3aff2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/BusinessCardApplicationRolesList.java
@@ -0,0 +1,86 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BusinessCardApplicationRolesList {
+
+	public BusinessCardApplicationRolesList(){}
+
+    private String appName;
+	private List<String> roleNames;
+
+
+	public String getAppName() {
+		return appName;
+	}
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+	public List<String> getRoleNames() {
+		return roleNames;
+	}
+	public void setRoleNames(List<String> roleNames) {
+		this.roleNames = roleNames;
+	}
+	public BusinessCardApplicationRolesList(String appName, List<String> roleNames) {
+		super();
+		this.appName = appName;
+		this.roleNames = roleNames;
+	}
+	@Override
+	public String toString() {
+		return "BusinessCardUserAppRoles [appName=" + appName + ", roleNames=" + roleNames + "]";
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appName == null) ? 0 : appName.hashCode());
+		result = prime * result + ((roleNames == null) ? 0 : roleNames.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		BusinessCardApplicationRolesList other = (BusinessCardApplicationRolesList) obj;
+		if (appName == null) {
+			if (other.appName != null)
+				return false;
+		} else if (!appName.equals(other.appName))
+			return false;
+		if (roleNames == null) {
+			if (other.roleNames != null)
+				return false;
+		} else if (!roleNames.equals(other.roleNames))
+			return false;
+		return true;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CommonWidget.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CommonWidget.java
new file mode 100644
index 00000000..da2ae4ea
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CommonWidget.java
@@ -0,0 +1,139 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * This is to handle portal admins
+ * @author aw3218
+ */
+@Entity 
+@Table(name="fn_common_widget_data")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CommonWidget extends DomainVo{
+
+	private static final long serialVersionUID = 7897021982887364557L;
+	
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	@Column(name = "id")
+	private Long id;
+
+	@Column(name = "category")
+	public String category;
+	
+	@Column(name = "href")
+	public String href;
+
+	@Column(name = "title")
+	public String title;
+	
+	@Column(name = "content")
+	public String content;
+
+	@Column(name = "event_date")
+	public String eventDate;
+	
+	@Column(name = "sort_order")
+	public Integer sortOrder;
+
+	
+	public CommonWidget(){
+		
+	}
+	
+	public CommonWidget(String category, String href, String title, String content, String eventDate, Integer sortOrder){
+		this.category = category;
+		this.href = href;
+		this.title = title;
+		this.content = content;
+		this.eventDate = eventDate;
+		this.sortOrder = sortOrder;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+
+	public String getHref() {
+		return href;
+	}
+
+	public void setHref(String href) {
+		this.href = href;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {		
+		this.id = id;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getEventDate() {
+		return eventDate;
+	}
+
+	public void setEventDate(String eventDate) {
+		this.eventDate = eventDate;
+	}	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CommonWidgetMeta.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CommonWidgetMeta.java
new file mode 100644
index 00000000..ad71b081
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/CommonWidgetMeta.java
@@ -0,0 +1,50 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.List;
+
+public class CommonWidgetMeta {
+	
+	private String category;
+	private List<CommonWidget> items;
+	
+	public CommonWidgetMeta(){	
+		
+	}
+
+	public CommonWidgetMeta(String category, List<CommonWidget> items){
+		this.category = category;
+		this.items = items;
+	}
+	
+	public String getCategory() {
+		return category;
+	}
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	public List<CommonWidget> getItems() {
+		return items;
+	}
+	public void setItems(List<CommonWidget> items) {
+		this.items = items;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPAppsManualPreference.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPAppsManualPreference.java
new file mode 100644
index 00000000..658ef51e
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPAppsManualPreference.java
@@ -0,0 +1,114 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class EPAppsManualPreference {
+	
+	private Long appid;
+	private int col;
+	private String headerText;
+	private String imageLink;
+	private int order;
+	private boolean restrictedApp;
+	private int row;
+	private int sizeX;
+	private int sizeY;
+	private String subHeaderText;
+	private String url;
+	private boolean addRemoveApps;
+	
+	
+	public boolean isAddRemoveApps() {
+		return addRemoveApps;
+	}
+	public void setAddRemoveApps(boolean addRemoveApps) {
+		this.addRemoveApps = addRemoveApps;
+	}
+	public Long getAppid() {
+		return appid;
+	}
+	public void setAppid(Long appid) {
+		this.appid = appid;
+	}
+	public int getCol() {
+		return col;
+	}
+	public void setCol(int col) {
+		this.col = col;
+	}
+	public String getHeaderText() {
+		return headerText;
+	}
+	public void setHeaderText(String headerText) {
+		this.headerText = headerText;
+	}
+	public String getImageLink() {
+		return imageLink;
+	}
+	public void setImageLink(String imageLink) {
+		this.imageLink = imageLink;
+	}
+	public int getOrder() {
+		return order;
+	}
+	public void setOrder(int order) {
+		this.order = order;
+	}
+	public boolean isRestrictedApp() {
+		return restrictedApp;
+	}
+	public void setRestrictedApp(boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+	public int getRow() {
+		return row;
+	}
+	public void setRow(int row) {
+		this.row = row;
+	}
+	public int getSizeX() {
+		return sizeX;
+	}
+	public void setSizeX(int sizeX) {
+		this.sizeX = sizeX;
+	}
+	public int getSizeY() {
+		return sizeY;
+	}
+	public void setSizeY(int sizeY) {
+		this.sizeY = sizeY;
+	}
+	public String getSubHeaderText() {
+		return subHeaderText;
+	}
+	public void setSubHeaderText(String subHeaderText) {
+		this.subHeaderText = subHeaderText;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	
+	public boolean isValid(){
+		return appid != null;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPAppsSortPreference.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPAppsSortPreference.java
new file mode 100644
index 00000000..8aa0860c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPAppsSortPreference.java
@@ -0,0 +1,47 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class EPAppsSortPreference {
+	
+	private int index;
+	private String value;
+	private String title;
+	
+	public int getIndex() {
+		return index;
+	}
+	public void setIndex(int index) {
+		this.index = index;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+	public String getTitle() {
+		return title;
+	}
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPDeleteAppsManualSortPref.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPDeleteAppsManualSortPref.java
new file mode 100644
index 00000000..700b74b1
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPDeleteAppsManualSortPref.java
@@ -0,0 +1,51 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class EPDeleteAppsManualSortPref {
+	private Long appId;
+	private boolean select;
+	private boolean pending;
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public boolean isSelect() {
+		return select;
+	}
+
+	public void setSelect(boolean select) {
+		this.select = select;
+	}
+
+	public boolean isPending() {
+		return pending;
+	}
+
+	public void setPending(boolean pending) {
+		this.pending = pending;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPWidgetsSortPreference.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPWidgetsSortPreference.java
new file mode 100644
index 00000000..3fadf1a4
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EPWidgetsSortPreference.java
@@ -0,0 +1,92 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.List;
+
+public class EPWidgetsSortPreference {
+	
+	private int SizeX;
+	private int SizeY;
+	private String headerText;
+	private String url;
+	private Long widgetid;
+	private List<Object> attrb;
+	private String widgetIdentifier;
+	private int row;
+	private int col;
+	
+	public String getWidgetIdentifier() {
+		return widgetIdentifier;
+	}
+	public List<Object> getAttrb() {
+		return attrb;
+	}
+	public void setAttrb(List<Object> attrb) {
+		this.attrb = attrb;
+	}
+	public void setWidgetIdentifier(String widgetIdentifier) {
+		this.widgetIdentifier = widgetIdentifier;
+	}
+	public int getSizeX() {
+		return SizeX;
+	}
+	public void setSizeX(int sizeX) {
+		SizeX = sizeX;
+	}
+	public int getSizeY() {
+		return SizeY;
+	}
+	public void setSizeY(int sizeY) {
+		SizeY = sizeY;
+	}
+	public String getHeaderText() {
+		return headerText;
+	}
+	public void setHeaderText(String headerText) {
+		this.headerText = headerText;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public Long getWidgetid() {
+		return widgetid;
+	}
+	public void setWidgetid(Long widgetid) {
+		this.widgetid = widgetid;
+	}
+	public int getRow() {
+		return row;
+	}
+	public void setRow(int row) {
+		this.row = row;
+	}
+	public int getCol() {
+		return col;
+	}
+	public void setCol(int col) {
+		this.col = col;
+	}
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java
new file mode 100644
index 00000000..94fbe59a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItem.java
@@ -0,0 +1,328 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+
+/**
+ * This is to handle notifications in notification PopUp
+ */
+
+
+@Entity
+@Table(name = "ep_notification")
+public class EpNotificationItem extends DomainVo {
+	public EpNotificationItem() {
+	};
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "notification_ID")
+	public Long notificationId;
+
+	@Column(name = "is_for_online_users")
+	public String isForOnlineUsers;
+
+	@Column(name = "is_for_all_roles")
+	public String isForAllRoles;
+
+	@Column(name = "active_YN")
+	public String activeYn;
+	
+	@Column(name = "msg_header")
+	public String msgHeader;
+
+	@Column(name = "msg_description")
+	public String msgDescription;
+	
+	@Column(name = "msg_source")
+	public String msgSource;
+
+	@Column(name = "start_time")
+	public Date startTime;
+	
+	@Column(name = "end_time")
+	public Date endTime;
+
+	@Column(name = "priority")
+	public Long priority;
+	
+	@Column(name = "creator_ID")
+	public Long creatorId;
+	
+	@Column(name = "created_date")
+	public Date createdDate;
+		
+	
+	@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL}, orphanRemoval = true)
+	@JoinColumn(name="notification_ID")
+	private Set<EpRoleNotificationItem> roles;
+	
+	@Transient
+	private List<Long> roleIds;
+	
+	public Long getNotificationId() {
+		return notificationId;
+	}
+
+	public void setNotificationId(Long notificationId) {
+		this.notificationId = notificationId;
+	}
+
+	public String getIsForOnlineUsers() {
+		return isForOnlineUsers;
+	}
+
+	public void setIsForOnlineUsers(String isForOnlineUsers) {
+		this.isForOnlineUsers = isForOnlineUsers;
+	}
+
+	public String getIsForAllRoles() {
+		return isForAllRoles;
+	}
+
+	public void setIsForAllRoles(String isForAllRoles) {
+		this.isForAllRoles = isForAllRoles;
+	}
+	
+	public String getActiveYn() {
+		return activeYn;
+	}
+
+	public void setActiveYn(String activeYn) {
+		this.activeYn = activeYn;
+	}
+
+	public String getMsgHeader() {
+		return msgHeader;
+	}
+
+	public void setMsgHeader(String msgHeader) {
+		this.msgHeader = msgHeader;
+	}
+
+	public String getMsgDescription() {
+		return msgDescription;
+	}
+
+	public void setMsgDescription(String msgDescription) {
+		this.msgDescription = msgDescription;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Long getPriority() {
+		return priority;
+	}
+
+	public void setPriority(Long priority) {
+		this.priority = priority;
+	}
+
+	public Long getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Long creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreatedDate() {
+		return createdDate;
+	}
+
+	public void setCreatedDate(Date createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	public Set<EpRoleNotificationItem> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(Set<EpRoleNotificationItem> roles) {
+		this.roles = roles;
+	}
+
+	public List<Long> getRoleIds() {
+		return roleIds;
+	}
+
+	public void setRoleIds(List<Long> roleIds) {
+		this.roleIds = roleIds;
+	}
+	
+	public String getMsgSource() {
+		return msgSource;
+	}
+
+	public void setMsgSource(String msgSource) {
+		this.msgSource = msgSource;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((activeYn == null) ? 0 : activeYn.hashCode());
+		result = prime * result + ((createdDate == null) ? 0 : createdDate.hashCode());
+		result = prime * result + ((creatorId == null) ? 0 : creatorId.hashCode());
+		result = prime * result + ((endTime == null) ? 0 : endTime.hashCode());
+		result = prime * result + ((isForAllRoles == null) ? 0 : isForAllRoles.hashCode());
+		result = prime * result + ((isForOnlineUsers == null) ? 0 : isForOnlineUsers.hashCode());
+		result = prime * result + ((msgDescription == null) ? 0 : msgDescription.hashCode());
+		result = prime * result + ((msgHeader == null) ? 0 : msgHeader.hashCode());
+		result = prime * result + ((msgSource == null) ? 0 : msgSource.hashCode());
+		result = prime * result + ((notificationId == null) ? 0 : notificationId.hashCode());
+		result = prime * result + ((priority == null) ? 0 : priority.hashCode());
+		result = prime * result + ((roleIds == null) ? 0 : roleIds.hashCode());
+		result = prime * result + ((roles == null) ? 0 : roles.hashCode());
+		result = prime * result + ((startTime == null) ? 0 : startTime.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		EpNotificationItem other = (EpNotificationItem) obj;
+		if (activeYn == null) {
+			if (other.activeYn != null)
+				return false;
+		} else if (!activeYn.equals(other.activeYn))
+			return false;
+		if (createdDate == null) {
+			if (other.createdDate != null)
+				return false;
+		} else if (!createdDate.equals(other.createdDate))
+			return false;
+		if (creatorId == null) {
+			if (other.creatorId != null)
+				return false;
+		} else if (!creatorId.equals(other.creatorId))
+			return false;
+		if (endTime == null) {
+			if (other.endTime != null)
+				return false;
+		} else if (!endTime.equals(other.endTime))
+			return false;
+		if (isForAllRoles == null) {
+			if (other.isForAllRoles != null)
+				return false;
+		} else if (!isForAllRoles.equals(other.isForAllRoles))
+			return false;
+		if (isForOnlineUsers == null) {
+			if (other.isForOnlineUsers != null)
+				return false;
+		} else if (!isForOnlineUsers.equals(other.isForOnlineUsers))
+			return false;
+		if (msgDescription == null) {
+			if (other.msgDescription != null)
+				return false;
+		} else if (!msgDescription.equals(other.msgDescription))
+			return false;
+		if (msgHeader == null) {
+			if (other.msgHeader != null)
+				return false;
+		} else if (!msgHeader.equals(other.msgHeader))
+			return false;
+		if (msgSource == null) {
+			if (other.msgSource != null)
+				return false;
+		} else if (!msgSource.equals(other.msgSource))
+			return false;
+		if (notificationId == null) {
+			if (other.notificationId != null)
+				return false;
+		} else if (!notificationId.equals(other.notificationId))
+			return false;
+		if (priority == null) {
+			if (other.priority != null)
+				return false;
+		} else if (!priority.equals(other.priority))
+			return false;
+		if (roleIds == null) {
+			if (other.roleIds != null)
+				return false;
+		} else if (!roleIds.equals(other.roleIds))
+			return false;
+		if (roles == null) {
+			if (other.roles != null)
+				return false;
+		} else if (!roles.equals(other.roles))
+			return false;
+		if (startTime == null) {
+			if (other.startTime != null)
+				return false;
+		} else if (!startTime.equals(other.startTime))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return "EpNotificationItem [notificationId=" + notificationId + ", isForOnlineUsers=" + isForOnlineUsers
+				+ ", isForAllRoles=" + isForAllRoles + ", activeYn=" + activeYn + ", msgHeader=" + msgHeader
+				+ ", msgDescription=" + msgDescription + ", msgSource=" + msgSource + ", startTime=" + startTime
+				+ ", endTime=" + endTime + ", priority=" + priority + ", creatorId=" + creatorId + ", createdDate="
+				+ createdDate + ", roles=" + roles + ", roleIds=" + roleIds + "]";
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemExtVO.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemExtVO.java
new file mode 100644
index 00000000..4a3dc80d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemExtVO.java
@@ -0,0 +1,119 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EpNotificationItemExtVO {
+	
+	private Character activeYn;
+
+	private String msgHeader;
+
+	private String msgDescription;
+
+	private Date startTime;
+
+	private Date endTime;
+
+	private Integer priority;
+
+	private Integer creatorId;
+
+	private Date createdDate;
+	
+	private String loginId;
+
+	public Character getActiveYn() {
+		return activeYn;
+	}
+
+	public void setActiveYn(Character activeYn) {
+		this.activeYn = activeYn;
+	}
+
+	public String getMsgHeader() {
+		return msgHeader;
+	}
+
+	public void setMsgHeader(String msgHeader) {
+		this.msgHeader = msgHeader;
+	}
+
+	public String getMsgDescription() {
+		return msgDescription;
+	}
+
+	public void setMsgDescription(String msgDescription) {
+		this.msgDescription = msgDescription;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getPriority() {
+		return priority;
+	}
+
+	public void setPriority(Integer priority) {
+		this.priority = priority;
+	}
+
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreatedDate() {
+		return createdDate;
+	}
+
+	public void setCreatedDate(Date createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public String getLoginId() {
+		return loginId;
+	}
+
+	public void setLoginId(String loginId) {
+		this.loginId = loginId;
+	} 
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java
new file mode 100644
index 00000000..d22a4b79
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpNotificationItemVO.java
@@ -0,0 +1,191 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+/**
+ * This is to handle notifications in user notifications and in notification history
+ */
+
+/**
+ * POJO that models a single notification with the org user ID (not integer
+ * user_id).
+ */
+@Entity
+public class EpNotificationItemVO extends DomainVo {
+
+	private static final long serialVersionUID = 9095479701352339201L;
+
+	@Id
+	private Integer notificationId;
+
+	private Character isForOnlineUsers;
+
+	private Character isForAllRoles;
+
+	private Character activeYn;
+
+	private String msgHeader;
+
+	private String msgDescription;
+	
+	private String msgSource;
+
+	private Date startTime;
+
+	private Date endTime;
+
+	private Integer priority;
+
+	private Integer creatorId;
+
+	private Date createdDate;
+
+	private String loginId;
+
+	/**
+	 * Answers whether the notification is expired.
+	 * 
+	 * @return true if the end time is past the current time, else false.
+	 */
+	public boolean isExpired() {
+		boolean result = false;
+		if (endTime != null) {
+			int expired = endTime.compareTo(new Date());
+			result = (expired == -1) ? true : false;
+		}
+		return result;
+	}
+
+	public String getLoginId() {
+		return loginId;
+	}
+
+	public void setLoginId(String loginId) {
+		this.loginId = loginId;
+	}
+
+	public Integer getNotificationId() {
+		return notificationId;
+	}
+
+	public void setNotificationId(Integer notificationId) {
+		this.notificationId = notificationId;
+	}
+
+	public Character getIsForOnlineUsers() {
+		return isForOnlineUsers;
+	}
+
+	public void setIsForOnlineUsers(Character isForOnlineUsers) {
+		this.isForOnlineUsers = isForOnlineUsers;
+	}
+
+	public Character getIsForAllRoles() {
+		return isForAllRoles;
+	}
+
+	public void setIsForAllRoles(Character isForAllRoles) {
+		this.isForAllRoles = isForAllRoles;
+	}
+
+	public Character getActiveYn() {
+		return activeYn;
+	}
+
+	public void setActiveYn(Character activeYn) {
+		this.activeYn = activeYn;
+	}
+
+	public String getMsgHeader() {
+		return msgHeader;
+	}
+
+	public void setMsgHeader(String msgHeader) {
+		this.msgHeader = msgHeader;
+	}
+
+	public String getMsgDescription() {
+		return msgDescription;
+	}
+
+	public void setMsgDescription(String msgDescription) {
+		this.msgDescription = msgDescription;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getPriority() {
+		return priority;
+	}
+
+	public void setPriority(Integer priority) {
+		this.priority = priority;
+	}
+
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreatedDate() {
+		return createdDate;
+	}
+
+	public void setCreatedDate(Date createdDate) {
+		this.createdDate = createdDate;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	
+	public String getMsgSource() {
+		return msgSource;
+	}
+
+	public void setMsgSource(String msgSource) {
+		this.msgSource = msgSource;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpRoleNotificationItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpRoleNotificationItem.java
new file mode 100644
index 00000000..66840ed7
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EpRoleNotificationItem.java
@@ -0,0 +1,90 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+
+@Entity
+@Table(name="ep_role_notification")
+public class EpRoleNotificationItem extends DomainVo  {
+	public EpRoleNotificationItem(){};
+	
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "ID")
+	public Long id;
+	
+	@Column(name = "notification_ID")
+	public Long notificationId;
+		
+	@Column(name = "role_ID")
+	public Integer roleId;
+	
+	@Column(name = "recv_user_id")
+	public Integer RecvUserId;
+
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getNotificationId() {
+		return notificationId;
+	}
+
+	public void setNotificationId(Long notificationId) {
+		this.notificationId = notificationId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+ 	
+	public Integer getRecvUserId() {
+		return RecvUserId;
+	}
+
+	public void setRecvUserId(Integer recvUserId) {
+		RecvUserId = recvUserId;
+	}
+
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java
new file mode 100644
index 00000000..569dc138
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidget.java
@@ -0,0 +1,138 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+/*package org.openecomp.portalapp.portal.transport;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.openecomp.portalsdk.core.domain.support.DomainVo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+*//**
+ * This is to handle portal admins
+ * @author aw3218
+ *//*
+@Entity 
+@Table(name="fn_event_widget_data")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EventWidget extends DomainVo{
+
+	*//**
+	 * 
+	 *//*
+	private static final long serialVersionUID = -2784849102886421352L;
+
+	
+	@Id
+	@GeneratedValue(strategy=GenerationType.AUTO)
+	@Column(name = "id")
+	private Long id;
+
+	@Column(name = "category")
+	private String category;
+
+	@Column(name = "title")
+	private String title;
+	
+	@Column(name = "href")
+	private String href;
+
+	@Column(name = "content")
+	private String content;
+	
+	@Column(name = "month_val")
+	private String mon;
+
+	@Column(name = "day_val")
+	private Integer	 day;
+
+	@Column(name = "year_val")
+	private Integer year;
+
+	@Column(name = "sort_order")
+	private Integer sortOrder;
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getHref() {
+		return href;
+	}
+
+	public void setHref(String href) {
+		this.href = href;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getMon() {
+		return mon;
+	}
+
+	public void setMonth(String mon) {
+		this.mon = mon;
+	}
+
+	public Integer getDay() {
+		return day;
+	}
+
+	public void setDay(Integer day) {
+		this.day = day;
+	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	
+	
+}
+*/
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidgetMeta.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidgetMeta.java
new file mode 100644
index 00000000..2182d7b3
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/EventWidgetMeta.java
@@ -0,0 +1,51 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+/*package org.openecomp.portalapp.portal.transport;
+
+import java.util.List;
+
+public class EventWidgetMeta {
+	
+	private String category;
+	private List<EventWidget> items;
+	
+	public EventWidgetMeta(){	
+		
+	}
+
+	public EventWidgetMeta(String category, List<EventWidget> items){
+		this.category = category;
+		this.items = items;
+	}
+	
+	public String getCategory() {
+		return category;
+	}
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	public List<EventWidget> getItems() {
+		return items;
+	}
+	public void setItems(List<EventWidget> items) {
+		this.items = items;
+	}
+}
+*/
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FavoritesFunctionalMenuItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FavoritesFunctionalMenuItem.java
new file mode 100644
index 00000000..d90dfc1e
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FavoritesFunctionalMenuItem.java
@@ -0,0 +1,45 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+/**
+ * This is to handle functional menu favorites
+ */
+@Entity
+@Table(name="fn_menu_favorites")
+public class FavoritesFunctionalMenuItem implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	@Id
+	@Column(name = "user_id")
+	public Long userId;
+	
+	@Id
+	@Column(name = "menu_id")
+	public Long menuId;	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FavoritesFunctionalMenuItemJson.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FavoritesFunctionalMenuItemJson.java
new file mode 100644
index 00000000..e469e0f9
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FavoritesFunctionalMenuItemJson.java
@@ -0,0 +1,57 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+
+
+/**
+ * This is to handle functional menu favorites
+ */
+@Entity
+@Table(name="fn_menu_favorites")
+public class FavoritesFunctionalMenuItemJson implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	@Id
+	@Column(name = "user_id")
+	public Long userId;
+	
+	@Id
+	@Column(name = "menu_id")
+	public Long menuId;
+	
+	@Column(name = "text")
+	public String text;
+	
+	@Column(name = "url")
+	public String url;
+	
+	@Transient
+	public Boolean restrictedApp;
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FieldsValidator.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FieldsValidator.java
new file mode 100644
index 00000000..ab51b7b1
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FieldsValidator.java
@@ -0,0 +1,125 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+public class FieldsValidator {
+
+	public Long httpStatusCode = new Long(HttpServletResponse.SC_OK);
+
+	public Long errorCode;
+
+	public class FieldName {
+
+		public String name;
+
+		public FieldName(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+	}
+	
+
+	public List<FieldName> fields = new ArrayList<FieldName>();
+
+	public void addProblematicFieldName(String name) {
+		fields.add(new FieldName(name));
+	}
+
+	public Long getHttpStatusCode() {
+		return httpStatusCode;
+	}
+
+	public void setHttpStatusCode(Long httpStatusCode) {
+		this.httpStatusCode = httpStatusCode;
+	}
+
+	public Long getErrorCode() {
+		return errorCode;
+	}
+
+	public void setErrorCode(Long errorCode) {
+		this.errorCode = errorCode;
+	}
+
+	public List<FieldName> getFields() {
+		return fields;
+	}
+
+	public void setFields(List<FieldName> fields) {
+		this.fields = fields;
+	}
+
+	@Override
+	public String toString() {
+		return "FieldsValidator [httpStatusCode=" + httpStatusCode + ", errorCode=" + errorCode + ", fields=" + fields
+				+ "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((errorCode == null) ? 0 : errorCode.hashCode());
+		result = prime * result + ((fields == null) ? 0 : fields.hashCode());
+		result = prime * result + ((httpStatusCode == null) ? 0 : httpStatusCode.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		FieldsValidator other = (FieldsValidator) obj;
+		if (errorCode == null) {
+			if (other.errorCode != null)
+				return false;
+		} else if (!errorCode.equals(other.errorCode))
+			return false;
+		if (fields == null) {
+			if (other.fields != null)
+				return false;
+		} else if (!fields.equals(other.fields))
+			return false;
+		if (httpStatusCode == null) {
+			if (other.httpStatusCode != null)
+				return false;
+		} else if (!httpStatusCode.equals(other.httpStatusCode))
+			return false;
+		return true;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuItem.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuItem.java
new file mode 100644
index 00000000..707b08bc
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuItem.java
@@ -0,0 +1,100 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Entity
+@Table(name="fn_menu_functional")
+public class FunctionalMenuItem implements Serializable {
+	public FunctionalMenuItem(){};
+	
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "MENU_ID")
+	public Long menuId;
+	
+	@Column(name = "COLUMN_NUM")
+	public Integer column;
+	
+	@Column(name = "TEXT")
+	public String text;
+	
+	@Column(name = "PARENT_MENU_ID")
+	public Integer parentMenuId;
+	
+	@Column(name = "URL")
+	public String url;
+	
+	@Column(name="ACTIVE_YN")
+	public String active_yn;
+
+	@Transient
+	public Integer appid;
+	
+	public List<Integer> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<Integer> roles) {
+		this.roles = roles;
+	}
+
+	@Transient
+	private List<Integer> roles;
+	
+	@Transient
+	public Boolean restrictedApp;
+	
+	public void normalize() {
+		if (this.column == null)
+			this.column = new Integer(1);
+		this.text = (this.text == null) ? "" : this.text.trim();
+		if (this.parentMenuId == null)
+			this.parentMenuId = new Integer(-1);
+		this.url = (this.url == null) ? "" : this.url.trim();
+	}
+
+	@Override
+	public String toString() {
+		return "FunctionalMenuItem [menuId=" + menuId + ", column=" + column + ", text=" + text + ", parentMenuId="
+				+ parentMenuId + ", url=" + url + ", active_yn=" + active_yn + ", appid=" + appid + ", roles=" + roles
+				+ ", restrictedApp=" + restrictedApp + "]";
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public void setRestrictedApp(Boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuItemWithRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuItemWithRoles.java
new file mode 100644
index 00000000..8e33a5f7
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuItemWithRoles.java
@@ -0,0 +1,60 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+import java.util.List;
+
+// This type is used to read the Json in from the API call from the Front End
+public class FunctionalMenuItemWithRoles implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	public Long menuId;
+	
+	public Integer column;
+	
+	public String text;
+	
+	public Integer parentMenuId;
+	
+	public String url;
+
+	public Integer appid;
+	
+	private List<Integer> roles;
+
+	public List<Integer> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<Integer> roles) {
+		this.roles = roles;
+	}
+
+	public void normalize() {
+		if (this.column == null)
+			this.column = new Integer(1);
+		this.text = (this.text == null) ? "" : this.text.trim();
+		if (this.parentMenuId == null)
+			this.parentMenuId = new Integer(-1);
+		this.url = (this.url == null) ? "" : this.url.trim();
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuRole.java
new file mode 100644
index 00000000..0033b62a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/FunctionalMenuRole.java
@@ -0,0 +1,115 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="fn_menu_functional_roles")
+public class FunctionalMenuRole implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "ID")
+	public Integer id;
+	
+	@Column(name = "MENU_ID")
+	public Long menuId;
+	
+	@Column(name = "APP_ID")
+	public Integer appId;
+	
+	@Column(name = "ROLE_ID")
+	public Integer roleId;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Long getMenuId() {
+		return menuId;
+	}
+
+	public void setMenuId(Long menuId) {
+		this.menuId = menuId;
+	}
+
+	public Integer getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Integer appId) {
+		this.appId = appId;
+	}
+
+	public Integer getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Integer roleId) {
+		this.roleId = roleId;
+	}
+
+	@Override
+	public String toString() {
+		return "FunctionalMenuRole [id=" + id + ", menuId=" + menuId + ", appId=" + appId + ", roleId=" + roleId + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((appId == null) ? 0 : appId.hashCode());
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((menuId == null) ? 0 : menuId.hashCode());
+		result = prime * result + ((roleId == null) ? 0 : roleId.hashCode());
+		return result;
+	}
+
+	@Override
+    public boolean equals(Object o) {
+
+        if (o == this) return true;
+        if (!(o instanceof FunctionalMenuRole)) {
+            return false;
+        }
+        FunctionalMenuRole functionalMenuRole = (FunctionalMenuRole) o;
+        System.out.println("test");
+        return  id.equals(functionalMenuRole.getId()) &&
+        		menuId.equals(functionalMenuRole.menuId) &&
+        		appId.equals(functionalMenuRole.appId) &&
+        		roleId.equals(functionalMenuRole.roleId) ;
+    }
+	
+	
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/LocalRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/LocalRole.java
new file mode 100644
index 00000000..06fd6aec
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/LocalRole.java
@@ -0,0 +1,42 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class LocalRole implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "ROLE_ID")
+	public Integer roleId;
+	
+	@Column(name = "ROLE_NAME")
+	public String rolename;
+	
+	public void normalize() {
+		this.rolename = (this.rolename == null) ? "" : this.rolename.trim();
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java
new file mode 100644
index 00000000..977269d2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingApp.java
@@ -0,0 +1,99 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+/**
+ * Model of rows in the fn_app table; serialized as a message add or update an
+ * on-boarded application.
+ */
+public class OnboardingApp {
+
+	public Long id;
+
+	public String name;
+
+	public String imageUrl;
+
+	public String description;
+
+	public String notes;
+
+	public String url;
+
+	public String alternateUrl;
+
+	public String restUrl;
+
+	public Boolean isOpen;
+
+	public Boolean isEnabled;
+
+	public Long motsId;
+
+	public String myLoginsAppName;
+
+	public String myLoginsAppOwner;
+
+	public String username;
+
+	public String appPassword;
+
+	public String thumbnail;
+
+	public String uebTopicName;
+
+	public String uebKey;
+
+	public String uebSecret;
+
+	public Boolean restrictedApp;
+
+	/**
+	 * Sets the name, myLoginsAppName, myLoginsAppOwner, username and
+	 * appPassword fields to the empty string OR trims leading/trailing space,
+	 * as appropriate.
+	 */
+	public void normalize() {
+		this.name = (this.name == null) ? "" : this.name.trim();
+		this.myLoginsAppName = (this.myLoginsAppName == null) ? "" : this.myLoginsAppName.trim();
+		this.myLoginsAppOwner = (this.myLoginsAppOwner == null) ? "" : this.myLoginsAppOwner.trim();
+		this.username = (this.username == null) ? "" : this.username.trim();
+		this.appPassword = (this.appPassword == null) ? "" : this.appPassword.trim();
+	}
+
+	public void setUebTopicName(String topicName) {
+		this.uebTopicName = topicName;
+	}
+
+	public void setUebKey(String key) {
+		this.uebKey = key;
+	}
+
+	public void setUebSecret(String secret) {
+		this.uebSecret = secret;
+	}
+
+	// Hide the implementation of restricted and normal app from the front end.
+	// The json sent and received will include restrictedApp but not appType.
+
+	public void setRestrictedApp(Boolean restrictedApp) {
+		this.restrictedApp = restrictedApp;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingWidget.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingWidget.java
new file mode 100644
index 00000000..09471d7f
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/OnboardingWidget.java
@@ -0,0 +1,65 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class OnboardingWidget implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "WIDGET_ID")
+	public Long id;
+
+	@Column(name = "WDG_NAME")
+	public String name;
+
+	@Column(name = "APP_ID")
+	public Long appId;
+
+	@Column(name = "APP_NAME")
+	public String appName;
+
+	@Column(name = "WDG_WIDTH")
+	public Integer width;
+
+	@Column(name = "WDG_HEIGHT")
+	public Integer height;
+
+	@Column(name = "WDG_URL")
+	public String url;
+
+	public void normalize() {
+		this.name = (this.name == null) ? "" : this.name.trim();
+		this.appName = (this.appName == null) ? "" : this.appName.trim();
+		if (this.width == null)
+			this.width = new Integer(0);
+		if (this.height == null)
+			this.height = new Integer(0);
+		this.url = (this.url == null) ? "" : this.url.trim();
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/PortalAdmin.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/PortalAdmin.java
new file mode 100644
index 00000000..0481eb61
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/PortalAdmin.java
@@ -0,0 +1,53 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * This is to handle portal admins
+ */
+@Entity
+@Table(name="fn_user")
+public class PortalAdmin implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+	@Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+	@Column(name = "user_id")
+	public Long userId;
+	
+	@Column(name = "login_id")
+	public String loginId;		
+	
+	@Column(name = "first_name")
+	public String firstName;
+	
+	@Column(name = "last_name")
+	public String lastName;
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/PortalAdminUserRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/PortalAdminUserRole.java
new file mode 100644
index 00000000..06229fc1
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/PortalAdminUserRole.java
@@ -0,0 +1,48 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * This is to handle portal admins
+ */
+@Entity
+@Table(name="fn_user_role")
+public class PortalAdminUserRole implements Serializable{
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "user_id")
+	public Long userId;
+	
+	@Id
+	@Column(name = "role_id")
+	public Long roleId;
+	
+	@Column(name = "app_id")
+	public Long appId;
+		
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RemoteRole.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RemoteRole.java
new file mode 100644
index 00000000..0f152772
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RemoteRole.java
@@ -0,0 +1,44 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class RemoteRole {
+
+	private Long id;
+	private String name;
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@Override
+	public String toString() {
+		return "RemoteRole [id=" + id + ", name=" + name + "]";
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RemoteUserWithRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RemoteUserWithRoles.java
new file mode 100644
index 00000000..7095991c
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RemoteUserWithRoles.java
@@ -0,0 +1,197 @@
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+
+/**
+ * User description which we receive in response from request to remote
+ * application: applicationsRestClientService.get(RemoteUserWithRoles[].class,
+ * appId, "/users"). It contains the most important info about remote
+ * application user including his roles in this application.
+ */
+public class RemoteUserWithRoles {
+
+	private Long orgId;
+
+	private Long managerId;
+
+	private String firstName;
+
+	private String middleInitial;
+
+	private String lastName;
+
+	private String phone;
+
+	private String email;
+
+	private String hrid;
+
+	private String orgUserId;
+
+	private String orgCode;
+
+	private String orgManagerUserId;
+
+	private String jobTitle;
+
+	private String loginId;
+
+	private Boolean active;
+
+	private List<RemoteRole> roles = new ArrayList<RemoteRole>();
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public Long getManagerId() {
+		return managerId;
+	}
+
+	public void setManagerId(Long managerId) {
+		this.managerId = managerId;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getMiddleInitial() {
+		return middleInitial;
+	}
+
+	public void setMiddleInitial(String middleInitial) {
+		this.middleInitial = middleInitial;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getHrid() {
+		return hrid;
+	}
+
+	public void setHrid(String hrid) {
+		this.hrid = hrid;
+	}
+
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		if(this.orgUserId == null)
+			this.orgUserId = orgUserId;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getOrgManagerUserId() {
+		return orgManagerUserId;
+	}
+
+	public void setOrgManagerUserId(String orgManagerUserId) {
+		this.orgManagerUserId = orgManagerUserId;
+	}
+
+	public String getJobTitle() {
+		return jobTitle;
+	}
+
+	public void setJobTitle(String jobTitle) {
+		this.jobTitle = jobTitle;
+	}
+
+	public String getLoginId() {
+		return loginId;
+	}
+
+	public void setLoginId(String loginId) {
+		this.loginId = loginId;
+	}
+
+	public Boolean getActive() {
+		return active;
+	}
+
+	public void setActive(Boolean active) {
+		this.active = active;
+	}
+
+	public List<RemoteRole> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<RemoteRole> roles) {
+		this.roles = roles;
+	}
+
+	@Override
+	public String toString() {
+		return "RemoteUserWithRoles [orgId=" + orgId + ", managerId=" + managerId + ", firstName=" + firstName
+				+ ", middleInitial=" + middleInitial + ", lastName=" + lastName + ", phone=" + phone + ", email="
+				+ email + ", hrid=" + hrid + ", orgUserId=" + orgUserId + ", orgCode=" + orgCode + ", orgManagerUserId="
+				+ orgManagerUserId + ", jobTitle=" + jobTitle + ", loginId=" + loginId + ", active=" + active
+				+ ", roles=" + roles + "]";
+	}
+	
+	
+	
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RoleInAppForUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RoleInAppForUser.java
new file mode 100644
index 00000000..dad1c98b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RoleInAppForUser.java
@@ -0,0 +1,105 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class RoleInAppForUser {
+
+
+	public RoleInAppForUser() {
+	}
+	
+	public RoleInAppForUser(Long id, String name) {
+		this.roleId = id;
+		this.roleName = name;
+	}
+
+	public Long roleId;
+
+	public String roleName;
+
+	public Boolean isApplied;
+
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public Boolean getIsApplied() {
+		return isApplied;
+	}
+
+	public void setIsApplied(Boolean isApplied) {
+		this.isApplied = isApplied;
+	}
+
+	@Override
+	public String toString() {
+		return "RoleInAppForUser [roleId=" + roleId + ", roleName=" + roleName + ", isApplied=" + isApplied + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((isApplied == null) ? 0 : isApplied.hashCode());
+		result = prime * result + ((roleId == null) ? 0 : roleId.hashCode());
+		result = prime * result + ((roleName == null) ? 0 : roleName.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		RoleInAppForUser other = (RoleInAppForUser) obj;
+		if (isApplied == null) {
+			if (other.isApplied != null)
+				return false;
+		} else if (!isApplied.equals(other.isApplied))
+			return false;
+		if (roleId == null) {
+			if (other.roleId != null)
+				return false;
+		} else if (!roleId.equals(other.roleId))
+			return false;
+		if (roleName == null) {
+			if (other.roleName != null)
+				return false;
+		} else if (!roleName.equals(other.roleName))
+			return false;
+		return true;
+	}
+	
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RolesInAppForUser.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RolesInAppForUser.java
new file mode 100644
index 00000000..8720304d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/RolesInAppForUser.java
@@ -0,0 +1,33 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RolesInAppForUser {
+
+	public String orgUserId;
+	
+	public Long appId;
+
+	public List<RoleInAppForUser> roles = new ArrayList<RoleInAppForUser>();
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/UserApplicationRoles.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/UserApplicationRoles.java
new file mode 100644
index 00000000..75aba7ab
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/UserApplicationRoles.java
@@ -0,0 +1,86 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A specific application user and his application specific roles.
+ *
+ */
+public class UserApplicationRoles {
+
+	private Long appId;
+
+	private String orgUserId;
+
+	private String firstName;
+
+	private String lastName;
+
+	private List<RemoteRole> roles = new ArrayList<RemoteRole>();
+
+	public Long getAppId() {
+		return appId;
+	}
+
+	public void setAppId(Long appId) {
+		this.appId = appId;
+	}
+
+	public String getOrgUserId() {
+		return orgUserId;
+	}
+
+	public void setOrgUserId(String orgUserId) {
+		this.orgUserId = orgUserId;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public List<RemoteRole> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<RemoteRole> roles) {
+		this.roles = roles;
+	}
+	
+	@Override
+	public String toString() {
+		return "UserApplicationRoles [appId=" + appId + ", orgUserId=" + orgUserId + ", firstName=" + firstName
+				+ ", lastName=" + lastName + ", roles=" + roles + "]";
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/UserWithNameSurnameTitle.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/UserWithNameSurnameTitle.java
new file mode 100644
index 00000000..ba411e65
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/UserWithNameSurnameTitle.java
@@ -0,0 +1,39 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+public class UserWithNameSurnameTitle {
+	
+	public String orgUserId;
+
+	public String firstName;
+
+	public String lastName;
+
+	public String jobTitle;
+	
+	public UserWithNameSurnameTitle(String orgUserId, String firstName, String lastName, String jobTitle) {
+		this.orgUserId = orgUserId;
+		this.firstName = firstName;
+		this.lastName = lastName;
+		this.jobTitle = jobTitle;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/WidgetCatalogPersonalization.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/WidgetCatalogPersonalization.java
new file mode 100644
index 00000000..5117e8f2
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/transport/WidgetCatalogPersonalization.java
@@ -0,0 +1,57 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.transport;
+
+/**
+ * Model for the object PUT to the controller when the user takes an action on
+ * a widget in the catalog.
+ */
+
+public class WidgetCatalogPersonalization {
+	
+		public Long widgetId;
+		public Boolean select;
+		// not needed as only 'SHOW' and 'HIDE' status_cd is expected from the micro service now
+		//public Boolean pending;
+
+		public Long getWidgetId() {
+			return widgetId;
+		}
+
+		public void setWidgetId(Long widgetId) {
+			this.widgetId = widgetId;
+		}
+
+		public Boolean getSelect() {
+			return select;
+		}
+
+		public void setSelect(Boolean select) {
+			this.select = select;
+		}
+
+		/*public Boolean getPending() {
+			return pending;
+		}
+
+		public void setPending(Boolean pending) {
+			this.pending = pending;
+		}*/
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java
new file mode 100644
index 00000000..3c447e2a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebHelper.java
@@ -0,0 +1,217 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ueb;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
+import org.openecomp.portalsdk.core.onboarding.ueb.Helper;
+import org.openecomp.portalsdk.core.onboarding.ueb.Publisher;
+import org.openecomp.portalsdk.core.onboarding.ueb.UebException;
+import org.openecomp.portalsdk.core.onboarding.ueb.UebManager;
+import org.openecomp.portalsdk.core.onboarding.ueb.UebMsg;
+import org.openecomp.portalapp.portal.domain.EPApp;
+import org.openecomp.portalapp.portal.domain.EcompApp;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.EPAppService;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Component
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+public class EPUebHelper {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPUebHelper.class);
+	
+	@Autowired
+	EPAppService appsService;
+	
+	
+	@Autowired
+	private SessionFactory sessionFactory;
+	
+	@SuppressWarnings("unused")
+	private Publisher epPublisher;
+	
+	public EPUebHelper() {
+		
+	}
+	//
+	// This should only be called by the ECOMP Portal App, other Apps have just one publisher and use appPublisher
+	//
+	@SuppressWarnings("unused")
+	@EPMetricsLog
+	public void refreshPublisherList()
+	{
+		Session localSession = null;
+	    boolean addedPublisher = false;
+	    
+		try {
+			localSession = sessionFactory.openSession();
+		
+			List<EcompApp> apps = appsService.getEcompAppAppsFullList();
+			for (int i = 0; i < apps.size(); i++) 
+			{
+				if ((apps.get(i).isEnabled()) &&
+					(apps.get(i).getUebTopicName() != null) &&
+					!(apps.get(i).getUebTopicName().toUpperCase().contains("ECOMP-PORTAL-INBOX")))
+				{
+					logger.debug(EELFLoggerDelegate.debugLogger, "UEBManager adding publisher for " + apps.get(i).getUebTopicName());
+					UebManager.getInstance().addPublisher(apps.get(i).getUebTopicName());
+	                addedPublisher = true;
+			    }
+				else if ((apps.get(i).getId() != 1) && // App may have been disabled, remove the publisher
+					   	 !(apps.get(i).isEnabled()))
+				{
+					if(apps.get(i).getUebTopicName()!=null){
+						UebManager.getInstance().removePublisher(apps.get(i).getUebTopicName());
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebSystemError, e, "add/remove Publisher");
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while refreshing the publisher list", e);
+		}
+		
+		//publisherList.print();
+		
+		if (addedPublisher == true) // Give publishers time to initialize
+		{
+			Helper.sleep(400);
+		}
+	}
+	
+	@PostConstruct
+	@EPMetricsLog
+	public void initUeb() {
+		try {
+			epPublisher = new Publisher(PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_KEY), 
+					                    PortalApiProperties.getProperty(PortalApiConstants.UEB_APP_SECRET), 
+					                    PortalApiProperties.getProperty(PortalApiConstants.ECOMP_PORTAL_INBOX_NAME));
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebConnectionError, e);
+			String stackTrace = EcompPortalUtils.getStackTrace(e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while initializing the publisher. Details: " + stackTrace);
+		}
+		
+		Thread thread = new Thread("EPUebManager: postConstructMethod - refreshPublisherList") {
+		    public void run(){
+	  	        refreshPublisherList();
+		    }
+		};
+		if (thread != null) {
+		    thread.start();
+		}
+	}
+
+	@EPMetricsLog
+	public void addPublisher(EPApp app) {
+		// TODO Auto-generated method stub
+		try {
+			UebManager.getInstance().addPublisher(app.getUebTopicName());
+		} catch (UebException e) {
+			String stackTrace = EcompPortalUtils.getStackTrace(e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception while adding a publisher. Details: " + stackTrace);
+		}
+	}
+	
+	public boolean checkAvailability() {
+		
+		//
+		//  Test existence of topic at UEB url
+		//
+		//  (ie http://uebsb91kcdc.it.att.com:3904/topics/ECOMP-PORTAL-INBOX)
+		//
+		boolean available = true;
+		LinkedList<String> urlList = Helper.uebUrlList();
+		if (!urlList.isEmpty()) {
+		    String url = "http://" + urlList.getFirst() + ":3904/topics/" + PortalApiProperties.getProperty(PortalApiConstants.ECOMP_PORTAL_INBOX_NAME);
+		    if (!url.isEmpty()) {
+		        try {
+		            URL siteURL = new URL(url);
+		            HttpURLConnection connection = (HttpURLConnection) siteURL.openConnection();
+		            connection.setRequestMethod("GET");
+		            connection.connect();
+		     
+		            int code = connection.getResponseCode();
+		            if (code == 200) {
+		                available = true;
+		            }
+		            else {
+		            	EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeUebConnectionError, url);
+		                available = false;
+		                logger.warn(EELFLoggerDelegate.errorLogger, "Warning! UEB topic existence check failed, topic = " + url );
+		                logger.debug(EELFLoggerDelegate.debugLogger, "Warning! UEB topic existence check failed, topic = " + url );
+		            }
+		        }
+		        catch (Exception e) {
+		            available = false;
+		            String stackTrace = EcompPortalUtils.getStackTrace(e);
+					logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing the UEB Healthcheck. Details: " + stackTrace);
+		        }
+		    }
+		}
+		return available;
+	}
+	
+    public boolean MessageCanBeSentToTopic() {
+    
+    	boolean sentMsgSuccessfully = false;
+    	
+	    UebMsg msg = new UebMsg();
+	    msg.putSourceTopicName(PortalApiProperties.getProperty(PortalApiConstants.ECOMP_PORTAL_INBOX_NAME));
+	    msg.putPayload("Pinging topic for health check");
+	    msg.putMsgType(EPUebMsgTypes.UEB_MSG_TYPE_HEALTH_CHECK);
+	
+	    try {
+		   // epPublisher.send(msg);
+		    sentMsgSuccessfully = true;
+	    } 
+	    catch (Exception e) {
+	    	EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHealthCheckUebClusterError, e);
+		    sentMsgSuccessfully = false;
+		    logger.warn(EELFLoggerDelegate.errorLogger, "Warning! could not successfully publish a UEB msg to " 
+		                     + PortalApiProperties.getProperty(PortalApiConstants.ECOMP_PORTAL_INBOX_NAME), e); 
+	    } 
+	    
+	    return sentMsgSuccessfully;
+    }
+    
+}
+
+
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebMsgTypes.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebMsgTypes.java
new file mode 100644
index 00000000..aef02545
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/ueb/EPUebMsgTypes.java
@@ -0,0 +1,27 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.ueb;
+
+import org.openecomp.portalsdk.core.onboarding.ueb.UebMsgTypes;
+
+public interface EPUebMsgTypes extends UebMsgTypes {
+
+	public static final String UEB_MSG_TYPE_HEALTH_CHECK = "uebHealthCheckPing";
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/CustomLoggingFilter.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/CustomLoggingFilter.java
new file mode 100644
index 00000000..a43f5177
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/CustomLoggingFilter.java
@@ -0,0 +1,54 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+
+/**
+ * Custom Filter class bind with logback.xml
+ * configuration file to strip out certain log messages
+ * coming out of special packages or classes.
+ *
+ */
+public class CustomLoggingFilter extends Filter<ILoggingEvent> {
+
+	/**
+	 * Custom Filter is added to strip out the continuous U-EB logging messages
+	 * But make sure we log the ERROR & WARNING Level messages.
+	 */
+	@Override
+	public FilterReply decide(ILoggingEvent event) {
+		try {
+			if ((event.getLevel() != Level.ERROR || event.getLevel() != Level.WARN) && 
+				(event.getThreadName().equalsIgnoreCase("UEBConsumerThread")) &&
+				(event.getLoggerName().contains("org.openecomp.nsa") || event.getLoggerName().contains("org.apache.http"))
+				) {
+				return FilterReply.DENY;
+			} else {
+				return FilterReply.NEUTRAL;
+			}
+		} catch(Exception e) {
+			return FilterReply.NEUTRAL;
+		} 
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java
new file mode 100644
index 00000000..38b6608a
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EPCommonSystemProperties.java
@@ -0,0 +1,64 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+import org.openecomp.portalsdk.core.util.SystemProperties;
+
+public class EPCommonSystemProperties extends SystemProperties {
+
+	public static final String LOGIN_URL_NO_RET_VAL           		= "login_url_no_ret_val";
+	public static final String ECOMP_APP_ID                       	= "ecomp_app_id";
+	public static final String SYS_ADMIN_ROLE_ID                  	= "sys_admin_role_id";
+	public static final String DUBLICATED_FIELD_VALUE_ECOMP_ERROR 	= "1201";
+	public static final String ACCOUNT_ADMIN_ROLE_ID              	= "account_admin_role_id";
+	public static final String RESTRICTED_APP_ROLE_ID				= "restricted_app_role_id";
+	public static final String FE_URL                        	  	= "frontend_url";
+	public static final String HEALTH_POLL_INTERVAL_SECONDS       	= "health_poll_interval_seconds";
+	public static final String HEALTHFAIL_ALERT_EVERY_X_INTERVALS 	= "health_fail_alert_every_x_intervals";
+	public static final String USER_GUIDE_URL                       = "user_guide_link";
+	
+	public static final String USER_FIRST_NAME 						= "USER_FIRST_NAME";
+	public static final String USER_LAST_NAME						= "USER_LAST_NAME";
+	public static final String USER_EMAIL 							= "USER_EMAIL";
+	public static final String USER_ORG_USERID						= "USER_ORG_USERID";
+	
+	public static final String USH_TICKET_URL						= "ush_ticket_url"; 
+
+	public static final String EXTERNAL_API_RESPONSE_CODE			= "External_API_ResponseCode";
+	public static final String COOKIE_DOMAIN                        = "cookie_domain";
+
+	public static final String FEEDBACK_EMAIL_ADDRESS				= "feedback_email_address";
+	public static final String PORTAL_INFO_URL						= "portal_info_url";
+	
+	public static final String ONLINE_USER_UPDATE_RATE				= "online_user_update_rate";
+	public static final String ONLINE_USER_UPDATE_DURATION			= "online_user_update_duration";
+	
+	public static final String NOTIFICATION_UPDATE_RATE				= "notification_update_rate";
+	public static final String NOTIFICATION_UPDATE_DURATION			= "notification_update_duration";
+	
+	public static final String WINDOW_WIDTH_THRESHOLD_LEFT_MENU		= "window_width_threshold_left_menu";
+	public static final String WINDOW_WIDTH_THRESHOLD_RIGHT_MENU	= "window_width_threshold_right_menu";
+		
+	public static final String AUDITLOG_DEL_DAY_FROM				= "auditlog_del_day_from";
+	public static final String AUDITLOG_DELETE_CRON   				= "auditlog_delete_cron";
+	
+	public static final String AUTH_USER_SERVER 					= "auth_user_server";
+	public static final String EXTERNAL_ACCESS_ENABLE 				= "external_access_enable";
+}
+\ No newline at end of file
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
new file mode 100644
index 00000000..adf36b2b
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompPortalUtils.java
@@ -0,0 +1,331 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.slf4j.MDC;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EcompPortalUtils {
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EcompPortalUtils.class);
+
+	/**
+	 * @param orgUserId
+	 * @return true if orgUserId is not empty and contains only alphanumeric,
+	 *         false otherwise
+	 */
+	public static boolean legitimateUserId(String orgUserId) {
+		return orgUserId.matches("^[a-zA-Z0-9]+$");
+	}
+
+	/**
+	 * Splits the string into a list of tokens using the specified regular
+	 * expression
+	 * 
+	 * @param source
+	 * @param regex
+	 * @return List of tokens split from the source
+	 */
+	public static List<String> parsingByRegularExpression(String source, String regex) {
+		List<String> tokens = new ArrayList<String>();
+		if (source != null && source.length() > 0) {
+			String[] parsed = source.split(regex);
+			for (String token : parsed) {
+				if (token.length() > 0) {
+					tokens.add(token);
+				}
+			}
+		}
+		return tokens;
+	}
+
+	/**
+	 * Builds a JSON object with error code and message information.
+	 * 
+	 * @param errorCode
+	 * @param errorMessage
+	 * @return JSON object as a String
+	 */
+	public static String jsonErrorMessageResponse(int errorCode, String errorMessage) {
+		return "{\"error\":{\"code\":" + errorCode + "," + "\"message\":\"" + errorMessage + "\"}}";
+	}
+
+	/**
+	 * Builds a JSON object with the specified message
+	 * 
+	 * @param message
+	 * @return JSON object as a String
+	 */
+	public static String jsonMessageResponse(String message) {
+		return String.format("{\"message\":\"%s\"}", message);
+	}
+
+	/**
+	 * Serializes the specified object as JSON and writes the result to the
+	 * debug log. If serialization fails, logs a message to the error logger.
+	 * 
+	 * @param logger
+	 *            Logger for the class where the object was built; the logger
+	 *            carries the class name.
+	 * @param source
+	 *            First portion of the log message
+	 * @param msg
+	 *            Second portion of the log message
+	 * @param obj
+	 *            Object to serialize as JSON
+	 */
+	public static void logAndSerializeObject(EELFLoggerDelegate logger, String source, String msg, Object obj) {
+		try {
+			String objectAsJson = new ObjectMapper().writeValueAsString(obj);
+			logger.debug(EELFLoggerDelegate.debugLogger,
+					String.format("source= [%s]; %s [%s];", source, msg, objectAsJson));
+		} catch (JsonProcessingException e) {
+			logger.warn(EELFLoggerDelegate.errorLogger, "logAndSerializedObject failed to serialize", e);
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "logAndSerializedObject failed", e);
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+		}
+	}
+
+	/**
+	 * Serializes the specified object as JSON and writes the result to the
+	 * debug log. If serialization fails, logs a message to the error logger.
+	 * 
+	 * @param source
+	 *            First portion of the log message
+	 * @param msg
+	 *            Second portion of the log message
+	 * @param obj
+	 *            Object to serialize as JSON
+	 */
+	public static void logAndSerializeObject(String source, String msg, Object obj) {
+		logAndSerializeObject(logger, source, msg, obj);
+	}
+
+	public static void rollbackTransaction(Transaction transaction, String errorMessage) {
+		logger.error(EELFLoggerDelegate.errorLogger, errorMessage);
+		try {
+			if (transaction != null) {
+				transaction.rollback();
+			}
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeExecuteRollbackError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while performing a rollback transaction",
+					e);
+		}
+	}
+
+	public static void closeLocalSession(Session localSession, String errorMessage) {
+		logger.error(EELFLoggerDelegate.errorLogger, errorMessage);
+		try {
+			if (localSession != null) {
+				localSession.close();
+			}
+		} catch (Exception e) {
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeDaoCloseSessionError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, errorMessage + ", closeLocalSession exception", e);
+		}
+	}
+
+	// TODO: GLOBAL_LOGIN_URL is the same as in SessionTimeoutInterceptor.
+	// It should be defined in SystemProperties.
+	private static final String GLOBAL_LOGIN_URL = "global-login-url";
+
+	/**
+	 * Set response status to Unauthorized if user == null and to Forbidden in
+	 * all (!) other cases. Logging is not performed if invocator == null
+	 * 
+	 * @param user
+	 * @param response
+	 * @param invocator
+	 *            - may be null
+	 */
+	public static void setBadPermissions(EPUser user, HttpServletResponse response, String invocator) {
+		if (user == null) {
+			String loginUrl = SystemProperties.getProperty(EPCommonSystemProperties.LOGIN_URL_NO_RET_VAL);
+			response.setHeader(GLOBAL_LOGIN_URL, loginUrl);
+			response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+			MDC.put(EPCommonSystemProperties.RESPONSE_CODE, Integer.toString(HttpServletResponse.SC_UNAUTHORIZED));
+		} else {
+			response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+			MDC.put(EPCommonSystemProperties.RESPONSE_CODE, Integer.toString(HttpServletResponse.SC_FORBIDDEN));
+		}
+		if (invocator != null) {
+			logger.warn(EELFLoggerDelegate.errorLogger,
+					invocator + ", permissions problem, response status = " + response.getStatus());
+		}
+	}
+
+	public static int getExternalAppResponseCode() {
+		String responseCode = MDC.get(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE);
+		int responseCodeInt = 0;
+		try {
+			if (responseCode != null && responseCode != "") {
+				responseCodeInt = Integer.valueOf(responseCode);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred in getResponseCode(). Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		return responseCodeInt;
+	}
+
+	// This method might be just for testing purposes.
+	public static void setExternalAppResponseCode(int responseCode) {
+		try {
+			String responseCodeString = String.valueOf(responseCode);
+			MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE, responseCodeString);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred in setResponseCode(). Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+	}
+
+	public static String getHTTPStatusString(int httpStatusCode) {
+		String httpStatusString = "unknown_error";
+		try {
+			httpStatusString = org.springframework.http.HttpStatus.valueOf(httpStatusCode).name();
+			if (httpStatusString != null) {
+				httpStatusString = httpStatusString.toLowerCase();
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred in getHTTPStatusString(). Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		return httpStatusString;
+	}
+
+	public static String getFEErrorString(Boolean internal, int responseCode) {
+		// Return a String like the following:
+		// "Internal Ecomp Error: 500 internal_server_error" or
+		// "External App Error: 404 not_found"
+		// TODO: create our own Ecomp error codes, starting with 1000 and up.
+		String responseString = "";
+		String internalExternalString = internal ? "Ecomp Error: " : "App Error: ";
+		String httpStatusString = "unknown_error";
+		try {
+			if (responseCode < 1000) {
+				httpStatusString = getHTTPStatusString(responseCode);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger,
+					"Exception occurred in getFEErrorString(). Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		responseString = internalExternalString + responseCode + " " + httpStatusString;
+		return responseString;
+	}
+
+	public static boolean isProductionBuild() {
+		boolean productionBuild = true;
+		String epVersion = EcompVersion.buildNumber;
+		if (epVersion != null) {
+			int buildNum = epVersion.lastIndexOf('.');
+			if (buildNum > 0) {
+				int buildNumber = Integer.parseInt(epVersion.substring(buildNum + 1));
+				if (buildNumber < 3000) // Production versions are 3000+, (ie
+										// 1.0.3003)
+				{
+					productionBuild = false;
+				}
+			}
+		}
+		return productionBuild;
+	}
+
+	private static final Object stackTraceLock = new Object();
+
+	public static String getStackTrace(Throwable t) {
+		synchronized (stackTraceLock) {
+			StringWriter sw = new StringWriter();
+			PrintWriter pw = new PrintWriter(sw);
+			t.printStackTrace(pw);
+			return sw.toString();
+		}
+	}
+
+	public static String getMyIpAdddress() {
+		InetAddress ip;
+		String localIp;
+		try {
+			ip = InetAddress.getLocalHost();
+			localIp = ip.getHostAddress();
+		} catch (UnknownHostException e) {
+			localIp = "unknown";
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		}
+		return localIp;
+	}
+
+	public static String getMyHostName() {
+		InetAddress ip;
+		String hostName;
+		try {
+			ip = InetAddress.getLocalHost();
+			hostName = ip.getHostName();
+		} catch (UnknownHostException e) {
+			hostName = "unknown";
+			logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+		}
+		return hostName;
+	}
+
+	/* return a default property if the expected one is not available */
+	public static String getPropertyOrDefault(String property, String defaultValue) {
+		return ((null == SystemProperties.getProperty(property) || SystemProperties.getProperty(property).equals(""))
+				? defaultValue : SystemProperties.getProperty(property));
+	}
+
+	public static void calculateDateTimeDifferenceForLog(String beginDateTime, String endDateTime) {
+		if (beginDateTime != null && endDateTime != null) {
+			try {
+				SimpleDateFormat ecompLogDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
+
+				Date beginDate = ecompLogDateFormat.parse(beginDateTime);
+				Date endDate = ecompLogDateFormat.parse(endDateTime);
+				String timeDifference = String.format("%d", endDate.getTime() - beginDate.getTime());
+				MDC.put(SystemProperties.MDC_TIMER, timeDifference);
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+			}
+		}
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompVersion.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompVersion.java
new file mode 100644
index 00000000..a4d5e0c1
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/EcompVersion.java
@@ -0,0 +1,33 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+//
+// Hardcoded for now, wanted to use maven and resource file.  Possibly just read
+// pom.properties file with version added, but spent several hours already running
+// into issues with that and other ideas not working.  So, for 1604 deadlines I 
+// am just putting the version in the code here... for now.
+//
+public final class EcompVersion {
+
+	// TODO - not used - manifest service reads from manifest
+    public static final String buildNumber="1610.1.999";
+    
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/HashMapFromList.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/HashMapFromList.java
new file mode 100644
index 00000000..3a781af9
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/HashMapFromList.java
@@ -0,0 +1,99 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+/**
+ * 
+ * @author Vladimir Turovets This class is used to create HashMap<String, T>
+ *         from the list of T objects. We suppose that
+ *         1) T object contains field 'parmName' or getter 'getParmName()'.
+ *         The value of object.parmName or object.getParmName() is used as
+ *         a key in created hashMap.
+ *         2) for all objects in the list 'parmName' or getter
+ *         'getParmName().toString' has to be unique and not null.
+ *         This class has one function only:
+ *         HashMap<String, T> hashMap(List<T> list, String name) and returns
+ *         hash map created from list.
+ *
+ * @param <T>
+ */
+public class HashMapFromList<T> {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(HashMapFromList.class);
+	
+	public HashMap<String, T> hashMap(List<T> list, String name) {
+		HashMap<String, T> result = new HashMap<String, T>();
+		if (list == null || list.size() == 0 || name == null) {
+			return result;
+		}
+		name = name.trim();
+		if (name.length() > 0) {
+			T object = list.get(0);
+			try {
+				String parmName = name;
+				Field field = object.getClass().getField(parmName);
+				for (T obj : list) {
+					try {
+						Object o = field.get(obj);
+						if (o != null)
+							result.put(o.toString(), obj);
+					} catch (Exception e1) {
+						String stackTrace = EcompPortalUtils.getStackTrace(e1);
+						logger.error(EELFLoggerDelegate.errorLogger, "Object of class " + object.getClass().getName() + ", field " + parmName + ". Details: ", stackTrace);
+						return new HashMap<String, T>();
+					}
+				}
+			} catch (Exception e) {
+				String getterName = "get" + (name.length() == 1 ? name.toUpperCase() : (name.substring(0, 1).toUpperCase() + name.substring(1)));
+				try {
+					Class<?>[] parmClasses = null;
+					Method method = object.getClass().getMethod(getterName, parmClasses);
+					Object[] parmValues = new Object[0];
+					for (T obj : list) {
+						try {
+							Object o = method.invoke(obj, parmValues);
+							if (o != null)
+								result.put(o.toString(), obj);
+						} catch (Exception e2) {
+							String stackTrace = EcompPortalUtils.getStackTrace(e2);
+							logger.error(EELFLoggerDelegate.errorLogger, "Object of class " + object.getClass().getName() + ", method " + getterName + ". Details: ", stackTrace);
+							return new HashMap<String, T>();
+						}
+					}
+				} catch (Exception e3) {
+					String stackTrace = EcompPortalUtils.getStackTrace(e3);
+					logger.error(EELFLoggerDelegate.errorLogger, "Object of class " + object.getClass().getName() + ", bad field '" + name + "' or method '" + getterName + "()'. Details: " + stackTrace);
+					return new HashMap<String, T>();
+				}
+			}
+		}
+		if (list.size() != result.size()) {
+			logger.warn(EELFLoggerDelegate.errorLogger, "Duplicated or empty keys were found!!!");
+		}
+		return result;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/ParallelExecutor.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/ParallelExecutor.java
new file mode 100644
index 00000000..1ddb550d
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/ParallelExecutor.java
@@ -0,0 +1,83 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+
+public abstract class ParallelExecutor<T> {
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ParallelExecutor.class);
+
+	protected static abstract class ThreadOperation<T> {
+		public abstract T execute(List<Object> parms);
+	}
+
+	protected abstract ThreadOperation<T> getThreadOperation();
+
+	private static class CallableOperationThread<T> implements Callable<T> {
+
+		List<Object> parms;
+
+		private ThreadOperation<T> operation;
+
+		public CallableOperationThread(ThreadOperation<T> operation, List<Object> parms) {
+			this.parms = parms;
+			this.operation = operation;
+		}
+
+		@Override
+		public T call() throws Exception {
+			return this.operation.execute(this.parms);
+		}
+
+	}
+
+	public List<T> performAllOperations(int ThreadPoolSize, List<List<Object>> listOfParms) {
+		List<T> result = new ArrayList<T>();
+		if (ThreadPoolSize > 0 && listOfParms != null) {
+			ExecutorService executor = Executors.newFixedThreadPool(ThreadPoolSize);
+			List<Future<T>> list = new ArrayList<Future<T>>();
+			for (List<Object> parms : listOfParms) {
+				CallableOperationThread<T> getter = new CallableOperationThread<T>(this.getThreadOperation(), parms);
+				Future<T> submit = executor.submit(getter);
+				list.add(submit);
+			}
+			for (Future<T> future : list) {
+				try {
+					if (future != null) {
+						result.add(future.get());
+					}
+				} catch (Exception e) {
+					logger.error(EELFLoggerDelegate.errorLogger, EcompPortalUtils.getStackTrace(e));
+				}
+			}
+			executor.shutdown();
+		}
+		return result;
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java
new file mode 100644
index 00000000..a0dc7d68
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/utils/PortalConstants.java
@@ -0,0 +1,26 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.portal.utils;
+
+public interface PortalConstants {
+	public static final Long PORTAL_APP_ID = 1L;
+	public static final Long DEFAULT_NOTIFICATION_CREATOR = 1L;
+	public static final String REST_AUX_API = "/auxapi";
+}	
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
new file mode 100644
index 00000000..3585f3a4
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/AdminAuthExtension.java
@@ -0,0 +1,36 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+
+@Service("adminAuthExtension")
+@Transactional
+public class AdminAuthExtension {
+	
+	public void saveUserExtension(EPUser user){
+		//app's developer implement their own logic here, like updating app's related tables
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/EPProfileService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/EPProfileService.java
new file mode 100644
index 00000000..0adde120
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/EPProfileService.java
@@ -0,0 +1,36 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service;
+
+import java.util.List;
+
+import org.openecomp.portalsdk.core.domain.Profile;
+import org.openecomp.portalapp.portal.domain.EPUser;
+
+
+public interface EPProfileService {
+	List<Profile> findAll();
+	
+	Profile getProfile(int id);
+	
+	EPUser getUser(String id);
+	
+	void saveUser(EPUser user);
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/EPProfileServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/EPProfileServiceImpl.java
new file mode 100644
index 00000000..27975971
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/EPProfileServiceImpl.java
@@ -0,0 +1,77 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import org.openecomp.portalsdk.core.dao.ProfileDao;
+import org.openecomp.portalsdk.core.domain.Profile;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+
+@Service("epProfileService")
+@Transactional
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class EPProfileServiceImpl implements EPProfileService {
+
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPProfileServiceImpl.class);
+	
+	@Autowired
+	private ProfileDao profileDao;
+
+	@Autowired
+	private DataAccessService dataAccessService;
+
+	@SuppressWarnings("unchecked")
+	public List<Profile> findAll() {
+		// List msgDB = getDataAccessService().getList(Profile.class, null);
+		return getDataAccessService().getList(Profile.class, null);
+	}
+
+	public EPUser getUser(String userId) {
+		return (EPUser) getDataAccessService().getDomainObject(EPUser.class, Long.parseLong(userId), null);
+	}
+
+	public void saveUser(EPUser user) {
+
+		getDataAccessService().saveDomainObject(user, null);
+	}
+
+	public Profile getProfile(int id) {
+		return profileDao.getProfile(id);
+	}
+
+	public DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		this.dataAccessService = dataAccessService;
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/RemoteWebServiceCallService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/RemoteWebServiceCallService.java
new file mode 100644
index 00000000..71d9dd12
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/RemoteWebServiceCallService.java
@@ -0,0 +1,48 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service;
+
+public interface RemoteWebServiceCallService {
+
+	/**
+	 * Answers whether the specified credentials match application information
+	 * in the database.
+	 * 
+	 * @param secretKey
+	 *            Key used to decrypt passwords; ignored if null.
+	 * @param requestUebKey
+	 *            UEB key that identifies the application
+	 * @param requesUserName
+	 *            User name for the application
+	 * @param requestPassword
+	 *            Password for the application
+	 * @return True if the UEB key and the credentials match the database
+	 *         entries; else false.
+	 * @throws Exception
+	 *             If decryption fails.
+	 */
+	public boolean verifyRESTCredential(String secretKey, String requestUebKey, String requestUserName,
+			String requestPassword) throws Exception;
+	
+	
+	
+	public boolean verifyAppKeyCredential(String requestUebKey) throws Exception;
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/CoreTimeoutHandler.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/CoreTimeoutHandler.java
new file mode 100644
index 00000000..897d9cd9
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/CoreTimeoutHandler.java
@@ -0,0 +1,166 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service.sessionmgt;
+
+import java.util.Calendar;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalsdk.core.domain.sessionmgt.TimeoutVO;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+@Service
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class CoreTimeoutHandler{
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CoreTimeoutHandler.class);
+	
+	public static final Map<String, HttpSession> sessionMap = new Hashtable<String,HttpSession>(); 
+	public static final Integer repeatInterval = 15 * 60; // 15 minutes
+	ObjectMapper mapper = new ObjectMapper(); 
+	
+	
+	public static void sessionCreated(String portalJSessionId, String jSessionId, HttpSession session) {
+		
+		storeMaxInactiveTime(session);
+		
+		// this key is a combination of portal jsession id and app session id
+		session.setAttribute(PortalApiConstants.PORTAL_JSESSION_ID,jSessionKey(jSessionId, portalJSessionId));
+		sessionMap.put((String)session.getAttribute(PortalApiConstants.PORTAL_JSESSION_ID), session);
+		
+	}
+	
+	protected static void storeMaxInactiveTime(HttpSession session) {
+		
+		if(session.getAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME) == null)
+			session.setAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME,session.getMaxInactiveInterval());
+	}
+	
+	public static void sessionDestroyed(HttpSession session) {
+		
+		try{
+		sessionMap.remove((String)session.getAttribute(PortalApiConstants.PORTAL_JSESSION_ID));
+		}catch(Exception e){
+			logger.error(EELFLoggerDelegate.errorLogger, "************************ Session Management: Error while destroying session for " + session.getId() + " Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		
+	}
+	
+	public String gatherSessionExtenstions() {
+		
+		Map<String,TimeoutVO> sessionTimeoutMap = new Hashtable<String,TimeoutVO>();
+		String jsonMap = "";
+		
+		
+		for(String jSessionKey: sessionMap.keySet()) {
+			
+			try{
+				// get the expirytime in seconds
+				HttpSession session = sessionMap.get(jSessionKey);
+				
+				Long lastAccessedTimeMilliSec = session.getLastAccessedTime();
+				Long maxIntervalMilliSec = session.getMaxInactiveInterval() * 1000L;
+				//Long currentTimeMilliSec = Calendar.getInstance().getTimeInMillis() ;
+				//(maxIntervalMilliSec - (currentTimeMilliSec - lastAccessedTimeMilliSec) + ;
+				Calendar instance = Calendar.getInstance();
+				instance.setTimeInMillis(session.getLastAccessedTime());
+				logger.info(EELFLoggerDelegate.errorLogger, "************************ Session Management: Last Accessed time for "+ jSessionKey + ": " + instance.getTime());
+				
+				Long sessionTimOutMilliSec = maxIntervalMilliSec + lastAccessedTimeMilliSec;
+				
+				sessionTimeoutMap.put( portalJSessionId(jSessionKey), new TimeoutVO(jSessionId(jSessionKey),sessionTimOutMilliSec));
+				
+				
+				jsonMap = mapper.writeValueAsString(sessionTimeoutMap);
+			} catch(Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "************************ Session Management: Error during JsonSessionTimout conversion. Details: " + EcompPortalUtils.getStackTrace(e));
+			}
+		}
+		
+		return jsonMap;
+		
+	}
+	
+	
+	public void updateSessionExtensions(String sessionTimeoutMapStr) throws Exception {
+		
+		//Map<String,Object> sessionTimeoutMap = mapper.readValue(sessionTimeoutMapStr, Map.class);
+		Map<String,TimeoutVO> sessionTimeoutMap;
+		try{
+			TypeReference<Hashtable<String,TimeoutVO>> typeRef
+			 = new TypeReference<Hashtable<String,TimeoutVO>>() {};
+	
+			 sessionTimeoutMap  = mapper.readValue(sessionTimeoutMapStr, typeRef);
+		}catch(Exception e){
+			logger.error(EELFLoggerDelegate.errorLogger, "************************ Session Management: Error while to parse update session extension in portal", e);
+			return;
+		}
+		for(String jPortalSessionId: sessionTimeoutMap.keySet()) {
+			try {
+				
+				TimeoutVO extendedTimeoutVO = mapper.readValue(mapper.writeValueAsString(sessionTimeoutMap.get(jPortalSessionId)),TimeoutVO.class);
+				HttpSession session = sessionMap.get(jSessionKey(extendedTimeoutVO.getjSessionId(), jPortalSessionId));
+				
+				if(session == null) {
+					continue;
+				}
+				
+				Long lastAccessedTimeMilliSec = session.getLastAccessedTime();
+				Long maxIntervalMilliSec = session.getMaxInactiveInterval() * 1000L;
+				Long sessionTimOutMilliSec = maxIntervalMilliSec + lastAccessedTimeMilliSec;
+				
+				Long maxTimeoutTimeMilliSec = extendedTimeoutVO.getSessionTimOutMilliSec();
+				if(maxTimeoutTimeMilliSec>sessionTimOutMilliSec) {
+					logger.debug(EELFLoggerDelegate.debugLogger, "************************ Session Management: " + " updated session max idle time");
+					session.setMaxInactiveInterval((int)(maxTimeoutTimeMilliSec-lastAccessedTimeMilliSec)/1000);
+				}
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "************************ Session Management: " + EcompPortalUtils.getStackTrace(e));
+			}
+			
+		}
+			
+	}
+
+	protected  static String jSessionKey(String jSessionId, String portalJSessionId) {
+		return portalJSessionId + "-" + jSessionId;
+	}
+	
+	protected  String portalJSessionId(String jSessionKey) {
+		return jSessionKey.split("-")[0];
+	}
+	
+	protected  String jSessionId(String jSessionKey) {
+		return jSessionKey.split("-")[1];
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/ManageService.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/ManageService.java
new file mode 100644
index 00000000..52cc0825
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/ManageService.java
@@ -0,0 +1,101 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service.sessionmgt;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.service.EPAppService;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.quartz.CronExpression;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+@Service("manageService")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class ManageService implements PortalTimeoutHandler.SessionCommInf {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ManageService.class);
+	
+	@Autowired
+	EPAppService appService;
+	
+	@Autowired
+	SessionCommunication sessionCommunication;
+
+	public Integer fetchSessionSlotCheckInterval(String... params) throws Exception {
+
+		String defaultCronExpressionStr = "0 0/5 * * * ? *";
+		String cronExpressionStr = SystemProperties.getProperty(SystemProperties.SESSIONTIMEOUT_FEED_CRON);
+
+		if (cronExpressionStr == null) {
+			cronExpressionStr = defaultCronExpressionStr;
+		}
+
+		CronExpression cal = new CronExpression(cronExpressionStr);
+		final Date nowTime = Calendar.getInstance().getTime();
+		Date nextTime = cal.getNextValidTimeAfter(nowTime);
+		Date nextNextTime = cal.getNextValidTimeAfter(nextTime);
+
+		final int timeDiff = (int)(nextNextTime.getTime()-nextTime.getTime());
+		logger.debug(EELFLoggerDelegate.debugLogger, "Time interval between subsequent session checks " + timeDiff);
+
+		return timeDiff;
+	}
+
+	public void extendSessionTimeOuts(String... params) throws Exception {
+		try {
+			String sessionMap = params[3];
+	
+			logger.debug(EELFLoggerDelegate.debugLogger, "Extending the App sessions for last minute request: " + sessionMap);
+			
+			if (StringUtils.isEmpty(sessionMap)) {
+				logger.error(EELFLoggerDelegate.errorLogger, "extendSessionTimeOuts: Skipping session updates since the portal session value is empty.");
+			} else {
+				List<OnboardingApp> appList = appService.getEnabledNonOpenOnboardingApps();
+				for (OnboardingApp onApp : appList) {
+					sessionCommunication.pingSession(onApp, sessionMap);
+				}
+				updateSessionExtensions(sessionMap);
+				sessionCommunication.clear(false);
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred in extendSessionTimeOuts(). Details: " + EcompPortalUtils.getStackTrace(e)); 
+		}
+	}
+
+	public String gatherSessionExtenstions() {
+		return PortalTimeoutHandler.gatherSessionExtensions();
+	}
+
+	public void updateSessionExtensions(String sessionTimeoutMapStr) throws Exception {
+		PortalTimeoutHandler.updateSessionExtensions(sessionTimeoutMapStr);
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/SessionCommunication.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/SessionCommunication.java
new file mode 100644
index 00000000..11c0890e
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/SessionCommunication.java
@@ -0,0 +1,271 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service.sessionmgt;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.UUID;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.MDC;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import com.att.eelf.configuration.Configuration;
+import org.openecomp.portalsdk.core.exception.UrlAccessRestrictedException;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+
+@Service("sessionCommunication")
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+public class SessionCommunication {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SessionCommunication.class);
+	
+	@EPAuditLog
+	public String sendGet(OnboardingApp app) throws Exception {
+		String appResponse = "";
+		String appName = "Unknwon";
+		int responseCode = 0;
+		
+		try {
+			if (app != null && app.name != null && app.name != "") {
+				appName = app.name;
+			}
+			String url = app.restUrl + "/sessionTimeOuts";
+			String encriptedPwdDB = app.appPassword;
+			String appUserName = app.username;
+
+			setLocalMDCContext(app, "/sessionTimeOuts", url);
+
+			URL obj = new URL(url);
+
+			HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
+			// optional default is GET
+			con.setRequestMethod("GET");
+			con.setConnectTimeout(3000);
+			con.setReadTimeout(8000);
+			// add request header
+			con.setRequestProperty("username", appUserName);
+			con.setRequestProperty("password", encriptedPwdDB);
+
+			// con.set
+			responseCode = con.getResponseCode();
+			logger.debug(EELFLoggerDelegate.debugLogger, "Response Code : " + responseCode);
+						
+			BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+			String inputLine;
+			StringBuffer response = new StringBuffer();
+
+			while ((inputLine = in.readLine()) != null) {
+				response.append(inputLine);
+			}
+
+			in.close();
+			appResponse = response.toString();
+		} catch (UrlAccessRestrictedException e) {
+			responseCode = HttpServletResponse.SC_UNAUTHORIZED;
+			logger.error(EELFLoggerDelegate.errorLogger, String.format("SessionCommunication.sendGet received an un-authorized exception. AppName: %s", appName));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiAuthenticationError, e);
+		} catch (Exception e) {
+			responseCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+			String message = String.format(
+					"SessionCommunication.sendGet encountered an Exception. AppName: %s, Details: %s", appName,
+					EcompPortalUtils.getStackTrace(e));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHttpConnectionError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, message);
+		} finally {
+			EcompPortalUtils.setExternalAppResponseCode(responseCode);
+		}
+		return appResponse;
+	}
+
+	@EPAuditLog
+	public Boolean pingSession(OnboardingApp app, String sessionTimeoutMap) throws Exception {
+		String appName = "Unknwon";
+		int responseCode = 0;
+		try {
+			if (app != null && app.name != null && app.name != "") {
+				appName = app.name;
+			}
+			
+			String url = app.restUrl + "/updateSessionTimeOuts";
+			String encriptedPwdDB = app.appPassword;
+			String appUserName = app.username;
+			// String decreptedPwd = CipherUtil.decrypt(encriptedPwdDB,
+			// SystemProperties.getProperty(SystemProperties.Decryption_Key));
+
+			setLocalMDCContext(app, "/updateSessionTimeOuts", url);
+
+			URL obj = new URL(url);
+
+			HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
+			// optional default is GET
+			con.setRequestMethod("POST");
+			con.setConnectTimeout(3000);
+			con.setReadTimeout(15000);
+
+			// add request header
+			con.setRequestProperty("username", appUserName);
+			con.setRequestProperty("password", encriptedPwdDB);
+
+			con.setRequestProperty("sessionMap", sessionTimeoutMap);
+			con.setDoInput(true);
+			con.setDoOutput(true);
+			con.getOutputStream().write(sessionTimeoutMap.getBytes());
+			con.getOutputStream().flush();
+			con.getOutputStream().close();
+
+			responseCode = con.getResponseCode();
+			logger.debug(EELFLoggerDelegate.debugLogger, "Response Code : " + responseCode);
+		} catch (UrlAccessRestrictedException e) {
+			responseCode = HttpServletResponse.SC_UNAUTHORIZED;
+			String message = String.format(
+					"SessionCommunication.pingSession received an un-authorized exception. AppName: %s", appName);
+			logger.error(EELFLoggerDelegate.errorLogger, message);
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiAuthenticationError, e);
+		} catch (Exception e) {
+			responseCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+			String message = String.format(
+					"SessionCommunication.pingSession encountered an Exception. AppName: %s, Details: %s", appName,
+					EcompPortalUtils.getStackTrace(e));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHttpConnectionError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, message);
+		} finally {
+			EcompPortalUtils.setExternalAppResponseCode(responseCode);
+		}
+		
+		return true;
+	}
+
+	@EPAuditLog
+	public Boolean timeoutSession(OnboardingApp app, String portalJSessionId) throws Exception {
+		String appName = "Unknwon";
+		int responseCode = 0;
+		try {
+			if (app != null && app.name != null && app.name != "") {
+				appName = app.name;
+			}
+			
+			String url = app.restUrl + "/timeoutSession" + "?portalJSessionId=" + portalJSessionId;
+
+			String encriptedPwdDB = app.appPassword;
+			String appUserName = app.username;
+			// String decreptedPwd = CipherUtil.decrypt(encriptedPwdDB,
+			// SystemProperties.getProperty(SystemProperties.Decryption_Key));
+
+			setLocalMDCContext(app, "/timeoutSession", url);
+
+			URL obj = new URL(url);
+			HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+
+			// optional default is GET
+			con.setRequestMethod("POST");
+			con.setConnectTimeout(3000);
+			con.setReadTimeout(15000);
+
+			// add request header
+			con.setRequestProperty("username", appUserName);
+			con.setRequestProperty("password", encriptedPwdDB);
+
+			// con.setRequestProperty("portalJSessionId", portalJSessionId);
+			con.setDoInput(true);
+			con.setDoOutput(true);
+			con.getOutputStream().flush();
+			con.getOutputStream().close();
+
+			responseCode = con.getResponseCode();
+			logger.debug(EELFLoggerDelegate.debugLogger, "Response Code : " + responseCode);
+		} catch (UrlAccessRestrictedException e) {
+			responseCode = HttpServletResponse.SC_UNAUTHORIZED;
+			String message = String.format(
+					"SessionCommunication.timeoutSession received an un-authorized exception. AppName: %s", appName);
+			logger.error(EELFLoggerDelegate.errorLogger, message);
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeRestApiAuthenticationError, e);
+		} catch (Exception e) {
+			responseCode = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+			String message = String.format(
+					"SessionCommunication.timeoutSession encountered an Exception. AppName: %s, Details: %s", appName,
+					EcompPortalUtils.getStackTrace(e));
+			EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeHttpConnectionError, e);
+			logger.error(EELFLoggerDelegate.errorLogger, message);
+		} finally {
+			EcompPortalUtils.setExternalAppResponseCode(responseCode);
+		}
+		return true;
+	}
+
+	@EPMetricsLog
+	private void setLocalMDCContext(OnboardingApp app, String restPath, String url) {
+		setRequestId();
+		MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTP);
+		if (url!=null && url.contains("https")) {
+			MDC.put(EPCommonSystemProperties.PROTOCOL, EPCommonSystemProperties.HTTPS);
+		}
+		MDC.put(EPCommonSystemProperties.FULL_URL, url);
+		MDC.put(EPCommonSystemProperties.TARGET_ENTITY, app.myLoginsAppName);
+		MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, restPath);
+	}
+	
+	/**
+	 * Generates request id, service name fields and loads them
+	 * into MDC, as these values could be empty as these
+	 * session timeout requests are generated at 
+	 * scheduled intervals using quartz scheduler.
+	 */
+	@EPMetricsLog
+	public void setRequestId() {
+		String requestId = MDC.get(Configuration.MDC_KEY_REQUEST_ID);
+		if (StringUtils.isEmpty(requestId)) {
+			MDC.put(Configuration.MDC_KEY_REQUEST_ID, UUID.randomUUID().toString());
+		}
+		
+		MDC.put(Configuration.MDC_SERVICE_NAME, "/quartz/keepSessionAlive");
+		MDC.put(EPCommonSystemProperties.PARTNER_NAME, EPCommonSystemProperties.ECOMP_PORTAL_BE);
+	}
+	
+	/**
+	 * Remove the values from MDC as these requests are 
+	 * executed at regular intervals based on quartz rather
+	 * incoming REST API requests.
+	 * @param bAll
+	 */
+	@EPMetricsLog
+	public void clear(Boolean bAll) {
+		MDC.remove(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE);
+		if (bAll) {
+			MDC.remove(Configuration.MDC_KEY_REQUEST_ID);
+			MDC.remove(Configuration.MDC_SERVICE_NAME);
+			MDC.remove(EPCommonSystemProperties.PARTNER_NAME);
+		}
+	}
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java
new file mode 100644
index 00000000..53258c06
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java
@@ -0,0 +1,252 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.service.sessionmgt;
+
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.PersistJobDataAfterExecution;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+
+import org.openecomp.portalsdk.core.domain.sessionmgt.TimeoutVO;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
+import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
+import org.openecomp.portalapp.portal.service.EPAppService;
+import org.openecomp.portalapp.portal.transport.OnboardingApp;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Executed periodically by Quartz to discover remote application sessions and
+ * update timeouts suitably.
+ */
+@PersistJobDataAfterExecution
+@DisallowConcurrentExecution
+@org.springframework.context.annotation.Configuration
+@EnableAspectJAutoProxy
+@EPMetricsLog
+public class TimeoutHandler extends QuartzJobBean {
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(TimeoutHandler.class);
+	
+	ObjectMapper mapper = new ObjectMapper();
+
+	/**
+	 * Supports static call {@link #timeoutSessions(HttpSession)}
+	 */
+	private static List<OnboardingApp> onboardedAppList = null;
+	
+	@Autowired
+	SessionCommunication sessionCommunication;
+	
+	@Override
+	protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
+		try {
+			//Create a request id if there is none available,
+			//and which will internally be used when making
+			//session extended timeout calls to the partner applications.
+			if (getSessionCommunication()!=null) {
+				getSessionCommunication().setRequestId();
+			}
+			logger.info(EELFLoggerDelegate.debugLogger, "Quartz Cronjob for Session Management begins");
+			
+			ManageService manageService = (ManageService) applicationContext.getBean("manageService");
+			EPAppService appService = (EPAppService) applicationContext.getBean("epAppService");
+
+			List<OnboardingApp> appList = appService.getEnabledNonOpenOnboardingApps();
+			onboardedAppList = appList;
+			TypeReference<Hashtable<String, TimeoutVO>> typeRef = new TypeReference<Hashtable<String, TimeoutVO>>() {
+			};
+			String portalJsonSessionStr;
+			Map<String, TimeoutVO> portalSessionTimeoutMap = null;
+
+			portalJsonSessionStr = manageService.gatherSessionExtenstions();
+			if (portalJsonSessionStr == null || portalJsonSessionStr == "") {
+				logger.error(EELFLoggerDelegate.errorLogger, "Session Management: Portal session information is empty.");
+				return;
+			}
+			
+			try {
+				portalSessionTimeoutMap = mapper.readValue(portalJsonSessionStr, typeRef);
+			} catch (JsonMappingException | JsonParseException je) {
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, je);
+				logger.error(EELFLoggerDelegate.errorLogger, "Session Management: JSON Mapping Exception occurred while gathering the Session", je);
+				return;
+			} catch (Exception e) {
+				logger.error(EELFLoggerDelegate.errorLogger, "Session Management: Error while gather Session from portal", e);
+				return;
+			}
+			
+			Map<Long, Map<String, TimeoutVO>> appSessionTimeOutMap = new Hashtable<Long, Map<String, TimeoutVO>>();
+			// determine the Max TimeOut Time for each of the managed sessions
+			for (OnboardingApp app : appList) {
+				if (app.restUrl == null) {
+					logger.info(EELFLoggerDelegate.debugLogger, "Session Management: null restUrl, not fetching from app " + app.name);
+					continue;
+				}
+				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: Calling App " + app.name + " at URL " + app.restUrl);
+				String jsonSessionStr = fetchAppSessions(app);
+				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: App " + app.name + " returned  " + jsonSessionStr);
+				if (jsonSessionStr == null || jsonSessionStr.isEmpty())
+					continue;
+
+				try {
+					Map<String, TimeoutVO> sessionTimeoutMap = mapper.readValue(jsonSessionStr, typeRef);
+					appSessionTimeOutMap.put(app.id, sessionTimeoutMap);
+					for (String portalJSessionId : sessionTimeoutMap.keySet()) {
+						final TimeoutVO maxTimeoutVO = portalSessionTimeoutMap.get(portalJSessionId);
+						final TimeoutVO compareTimeoutVO = sessionTimeoutMap.get(portalJSessionId);
+						if (maxTimeoutVO != null && compareTimeoutVO != null) {
+							if (maxTimeoutVO.compareTo(compareTimeoutVO) < 0)
+								portalSessionTimeoutMap.get(portalJSessionId)
+										.setSessionTimOutMilliSec(compareTimeoutVO.getSessionTimOutMilliSec());
+						}
+					}
+				} catch (JsonParseException | JsonMappingException e) {
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
+					logger.error(EELFLoggerDelegate.errorLogger, 
+							"JSON Mapping/Processing Exception occurred while mapping/parsing the jsonSessionStr", e);
+					continue;
+				} catch (Exception e) {
+					logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while mapping/parsing the jsonSessionStr", e);
+					continue;
+				}
+
+			}
+
+			// post the updated session timeouts back to the Apps
+			for (OnboardingApp app : appList) {
+				if (app.restUrl == null) {
+					logger.warn(EELFLoggerDelegate.errorLogger, "Session Management: null restUrl, not posting back to app " + app.name);
+					continue;
+				}
+
+				Map<String, TimeoutVO> sessionTimeoutMap = appSessionTimeOutMap.get(app.id);
+				if (sessionTimeoutMap == null || sessionTimeoutMap.isEmpty())
+					continue;
+
+				for (String portalJSessionId : sessionTimeoutMap.keySet()) {
+					try {
+						final TimeoutVO maxTimeoutVO = portalSessionTimeoutMap.get(portalJSessionId);
+						final TimeoutVO setTimeoutVO = sessionTimeoutMap.get(portalJSessionId);
+						if (maxTimeoutVO == null || setTimeoutVO == null) {
+							String message = String.format(
+									"Session Management: Failed to update the session timeouts for the app: %s and the sessionId: %s.",
+									app.name, portalJSessionId);
+							logger.warn(EELFLoggerDelegate.errorLogger, message);
+							continue;
+						}
+						setTimeoutVO.setSessionTimOutMilliSec(maxTimeoutVO.getSessionTimOutMilliSec());
+					} catch (Exception e) {
+						logger.error(EELFLoggerDelegate.errorLogger, "Session Management:  error while updating the session timeout map", e);
+						continue;
+					}
+				}
+				logger.info(EELFLoggerDelegate.debugLogger, "Session Management: Updating App " + app.restUrl);
+				String sessionTimeoutMapStr = "";
+				try {
+					sessionTimeoutMapStr = mapper.writeValueAsString(sessionTimeoutMap);
+				} catch (JsonProcessingException je) {
+					logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while processing sessionTimeOutMap object to a String. Details: "
+									+ EcompPortalUtils.getStackTrace(je));
+					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, je);
+				}
+				pingAppSessions(app, sessionTimeoutMapStr);
+			}
+			String portalSessionTimeoutMapStr = "";
+			try {
+				portalSessionTimeoutMapStr = mapper.writeValueAsString(portalSessionTimeoutMap);
+			} catch (JsonProcessingException je) {
+				logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while processing portalSessionTimeOutMap object to a String", je);
+				EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, je);
+			}
+			manageService.updateSessionExtensions(portalSessionTimeoutMapStr);
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "************************ Session Management:  error in managing session timeouts", e);
+		} finally {
+			getSessionCommunication().clear(true);
+		}
+	}
+
+	private String fetchAppSessions(OnboardingApp app) throws Exception {
+		String jsonSessionValue = getSessionCommunication().sendGet(app);
+		getSessionCommunication().clear(false);
+		return jsonSessionValue;
+	}
+
+	private void pingAppSessions(OnboardingApp app, String sessionTimeoutMapStr) throws Exception {
+		getSessionCommunication().pingSession(app, sessionTimeoutMapStr);
+		getSessionCommunication().clear(false);
+	}
+
+	public void timeoutSessions(HttpSession session) throws Exception {
+		String portalJSessionId = portalJSessionId(session);
+		if (onboardedAppList == null)
+			return;
+
+		for (OnboardingApp app : onboardedAppList) {
+			getSessionCommunication().timeoutSession(app, portalJSessionId);
+			getSessionCommunication().clear(false);
+		}
+	}
+
+	protected static String portalJSessionId(HttpSession session) {
+		final Object attribute = session.getAttribute(PortalApiConstants.PORTAL_JSESSION_ID);
+		if (attribute == null)
+			return "";
+		String jSessionKey = (String) attribute;
+		return jSessionKey.split("-")[0];
+	}
+
+	private static ApplicationContext applicationContext;
+
+	public static void setApplicationContext(ApplicationContext _applicationContext) {
+		applicationContext = _applicationContext;
+	}
+
+	public SessionCommunication getSessionCommunication() {
+		if(sessionCommunication == null){
+			if (applicationContext != null)				
+				sessionCommunication = (SessionCommunication)applicationContext.getBean("sessionCommunication");
+		}
+		
+		return sessionCommunication;
+	}
+
+	public void setSessionCommunication(SessionCommunication sessionCommunication) {
+		this.sessionCommunication = sessionCommunication;
+	}
+
+}
+\ No newline at end of file
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java
new file mode 100644
index 00000000..a14bbe81
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/EPUserUtils.java
@@ -0,0 +1,407 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.util;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.openecomp.portalapp.portal.domain.EPRole;
+import org.openecomp.portalapp.portal.domain.EPUser;
+import org.openecomp.portalapp.portal.domain.EPUserApp;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalsdk.core.domain.RoleFunction;
+import org.openecomp.portalsdk.core.exception.SessionExpiredException;
+import org.openecomp.portalsdk.core.lm.FusionLicenseManager;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.menu.MenuBuilder;
+import org.openecomp.portalsdk.core.service.DataAccessService;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.web.support.AppUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class EPUserUtils {
+
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(EPUserUtils.class);
+
+	private final static Long ACCOUNT_ADMIN_ROLE_ID = 999L;
+
+	public static final String ALL_ROLE_FUNCTIONS = "allRoleFunctions";
+
+	private static DataAccessService dataAccessService;
+
+	/**
+	 * Gets the EPUser object from the session.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return EPUser object that was created upon login
+	 * @throws SessionExpiredException
+	 *             if no session exists.
+	 */
+	public static EPUser getUserSession(HttpServletRequest request) {
+		HttpSession session = AppUtils.getSession(request);
+		if (session == null)
+			throw new SessionExpiredException();
+		return (EPUser) session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
+	}
+
+	/**
+	 * Establishes the user's portal session
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @param user
+	 *            EPUser
+	 * @param applicationMenuData
+	 *            Menu data
+	 * @param businessDirectMenuData
+	 *            Menu data
+	 * @param loginMethod_ignored
+	 *            How the user authenticated; ignored
+	 * @param allRoleFunctions
+	 *            Set of user's roles
+	 */
+	@SuppressWarnings("rawtypes")
+	public static void setUserSession(HttpServletRequest request, EPUser user, Set applicationMenuData,
+			Set businessDirectMenuData, String loginMethod_ignored, List<RoleFunction> allRoleFunctions) {
+		HttpSession session = request.getSession(true);
+
+		// clear the current user session to avoid any conflicts
+		EPUserUtils.clearUserSession(request);
+		session.setAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME), user);
+
+		getAllRoleFunctions(allRoleFunctions, session);
+
+		getRoleFunctions(request);
+
+		// truncate the role (and therefore the role function) data to save
+		// memory in the session
+		user.setEPRoles(null);
+		session.setAttribute(SystemProperties.getProperty(SystemProperties.USER_NAME), user.getFullName());
+
+		ServletContext context = session.getServletContext();
+		int licenseVerificationFlag = 3;
+		try {
+			licenseVerificationFlag = (Integer) context.getAttribute("licenseVerification");
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "setUserSession failed to get licenseVerification attribute",
+					e);
+		}
+		switch (licenseVerificationFlag) {
+		case FusionLicenseManager.DEVELOPER_LICENSE:
+			session.setAttribute(SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME),
+					"My Portal [Development Version]");
+			break;
+		case FusionLicenseManager.EXPIRED_LICENSE:
+			session.setAttribute(SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME),
+					"My Portal [LICENSE EXPIRED]");
+			break;
+		case FusionLicenseManager.VALID_LICENSE:
+			session.setAttribute(SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME), "My Portal");
+			break;
+		default:
+			session.setAttribute(SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME),
+					"My Portal [INVALID LICENSE]");
+			break;
+		}
+
+		session.setAttribute(SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_ATTRIBUTE_NAME),
+				MenuBuilder.filterMenu(applicationMenuData, request));
+		session.setAttribute(SystemProperties.getProperty(SystemProperties.BUSINESS_DIRECT_MENU_ATTRIBUTE_NAME),
+				MenuBuilder.filterMenu(businessDirectMenuData, request));
+	}
+
+	/**
+	 * Creates a set of role function names and stores the set as a session
+	 * attribute.
+	 * 
+	 * @param allRoleFunctions
+	 *            List of role functions.
+	 * @param session
+	 *            HttpSession
+	 */
+	private static void getAllRoleFunctions(List<RoleFunction> allRoleFunctions, HttpSession session) {
+		if (allRoleFunctions == null)
+			return;
+		Set<String> roleFnSet = new HashSet<String>();
+		for (RoleFunction roleFn : allRoleFunctions)
+			roleFnSet.add(roleFn.getCode());
+		session.setAttribute(ALL_ROLE_FUNCTIONS, roleFnSet);
+	}
+
+	/**
+	 * Removes all stored attributes from the user's session
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @throws SessionExpiredException
+	 *             if no session exists
+	 */
+	private static void clearUserSession(HttpServletRequest request) {
+		HttpSession session = AppUtils.getSession(request);
+		if (session == null)
+			throw new SessionExpiredException();
+
+		// removes all stored attributes from the current user's session
+		session.removeAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
+		session.removeAttribute(SystemProperties.getProperty(SystemProperties.APPLICATION_MENU_ATTRIBUTE_NAME));
+		session.removeAttribute(SystemProperties.getProperty(SystemProperties.BUSINESS_DIRECT_MENU_ATTRIBUTE_NAME));
+		session.removeAttribute(SystemProperties.getProperty(SystemProperties.ROLES_ATTRIBUTE_NAME));
+		session.removeAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME));
+	}
+
+	/**
+	 * Builds a set of role functions and sets a session attribute with it.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return Set of role functions that was built.
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static Set getRoleFunctions(HttpServletRequest request) {
+		HashSet roleFunctions = null;
+
+		HttpSession session = request.getSession();
+		roleFunctions = (HashSet) session
+				.getAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME));
+
+		if (roleFunctions == null) {
+			HashMap roles = getRoles(request);
+			roleFunctions = new HashSet();
+
+			Iterator i = roles.keySet().iterator();
+
+			while (i.hasNext()) {
+				Long roleKey = (Long) i.next();
+				EPRole role = (EPRole) roles.get(roleKey);
+
+				Iterator j = role.getRoleFunctions().iterator();
+
+				while (j.hasNext()) {
+					RoleFunction function = (RoleFunction) j.next();
+					roleFunctions.add(function.getCode());
+				}
+			}
+
+			session.setAttribute(SystemProperties.getProperty(SystemProperties.ROLE_FUNCTIONS_ATTRIBUTE_NAME),
+					roleFunctions);
+		}
+
+		return roleFunctions;
+	}
+
+	/**
+	 * Gets role information from the user session, in the cached user object.
+	 * As a side effect sets a session variable with the roles.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return Map of role ID to role object
+	 */
+	@SuppressWarnings("rawtypes")
+	private static HashMap getRoles(HttpServletRequest request) {
+		HashMap roles = null;
+
+		HttpSession session = AppUtils.getSession(request);
+		roles = (HashMap) session.getAttribute(SystemProperties.getProperty(SystemProperties.ROLES_ATTRIBUTE_NAME));
+
+		// if roles are not already cached, let's grab them from the user
+		// session
+		if (roles == null) {
+			EPUser user = getUserSession(request);
+
+			// get all user roles (including the tree of child roles)
+			roles = getAllUserRoles(user);
+
+			session.setAttribute(SystemProperties.getProperty(SystemProperties.ROLES_ATTRIBUTE_NAME), roles);
+		}
+
+		return roles;
+	}
+
+	/**
+	 * Builds a map of role ID to role object.
+	 * 
+	 * @param user
+	 *            EPUser
+	 * @return Map of role ID to role object
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static HashMap getAllUserRoles(EPUser user) {
+		HashMap roles = new HashMap();
+		Iterator i = user.getEPRoles().iterator();
+
+		while (i.hasNext()) {
+			EPRole role = (EPRole) i.next();
+
+			if (role.getActive()) {
+				roles.put(role.getId(), role);
+
+				// let's take a recursive trip down the tree to add all child
+				// roles
+				addChildRoles(role, roles);
+			}
+		}
+
+		// Additionally; the account admin role is overloaded between ecomp
+		// portal and partners; lets also include that
+		Iterator<EPUserApp> appRolesIterator = user.getEPUserApps().iterator();
+		while (appRolesIterator.hasNext()) {
+			EPRole role = (EPRole) appRolesIterator.next().getRole();
+
+			if (role.getActive() && role.getId().equals(ACCOUNT_ADMIN_ROLE_ID)) {
+				roles.put(role.getId(), role);
+
+				// let's take a recursive trip down the tree to add all child
+				// roles
+				addChildRoles(role, roles);
+			}
+		}
+
+		return roles;
+	}
+
+	/**
+	 * Adds all child roles of the specified role to the map of roles.
+	 * 
+	 * @param role
+	 *            EPRole
+	 * @param roles
+	 *            Maps role id to role object
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static void addChildRoles(EPRole role, HashMap roles) {
+		Set childRoles = role.getChildRoles();
+
+		if (childRoles != null && childRoles.size() > 0) {
+			Iterator j = childRoles.iterator();
+			while (j.hasNext()) {
+				EPRole childRole = (EPRole) j.next();
+
+				if (childRole.getActive()) {
+					roles.put(childRole.getId(), childRole);
+
+					addChildRoles(childRole, roles);
+				}
+			}
+		}
+
+	}
+
+	public static boolean hasRole(EPUser user, String roleKey) {
+		return getAllUserRoles(user).keySet().contains(new Long(roleKey));
+	}
+
+	public static DataAccessService getDataAccessService() {
+		return dataAccessService;
+	}
+
+	@Autowired
+	public void setDataAccessService(DataAccessService dataAccessService) {
+		EPUserUtils.dataAccessService = dataAccessService;
+	}
+
+	/**
+	 * Gets the user's ID from the user object in the session
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return Integer ID of current user
+	 */
+	public static int getUserId(HttpServletRequest request) {
+		return getUserIdAsLong(request).intValue();
+	}
+
+	/**
+	 * Gets the user's ID from the user object in the session
+	 * 
+	 * @param request
+	 *            HttpServletREquest
+	 * @return Long ID of current user
+	 */
+	public static Long getUserIdAsLong(HttpServletRequest request) {
+		Long userId = new Long(SystemProperties.getProperty(SystemProperties.APPLICATION_USER_ID));
+		if (request != null) {
+			if (getUserSession(request) != null) {
+				userId = getUserSession(request).getId();
+			}
+		}
+		return userId;
+	}
+
+	/**
+	 * Gets the request ID from the request.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return Request ID
+	 */
+	public static String getRequestId(HttpServletRequest request) {
+		Enumeration<String> headerNames = request.getHeaderNames();
+
+		String requestId = "";
+		try {
+			while (headerNames.hasMoreElements()) {
+				String headerName = (String) headerNames.nextElement();
+				logger.debug(EELFLoggerDelegate.debugLogger,
+						"One header is " + headerName + " : " + request.getHeader(headerName));
+				if (headerName.equalsIgnoreCase(SystemProperties.ECOMP_REQUEST_ID)) {
+					requestId = request.getHeader(headerName);
+					break;
+				}
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "HEADER!!!! Exception : " + EcompPortalUtils.getStackTrace(e));
+		}
+
+		return (requestId.isEmpty() ? UUID.randomUUID().toString() : requestId);
+	}
+
+	/**
+	 * Gets the full URL from the request.
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return Full URL
+	 */
+	public static String getFullURL(HttpServletRequest request) {
+		if (request != null) {
+			StringBuffer requestURL = request.getRequestURL();
+			String queryString = request.getQueryString();
+
+			if (queryString == null) {
+				return requestURL.toString();
+			} else {
+				return requestURL.append('?').append(queryString).toString();
+			}
+		}
+		return "";
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/SessionCookieUtil.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/SessionCookieUtil.java
new file mode 100644
index 00000000..1ef44a44
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/SessionCookieUtil.java
@@ -0,0 +1,129 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.util;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.openecomp.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+import org.openecomp.portalsdk.core.web.support.AppUtils;
+
+public class SessionCookieUtil {
+	
+	//private static final String JSESSIONID = "JSESSIONID";
+	private static final String EP_SERVICE = "EPService";
+	private static final String USER_ID = "UserId";
+	private static Integer cookieMaxAge = -1;
+	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SessionCookieUtil.class);
+	
+	public static void preSetUp(HttpServletRequest request,
+			HttpServletResponse response) {
+		initateSessionMgtHandler(request);
+		//set up EPService cookie
+		setUpEPServiceCookie(request, response);
+	}
+
+	public static void setUpEPServiceCookie(HttpServletRequest request,
+			HttpServletResponse response) {
+		String jSessionId = getJessionId(request);
+		Cookie cookie1 = new Cookie(EP_SERVICE, jSessionId);
+		cookie1.setMaxAge(cookieMaxAge);
+		cookie1.setDomain(EPCommonSystemProperties.getProperty(EPCommonSystemProperties.COOKIE_DOMAIN));
+		cookie1.setPath("/");
+		response.addCookie(cookie1);
+	}
+	
+	public static void setUpUserIdCookie(HttpServletRequest request,
+			HttpServletResponse response,String userId) throws Exception {
+		logger.info("************** session cookie util set up UserId cookie begins");
+		userId = CipherUtil.encrypt(userId,
+				SystemProperties.getProperty(SystemProperties.Decryption_Key));
+		Cookie cookie1 = new Cookie(USER_ID, userId);
+		cookie1.setMaxAge(cookieMaxAge);
+		cookie1.setDomain(EPCommonSystemProperties.getProperty(EPCommonSystemProperties.COOKIE_DOMAIN));
+		cookie1.setPath("/");
+		response.addCookie(cookie1);
+		logger.info("************** session cookie util set up EP cookie completed");
+	}
+	
+	public static String getUserIdFromCookie(HttpServletRequest request,
+			HttpServletResponse response) throws Exception {
+		String userId = "";
+		Cookie[] cookies = request.getCookies();
+		Cookie userIdcookie = null;
+		if (cookies != null)
+			for (Cookie cookie : cookies)
+				if (cookie.getName().equals(USER_ID))
+					userIdcookie = cookie;
+		if(userIdcookie!=null){
+			userId = CipherUtil.decrypt(userIdcookie.getValue(),
+					SystemProperties.getProperty(SystemProperties.Decryption_Key));
+		}
+		
+		logger.info("************** session cookie util set up EP cookie completed");
+		return userId;
+	}
+	
+	public static String getJessionId(HttpServletRequest request){
+		
+		return request.getSession().getId();
+		/*
+		Cookie ep = WebUtils.getCookie(request, JSESSIONID);
+		if(ep==null){
+			return request.getSession().getId();
+		}
+		return ep.getValue();
+		*/
+	}
+	
+	protected static void initateSessionMgtHandler(HttpServletRequest request) {
+		String jSessionId = getJessionId(request);
+		storeMaxInactiveTime(request);
+		PortalTimeoutHandler.sessionCreated(jSessionId, jSessionId, AppUtils.getSession(request));
+	}
+	
+	protected static void storeMaxInactiveTime(HttpServletRequest request) {
+		HttpSession session = AppUtils.getSession(request);
+		if(session.getAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME) == null)
+			session.setAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME,session.getMaxInactiveInterval());
+	}
+	
+	public static void resetSessionMaxIdleTimeOut(HttpServletRequest request) {
+		try {
+			HttpSession session = AppUtils.getSession(request);
+			final Object maxIdleAttribute = session.getAttribute(PortalApiConstants.GLOBAL_SESSION_MAX_IDLE_TIME);
+			if(session != null && maxIdleAttribute != null) {
+				session.setMaxInactiveInterval(Integer.parseInt(maxIdleAttribute.toString()));
+			}
+		} catch (Exception e) {
+			logger.error(EELFLoggerDelegate.errorLogger, "Could not reset the session timeout. Details: " + EcompPortalUtils.getStackTrace(e));
+		}
+		
+	}
+
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/SystemType.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/SystemType.java
new file mode 100644
index 00000000..fb0e35fc
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/util/SystemType.java
@@ -0,0 +1,26 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalapp.util;
+
+public enum SystemType {
+
+	APPLICATION,
+//	SYSTEM
+}
diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalsdk/core/lm/FusionLicenseManagerUtils.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalsdk/core/lm/FusionLicenseManagerUtils.java
new file mode 100644
index 00000000..72461206
--- /dev/null
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalsdk/core/lm/FusionLicenseManagerUtils.java
@@ -0,0 +1,75 @@
+/*-
+ * ================================================================================
+ * ECOMP Portal SDK
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+package org.openecomp.portalsdk.core.lm;
+
+import java.util.Date;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.openecomp.portalapp.portal.utils.EPCommonSystemProperties;
+import org.openecomp.portalsdk.core.util.SystemProperties;
+//import org.openecomp.portalapp.lm.FusionLicenseManagerImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.servlet.support.RequestContextUtils;
+
+@Component
+public class FusionLicenseManagerUtils {
+	
+	@Autowired
+	private FusionLicenseManager licenseManager;
+
+	@Autowired
+	private EPCommonSystemProperties sysProps;
+	static {
+	}
+		
+	public int verifyLicense(ServletContext context) {
+		if(sysProps == null) {
+			try {
+				sysProps = new EPCommonSystemProperties();
+				sysProps.setServletContext(context);
+//				sysProps.load();
+//				licenseManager = new FusionLicenseManagerImpl(new LicenseableClassImpl());
+				System.out.println(licenseManager);
+				licenseManager.installLicense();
+			}
+			catch(Exception ex) {
+				ex.printStackTrace();
+			}
+		}
+		
+		
+		
+//		WebApplicationContext ctx =RequestContextUtils.getWebApplicationContext(request);
+//		int flag = ((FusionLicenseManager)ctx.getBean("fusionLicenseManager")).verifyLicense(request);
+//		logger.debug("****************FLAG ******************** " + flag);
+//		return flag;
+//		return 2;
+		return licenseManager.verifyLicense(context);
+	}
+
+	public static Date getLicenseExpiryDate(HttpServletRequest request) {
+		WebApplicationContext ctx =RequestContextUtils.getWebApplicationContext(request);
+		return ((FusionLicenseManager)ctx.getBean("fusionLicenseManager")).getExpiredDate();
+	}
+}
author	st782s <statta@research.att.com>	2017-05-04 07:48:42 -0400
committer	st782s <statta@research.att.com>	2017-05-04 12:28:17 -0400
commit	b54df0ddd0c6a0372327c5aa3668e5a6458fcd64 (patch)
tree	e69cfa9b314a801bd187cf0145d1d4306436229c /ecomp-portal-BE-common/src/main/java
parent	39d1e62c84041831bfc52cca73b5ed5efaf57d27 (diff)