diff --git a/.classpath b/.classpath index 233fbff..3c036c1 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 1494fd5..52d1997 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/Users/massi/Documents/workspace/vre-deploy/target/vre-deploy-3.1.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/vre-deploy/target/vre-deploy-3.2.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/pom.xml b/pom.xml index 2650040..963f341 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.admin vre-deploy war - 3.1.0-SNAPSHOT + 3.2.0-SNAPSHOT gCube VRE Deploy Wizard Portlet gCube VRE Deploy Wizard Portlet. @@ -52,7 +52,6 @@ xerces xercesImpl 2.9.1 - provided com.google.gwt @@ -73,6 +72,11 @@ aslsocial provided + + org.gcube.portal + social-networking-library + provided + org.gcube.common home-library @@ -91,7 +95,6 @@ org.gcube.core common-scope-maps - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided @@ -100,11 +103,14 @@ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided + + org.gcube.common.portal + portal-manager + com.sencha.gxt gxt 2.2.5 - provided org.gcube.dvos diff --git a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java index f7a9f11..a4cff27 100644 --- a/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java @@ -342,7 +342,7 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre } for (FunctionalityItem fi :list){ - System.out.println(fi.id()+"-"+fi.name()); + log.info(fi.id()+"-"+fi.name()); VREFunctionalityModel toAdd = new VREFunctionalityModel(Integer.toString(fi.id()), fi.name(), fi.description(), "",fi.selected()); @@ -352,7 +352,7 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre ArrayList newchildrens = new ArrayList(); //creating node children for (FunctionalityItem child : children) { - System.out.println(child.name() + " is " + child.selected()); + log.info(child.name() + " is " + child.selected()); if (child.selected()) { VREFunctionalityModel subFunc = new VREFunctionalityModel(Integer.toString(child.id()), child.name(), child.description(), @@ -1193,20 +1193,20 @@ public class VREDeployerServiceImpl extends RemoteServiceServlet implements Vre return null; } - + ASLSession session = getASLSession(); log.info("TRYING READING CURRENT ORG ID"); - long currOrgid = getASLSession().getGroupId(); //VO ID - String desc = (getASLSession().getAttribute(DESCRIPTION) == null) ? "No Description found": getASLSession().getAttribute(DESCRIPTION).toString(); //desc + long currOrgid = session.getGroupId(); //VO ID + String desc = (session.getAttribute(DESCRIPTION) == null) ? "No Description found": session.getAttribute(DESCRIPTION).toString(); //desc - String designer = (String) getASLSession().getAttribute(DESIGNER); + String designer = (String) session.getAttribute(DESIGNER); log.info("Designer found Name : " + designer); - String manager = (String) getASLSession().getAttribute(MANAGER); - System.out.println("Manager found Name : " + manager); + String manager = (String) session.getAttribute(MANAGER); + log.info("Manager found Name : " + manager); - OrganizationManagerImpl orgManager = OrganizationManagerImpl.getInstance(getASLSession()); + OrganizationManagerImpl orgManager = OrganizationManagerImpl.getInstance(session); try { - GCUBESiteLayout siteLayout = getBaseLayout(vreName, orgManager, false); + GCUBESiteLayout siteLayout = OrganizationManagerImpl.getBaseLayout(vreName, orgManager, false, session.getUsername()); long groupModelid = orgManager.createVRE(vreName, desc, currOrgid, siteLayout, OrganizationsUtil.getgCubeThemeId(ThemesIdManager.GCUBE_LOGGEDIN_THEME)); //the method above create a VRE and assign the manager Role to the person that triggers the creation