diff --git a/.classpath b/.classpath index 1cfebfc..ac1f943 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 3947006..13ac861 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,6 +1,5 @@ -#Wed Jul 10 16:38:29 CEST 2013 eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/Users/massi/Documents/workspace/share-updates/target/share-updates-0.5.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/share-updates/target/share-updates-0.6.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index a7f437d..fe006d9 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,9 +5,6 @@ - - uses - diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/pom.xml b/pom.xml index bb6ce0c..2e55c63 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user share-updates war - 0.5.0-SNAPSHOT + 0.6.0-SNAPSHOT gCube Share Updates Portlet @@ -26,7 +26,7 @@ - 2.4.0 + 2.5.1 distro 1.6 @@ -36,9 +36,18 @@ UTF-8 UTF-8 - + + + + org.gcube.distribution + maven-portal-bom + LATEST + pom + import + + + - @@ -50,13 +59,11 @@ com.google.gwt gwt-user - ${gwtVersion} provided com.google.gwt gwt-servlet - ${gwtVersion} provided @@ -68,48 +75,41 @@ org.gcube.applicationsupportlayer aslsocial - [0.1.0-SNAPSHOT, 1.0.0-SNAPSHOT) - provided + provided org.gcube.core gcf - [1.4.0, 2.0.0) - provided + provided org.gcube.portlets.user gcube-widgets - [1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided org.gcube.portlets.user pickuser-widget - [0.1.0-SNAPSHOT, 1.0.0-SNAPSHOT) + [0.2.0-SNAPSHOT, 1.0.0-SNAPSHOT) org.gcube.portal custom-portal-handler - [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided org.gcube.applicationsupportlayer aslcore - [3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT) provided org.gcube.portlets.user home-library - [4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT) provided org.gcube.dvos usermanagement-core - [1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided @@ -157,19 +157,16 @@ javax.portlet portlet-api - 2.0 provided org.slf4j slf4j-log4j12 - 1.6.4 runtime org.slf4j slf4j-api - 1.6.4 runtime @@ -203,7 +200,7 @@ org.codehaus.mojo gwt-maven-plugin - 2.4.0 + ${gwtVersion} diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java index b0a212f..bdc63ae 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java @@ -15,13 +15,15 @@ import java.util.UUID; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.validator.routines.UrlValidator; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager; import org.gcube.applicationsupportlayer.social.NotificationsManager; -import org.gcube.common.core.utils.logging.GCUBEClientLog; +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.scopemanager.scopehelper.ScopeHelper; import org.gcube.portal.databook.client.GCubeSocialNetworking; @@ -53,6 +55,8 @@ import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager; import org.gcube.vomanagement.usermanagement.model.GroupModel; import org.gcube.vomanagement.usermanagement.model.UserModel; import org.htmlparser.beans.StringBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.w3c.tidy.Tidy; @@ -80,7 +84,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar /** * */ - private static GCUBEClientLog _log = new GCUBEClientLog(ShareUpdateServiceImpl.class); + private static Logger _log = LoggerFactory.getLogger(ShareUpdateServiceImpl.class); /** * The store interface */ @@ -635,7 +639,8 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar * @return true if it is, false otherwise. */ private boolean isInfrastructureScope() { - return getASLSession().getScope().isInfrastructure(); + ScopeBean scope = new ScopeBean(getASLSession().getScope()); + return scope.is(Type.INFRASTRUCTURE); } /**