diff --git a/.classpath b/.classpath index 22f9719..02f480a 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -35,5 +35,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 2b327c7..b2effd7 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,6 +1,5 @@ -#Thu May 09 16:41:57 CEST 2013 eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/Users/massi/Documents/workspace/social-profile/target/social-profile-0.2.0-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/social-profile/target/social-profile-0.3.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 737c457..4655bcf 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,6 +5,9 @@ + + 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 725c1a3..bb5fad9 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user social-profile war - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT gCube Social Profile Portlet Social Profile @@ -25,7 +25,7 @@ - 2.4.0 + 2.5.1 distro 1.6 @@ -35,7 +35,17 @@ UTF-8 UTF-8 - + + + + org.gcube.distribution + maven-portal-bom + LATEST + pom + import + + + @@ -48,38 +58,26 @@ com.google.gwt gwt-user - ${gwtVersion} provided com.google.gwt gwt-servlet - ${gwtVersion} provided - - org.gcube.core - gcf - [1.4.0,1.6.0] - provided - - org.gcube.portlets.user gcube-widgets - [1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT) provided org.gcube.portal custom-portal-handler - 1.2.0-SNAPSHOT provided org.gcube.applicationsupportlayer aslcore - [3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT) provided @@ -89,10 +87,13 @@ provided - org.gcube.portlets.user + org.gcube.portlets.widgets wsmail-widget - [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided + [1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT) + + + org.gcube.portlets.widgets + workspace-light-tree com.liferay.portal @@ -103,53 +104,26 @@ javax.portlet portlet-api - 2.0 provided org.slf4j slf4j-log4j12 - 1.6.4 - runtime org.slf4j slf4j-api - 1.6.4 - runtime - - - junit - junit - 4.7 - test - - - javax.validation - validation-api - 1.0.0.GA - test - - - javax.validation - validation-api - 1.0.0.GA - sources - test - ${webappDirectory}/WEB-INF/classes - - org.codehaus.mojo gwt-maven-plugin - 2.4.0 + ${gwtVersion} @@ -161,7 +135,7 @@ - Notifications.html + SocialProfile.html ${webappDirectory} org.gcube.portlets.user.notifications.client.Messages diff --git a/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java b/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java index 0f0fdb0..80d67f5 100644 --- a/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java +++ b/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java @@ -10,7 +10,7 @@ import org.gcube.portal.databook.shared.UserInfo; import org.gcube.portlets.user.socialprofile.client.SocialService; import org.gcube.portlets.user.socialprofile.client.SocialServiceAsync; import org.gcube.portlets.user.socialprofile.shared.UserContext; -import org.gcube.portlets.user.wsmail.client.forms.MailForm; +import org.gcube.portlets.widgets.wsmail.client.forms.MailForm; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; diff --git a/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java b/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java index 8362a1b..89edd1f 100644 --- a/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java @@ -4,17 +4,13 @@ import java.util.HashMap; import org.gcube.application.framework.core.session.ASLSession; import org.gcube.application.framework.core.session.SessionManager; -import org.gcube.common.core.utils.logging.GCUBEClientLog; import org.gcube.portal.custom.communitymanager.OrganizationsUtil; import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; import org.gcube.portal.databook.shared.UserInfo; import org.gcube.portlets.user.socialprofile.client.SocialService; import org.gcube.portlets.user.socialprofile.shared.UserContext; -import org.gcube.vomanagement.usermanagement.UserManager; -import org.gcube.vomanagement.usermanagement.exception.UserManagementPortalException; -import org.gcube.vomanagement.usermanagement.exception.UserManagementSystemException; -import org.gcube.vomanagement.usermanagement.exception.UserRetrievalFault; -import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.gwt.user.server.rpc.RemoteServiceServlet; import com.liferay.portal.kernel.exception.PortalException; @@ -29,10 +25,8 @@ import com.liferay.portal.theme.ThemeDisplay; */ @SuppressWarnings("serial") public class SocialServiceImpl extends RemoteServiceServlet implements SocialService { - /** - * - */ - private static GCUBEClientLog _log = new GCUBEClientLog(SocialServiceImpl.class); + + private static final Logger _log = LoggerFactory.getLogger(SocialServiceImpl.class); /** * used for debugging in eclipse diff --git a/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml b/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml index ab3f781..e3ea082 100644 --- a/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml @@ -7,7 +7,7 @@ - + workspaceServiceImpl - org.gcube.portlets.user.workspace.lighttree.server.WorkspaceServiceImpl + org.gcube.portlets.widgets.workspace.lighttree.server.WorkspaceServiceImpl workspaceServiceImpl