diff --git a/.classpath b/.classpath index 0a66031..3f76803 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -35,5 +35,5 @@ - + diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index a0ff6f3..224aee6 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -3,6 +3,9 @@ + + uses + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 0000000..cc81385 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index afd5d47..9716eab 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -5,4 +5,5 @@ + diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index 72b5dd1..0000000 --- a/distro/INSTALL +++ /dev/null @@ -1 +0,0 @@ -Use the respective war file of this component diff --git a/distro/LICENSE b/distro/LICENSE index cdb5851..2d9616a 100644 --- a/distro/LICENSE +++ b/distro/LICENSE @@ -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} \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS deleted file mode 100644 index ffed162..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1,5 +0,0 @@ -Mantainers -------- - -* Massimiliano Assante (massimiliano.assante@isti.cnr.it), CNR Pisa, - Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo". diff --git a/distro/README b/distro/README index f85f1f0..70cc12c 100644 --- a/distro/README +++ b/distro/README @@ -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. \ No newline at end of file +-------------------------------------------------- +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index edacb04..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -${scm.url} \ No newline at end of file diff --git a/pom.xml b/pom.xml index c1fc932..8fd0c80 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.admin resource-management - 5.7.0-SNAPSHOT + 6.0.0-SNAPSHOT war gCube Resource Management Portlet @@ -26,6 +26,7 @@ 2.7.0 + 6.2.5 3.0 distro 1.7 @@ -70,6 +71,7 @@ org.gcube.portal custom-portal-handler + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided @@ -107,6 +109,7 @@ org.gcube.dvos usermanagement-core + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) provided @@ -204,6 +207,25 @@ com.liferay.portal portal-service + ${liferay.version} + provided + + + com.liferay.portal + util-bridges + ${liferay.version} + provided + + + com.liferay.portal + util-taglib + ${liferay.version} + provided + + + com.liferay.portal + util-java + ${liferay.version} provided diff --git a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/gcube/services/StatusHandler.java b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/gcube/services/StatusHandler.java index 8153e15..54ab46c 100644 --- a/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/gcube/services/StatusHandler.java +++ b/src/main/java/org/gcube/portlets/admin/resourcemanagement/server/gcube/services/StatusHandler.java @@ -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 roles = null; + List 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); } diff --git a/src/main/webapp/coherence.css b/src/main/webapp/coherence.css index 8bc8286..f72465d 100644 --- a/src/main/webapp/coherence.css +++ b/src/main/webapp/coherence.css @@ -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; } diff --git a/src/main/webapp/openbio.css b/src/main/webapp/openbio.css deleted file mode 100644 index 1066395..0000000 --- a/src/main/webapp/openbio.css +++ /dev/null @@ -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; - } \ No newline at end of file