UPDATED distro folder
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@125113 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
ae8bf64234
commit
4e0e994898
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" output="target/resource-management-5.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||
<classpathentry kind="src" output="target/resource-management-6.0.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||
<attributes>
|
||||
<attribute name="optional" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
|
|
@ -35,5 +35,5 @@
|
|||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
|
||||
<classpathentry kind="output" path="target/resource-management-5.7.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
<classpathentry kind="output" path="target/resource-management-6.0.0-SNAPSHOT/WEB-INF/classes"/>
|
||||
</classpath>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
|
||||
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
|
||||
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
|
||||
<dependent-module archiveName="rmp-common-library-2.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/rmp-common-library/rmp-common-library">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||
<property name="context-root" value="resource-management"/>
|
||||
</wb-module>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<root>
|
||||
<facet id="jst.jaxrs">
|
||||
<node name="libprov">
|
||||
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
|
||||
</node>
|
||||
</facet>
|
||||
</root>
|
||||
|
|
@ -5,4 +5,5 @@
|
|||
<installed facet="jst.web" version="2.5"/>
|
||||
<installed facet="java" version="1.7"/>
|
||||
<installed facet="liferay.portlet" version="6.0"/>
|
||||
<installed facet="jst.jaxrs" version="2.0"/>
|
||||
</faceted-project>
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Use the respective war file of this component
|
||||
|
|
@ -1,7 +1 @@
|
|||
gCube System - License
|
||||
------------------------------------------------------------
|
||||
|
||||
The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
|
||||
The software and documentation is provided by its authors/distributors "as is" and no expressed or
|
||||
implied warranty is given for its use, quality or fitness for a particular case.
|
||||
|
||||
${gcube.license}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
Mantainers
|
||||
-------
|
||||
|
||||
* Massimiliano Assante (massimiliano.assante@isti.cnr.it), CNR Pisa,
|
||||
Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
|
||||
|
|
@ -1,51 +1,45 @@
|
|||
The gCube System - Portlets - Resource Management Portlet
|
||||
The gCube System
|
||||
------------------------------------------------------------
|
||||
|
||||
${gcube.description}
|
||||
|
||||
${gcube.funding}
|
||||
|
||||
This work has been partially supported by the following European projects:
|
||||
DILIGENT (FP6-2003-IST-2), D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2),
|
||||
iMarine (FP7-INFRASTRUCTURES-2011-2), and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil).
|
||||
|
||||
Version
|
||||
--------------------------------------------------
|
||||
${version} (${buildDate})
|
||||
|
||||
Please see the file named "changelog.xml" in this directory for the release notes.
|
||||
|
||||
|
||||
Authors
|
||||
-------
|
||||
* Massimiliano Assante (massimiliano.assante@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
|
||||
* Daniele Strollo
|
||||
|
||||
|
||||
Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
|
||||
|
||||
|
||||
Version and Release Date
|
||||
------------------------
|
||||
|
||||
v. 2.1.0, September 21st 2012
|
||||
|
||||
Description
|
||||
Maintainers
|
||||
-----------
|
||||
EXT-GWT based portlet application to manage resources and their related operations
|
||||
|
||||
Download information
|
||||
--------------------
|
||||
Source code is available from SVN:
|
||||
https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/ResourceManagementPortlet
|
||||
|
||||
Binaries can be downloaded from:
|
||||
http://software.d4science.research-infrastructures.eu/
|
||||
|
||||
Documentation
|
||||
|
||||
Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
|
||||
|
||||
|
||||
Documentation
|
||||
-------------
|
||||
Documentation is available on-line from the Projects Documentation Wiki:
|
||||
|
||||
https://gcube.wiki.gcube-system.org/gcube/index.php/Developer%27s_Guide
|
||||
Documentation is available on - line from the Projects Documentation wiki:
|
||||
|
||||
{gcube.wikiRoot}/gcube/index.php/UserManagement_Core
|
||||
|
||||
|
||||
Support
|
||||
--------------------------------------------------
|
||||
Bugs and support requests can be reported in the gCube issue tracking tool:
|
||||
${gcube.issueTracking}
|
||||
|
||||
|
||||
Licensing
|
||||
---------
|
||||
|
||||
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
|
||||
|
||||
On OSX
|
||||
---------
|
||||
If having troubles with xerces:
|
||||
javax.xml.parsers.FactoryConfigurationError: Provider org.apache.xerces.jaxp.DocumentBuilderFactoryImpl not found
|
||||
|
||||
With jdk1.5 use sax.jar provided in the lib dir in behalf of $GLOBUS_LOCATION/lib/xercesImpl.jar
|
||||
and xml-apis.jar.
|
||||
--------------------------------------------------
|
||||
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
${scm.url}
|
||||
24
pom.xml
24
pom.xml
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
<groupId>org.gcube.portlets.admin</groupId>
|
||||
<artifactId>resource-management</artifactId>
|
||||
<version>5.7.0-SNAPSHOT</version>
|
||||
<version>6.0.0-SNAPSHOT</version>
|
||||
<packaging>war</packaging>
|
||||
<name>gCube Resource Management Portlet</name>
|
||||
<description>
|
||||
|
|
@ -26,6 +26,7 @@
|
|||
<properties>
|
||||
<!-- Convenience property to set the GWT version -->
|
||||
<gwtVersion>2.7.0</gwtVersion>
|
||||
<liferay.version>6.2.5</liferay.version>
|
||||
<guice.version>3.0</guice.version>
|
||||
<distroDirectory>distro</distroDirectory>
|
||||
<maven.compiler.source>1.7</maven.compiler.source>
|
||||
|
|
@ -70,6 +71,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>custom-portal-handler</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -107,6 +109,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.dvos</groupId>
|
||||
<artifactId>usermanagement-core</artifactId>
|
||||
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
@ -204,6 +207,25 @@
|
|||
<dependency>
|
||||
<groupId>com.liferay.portal</groupId>
|
||||
<artifactId>portal-service</artifactId>
|
||||
<version>${liferay.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.liferay.portal</groupId>
|
||||
<artifactId>util-bridges</artifactId>
|
||||
<version>${liferay.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.liferay.portal</groupId>
|
||||
<artifactId>util-taglib</artifactId>
|
||||
<version>${liferay.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.liferay.portal</groupId>
|
||||
<artifactId>util-java</artifactId>
|
||||
<version>${liferay.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@ import org.gcube.resourcemanagement.support.shared.types.RunningMode;
|
|||
import org.gcube.resourcemanagement.support.shared.types.UserGroup;
|
||||
import org.gcube.vomanagement.usermanagement.RoleManager;
|
||||
import org.gcube.vomanagement.usermanagement.UserManager;
|
||||
import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayRoleManager;
|
||||
import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager;
|
||||
import org.gcube.vomanagement.usermanagement.model.RoleModel;
|
||||
import org.gcube.vomanagement.usermanagement.model.UserModel;
|
||||
import org.gcube.vomanagement.usermanagement.impl.LiferayRoleManager;
|
||||
import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager;
|
||||
import org.gcube.vomanagement.usermanagement.model.GCubeRole;
|
||||
import org.gcube.vomanagement.usermanagement.model.GCubeUser;
|
||||
|
||||
/**
|
||||
* @author Daniele Strollo (ISTI-CNR)
|
||||
|
|
@ -85,17 +85,15 @@ public class StatusHandler {
|
|||
|
||||
|
||||
try {
|
||||
List<RoleModel> roles = null;
|
||||
List<GCubeRole> roles = null;
|
||||
|
||||
// Gets the user email. If not provided the default one will be used.
|
||||
// The mail will be store inside the session.
|
||||
UserModel umodel = uman.getUserByScreenName(username);
|
||||
GCubeUser umodel = uman.getUserByUsername(username);
|
||||
session.setAttribute(USER_EMAIL_KEY, umodel.getEmail());
|
||||
|
||||
roles = rman.listRolesByUserAndGroup(
|
||||
String.valueOf(aslSession.getGroupId()),
|
||||
uman.getUserByScreenName(username).getUserId());
|
||||
for (RoleModel role : roles) {
|
||||
long groupId = aslSession.getGroupId();
|
||||
roles = rman.listRolesByUserAndGroup(groupId, uman.getUserByUsername(username).getUserId());
|
||||
for (GCubeRole role : roles) {
|
||||
if (role.getRoleName().equals(ADMIN_ROLE)) {
|
||||
status.setCredentials(UserGroup.ADMIN);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,3 @@
|
|||
#wrapper {
|
||||
font: 11px/1.5 "Lucida Grande", "Lucida Sans Unicode", Arial, Verdana,
|
||||
sans-serif;
|
||||
margin: 0 auto;
|
||||
width: 92% !important;
|
||||
}
|
||||
|
||||
#bottombar {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
#wrapper {
|
||||
font: 11px/1.5 "Lucida Grande", "Lucida Sans Unicode", Arial, Verdana, sans-serif;
|
||||
margin: 0 auto;
|
||||
width: 92% !important;
|
||||
}
|
||||
|
||||
|
||||
.x-menubar {
|
||||
|
||||
background-color: #3a6472;
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(58, 100, 114)), to(rgb(118, 152, 153)));
|
||||
background-image: -webkit-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: -moz-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: -o-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: -ms-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#3a6472', EndColorStr='#769899');
|
||||
|
||||
|
||||
}
|
||||
|
||||
.x-border-layout-ct {
|
||||
background-color: #3a6472;
|
||||
}
|
||||
.x-toolbar {
|
||||
border-color: #688486;
|
||||
background: #688486;
|
||||
}
|
||||
.x-panel-header {
|
||||
border-color: #688486;
|
||||
background-color: #3a6472;
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(58, 100, 114)), to(rgb(118, 152, 153)));
|
||||
background-image: -webkit-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: -moz-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: -o-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: -ms-linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
background-image: linear-gradient(top, rgb(58, 100, 114), rgb(118, 152, 153));
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#3a6472', EndColorStr='#769899');
|
||||
|
||||
}
|
||||
.x-accordion-hd {
|
||||
background-position: 0 0px;
|
||||
}
|
||||
.x-status-text {
|
||||
color:#e9b746;
|
||||
font-weight: bold !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.x-component {
|
||||
color:#283891;
|
||||
}
|
||||
Loading…
Reference in New Issue