gCubeSystem
/
vre-deploy
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed pom 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-deploy@96728 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2014-06-05 09:24:50 +00:00
parent 4d29d36713
commit bc3d4bec4e
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/vre-deploy-3.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/vre-deploy-3.2.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -31,5 +31,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/vre-deploy-3.1.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/vre-deploy-3.2.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -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

14
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>vre-deploy</artifactId>
<packaging>war</packaging>
<version>3.1.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<name>gCube VRE Deploy Wizard Portlet</name>
<description>
gCube VRE Deploy Wizard Portlet.
@ -52,7 +52,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
@ -73,6 +72,11 @@
<artifactId>aslsocial</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
@ -91,7 +95,6 @@
<dependency>
<groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -100,11 +103,14 @@
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common.portal</groupId>
<artifactId>portal-manager</artifactId>
</dependency>
<dependency>
<groupId>com.sencha.gxt</groupId>
<artifactId>gxt</artifactId>
<version>2.2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>

20
src/main/java/org/gcube/portlets/admin/vredeployer/server/VREDeployerServiceImpl.java
View File

@ -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<VREFunctionalityModel> newchildrens = new ArrayList<VREFunctionalityModel>();
//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