diff --git a/.project b/.project index f97b392..1afbf2f 100644 --- a/.project +++ b/.project @@ -16,12 +16,12 @@ - org.eclipse.m2e.core.maven2Builder + org.eclipse.wst.validation.validationbuilder - org.eclipse.wst.validation.validationbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 913d474..425f624 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,4 +1,5 @@ -#Sat Dec 22 19:37:10 CET 2012 +#Tue Feb 26 12:57:33 CET 2013 eclipse.preferences.version=1 encoding//src/main/java=UTF-8 +encoding//src/test/java=UTF-8 encoding/=UTF-8 diff --git a/pom.xml b/pom.xml index b9f0496..8d3bf60 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.gcube.portal custom-portal-handler - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT jar Custom Portal Handler diff --git a/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java b/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java index 75640ea..575ac28 100644 --- a/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java +++ b/src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java @@ -21,7 +21,6 @@ import com.liferay.portal.kernel.util.WebKeys; import com.liferay.portal.model.Group; import com.liferay.portal.model.Organization; import com.liferay.portal.model.User; -import com.liferay.portal.model.UserModel; import com.liferay.portal.service.GroupLocalServiceUtil; import com.liferay.portal.service.OrganizationLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil; @@ -36,6 +35,9 @@ public class ScopeHelper { public static final String USER_EMAIL_ATTRIBUTE = "USER_EMAIL"; public static final String USER_AVATAR_ID_ATTRIBUTE = "USER_AVATAR_ID"; public static final String USER_GENDER_ATTRIBUTE = "USER_GENDER"; + + public static final String ASSERTION_ID = "assertionID"; + /** * */