diff --git a/.classpath b/.classpath index f0a1c26..ba34ce9 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -29,10 +29,10 @@ - + - + diff --git a/.settings/org.eclipse.jst.jsp.core.prefs b/.settings/org.eclipse.jst.jsp.core.prefs new file mode 100644 index 0000000..3a5c98d --- /dev/null +++ b/.settings/org.eclipse.jst.jsp.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +validateFragments=false +validation.use-project-settings=true diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 41c9bcb..a19c352 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,9 +1,12 @@ - + + + uses + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index c622e3e..5ea66c3 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/changelog.xml b/distro/changelog.xml index a27d6bf..eb129cb 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + Ported to Liferay 6.2 + Minor bug fix: long vre's name managed properly(Bug #2042) diff --git a/pom.xml b/pom.xml index b885677..488238e 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user user-statistics war - 1.0.1-SNAPSHOT + 2.0.0-SNAPSHOT User statistics portlet User statistics portlet shows main user's statistics. @@ -28,8 +28,7 @@ 2.7.0 - - + 6.2.5 1.7 1.7 ${project.build.directory}/${project.build.finalName} @@ -73,15 +72,13 @@ org.gcube.portlets.user gcube-widgets compile - - - com.liferay.portal - portal-service - provided + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) org.gcube.portal custom-portal-handler + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + provided org.gcube.applicationsupportlayer @@ -90,6 +87,7 @@ org.gcube.dvos usermanagement-core + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) com.google @@ -141,6 +139,12 @@ tibcopagebus4gwt 1.2.0 + + com.liferay.portal + portal-service + ${liferay.version} + provided + diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java index 67b7c86..0557a78 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java @@ -173,7 +173,7 @@ public class StatisticsPanel extends Composite { final HTML name = new HTML(nameToShow); name.setTitle(DISPLAY_NAME + " in " + information.getActualVre()); name.setStyleName("user-stats-title"); - mainPanel.add(name); + //mainPanel.add(name); } diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java index 071fa8a..a3175b2 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java @@ -10,7 +10,7 @@ import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.workspace.Workspace; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; -import org.gcube.portal.custom.communitymanager.OrganizationsUtil; +import org.gcube.portal.custom.communitymanager.SiteManagerUtil; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl; import org.gcube.portal.databook.server.DatabookStore; @@ -196,7 +196,7 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U long init = System.currentTimeMillis(); - User user = OrganizationsUtil.validateUser(userName); + User user = UserLocalServiceUtil.getUserByScreenName(SiteManagerUtil.getCompany().getCompanyId(), session.getUsername()); profileStrenght = evaluateProfileStrenght(user, avatarPresent); long end = System.currentTimeMillis(); diff --git a/src/main/webapp/Statistics.css b/src/main/webapp/Statistics.css index 2b88a48..a33c110 100644 --- a/src/main/webapp/Statistics.css +++ b/src/main/webapp/Statistics.css @@ -1,14 +1,3 @@ -.user-stats-frame { - padding: 10px; - background-color: #FFF; -} - -.user-stats-frame-border { - border-radius: 6px !important; - -moz-border-radius: 6px !important; - -webkit-border-radius: 6px !important; - border: 1px solid #DBDBDB; -} .user-image { height: 70px; diff --git a/src/main/webapp/WEB-INF/liferay-display.xml b/src/main/webapp/WEB-INF/liferay-display.xml index b3c99ee..395df93 100644 --- a/src/main/webapp/WEB-INF/liferay-display.xml +++ b/src/main/webapp/WEB-INF/liferay-display.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/webapp/WEB-INF/liferay-portlet.xml b/src/main/webapp/WEB-INF/liferay-portlet.xml index e372c31..9ce4f19 100644 --- a/src/main/webapp/WEB-INF/liferay-portlet.xml +++ b/src/main/webapp/WEB-INF/liferay-portlet.xml @@ -1,6 +1,5 @@ - - + Statistics diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 13b442f..79d2313 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,9 @@ - + -