From aeab0d7caf68153c99e559f150ac77d81de8beb2 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 28 Feb 2017 13:28:27 +0000 Subject: [PATCH] removec client scope helper dependency git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/create-users@144407 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 10 +++++++--- .project | 1 + .settings/org.eclipse.wst.common.component | 3 +++ pom.xml | 17 ++++++----------- .../admin/createusers/client/CreateUsers.java | 15 +-------------- .../server/portlet/CreateUsersPortlet.java | 15 +++++++-------- src/main/webapp/WEB-INF/web.xml | 11 ++--------- 7 files changed, 27 insertions(+), 45 deletions(-) diff --git a/.classpath b/.classpath index 387b5de..f5b84cd 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,16 @@ - + - + + + + + @@ -30,5 +34,5 @@ - + diff --git a/.project b/.project index 190a7fc..50ae3db 100644 --- a/.project +++ b/.project @@ -49,5 +49,6 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.jsdt.core.jsNature com.google.gwt.eclipse.core.gwtNature + com.liferay.ide.core.liferayNature diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 4b7cda2..1845f38 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + diff --git a/pom.xml b/pom.xml index 27e6c52..07bf876 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.admin create-users war - 2.2.0-SNAPSHOT + 2.3.0-SNAPSHOT Create users portlet Create users portlet allows a VRE-Manager to enter user's personal data and automatically register he/she in the portal. @@ -64,6 +64,11 @@ portal-manager provided + + org.gcube.dvos + usermanagement-core + provided + com.sun.mail javax.mail @@ -87,21 +92,11 @@ provided ${gwtVersion} - - org.gcube.portal - custom-portal-handler - provided - com.github.gwtbootstrap gwt-bootstrap compile - - org.gcube.dvos - usermanagement-core - provided - com.liferay.portal portal-service diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java b/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java index 85ce5f6..1ca8b56 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java @@ -1,10 +1,6 @@ package org.gcube.portlets.admin.createusers.client; -import org.gcube.portlets.user.gcubewidgets.client.ClientScopeHelper; - import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.Window.Location; -import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; @@ -16,15 +12,6 @@ public class CreateUsers implements EntryPoint { @Override public void onModuleLoad() { - - ClientScopeHelper.getService().setScope(Location.getHref(), new AsyncCallback() { - @Override - public void onSuccess(Boolean result) { - RootPanel.get("create-users-container").add(new CreateUsersPanel()); - } - @Override - public void onFailure(Throwable caught) { - } - }); + RootPanel.get("create-users-container").add(new CreateUsersPanel()); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/admin/createusers/server/portlet/CreateUsersPortlet.java b/src/main/java/org/gcube/portlets/admin/createusers/server/portlet/CreateUsersPortlet.java index 88b296a..1628768 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/server/portlet/CreateUsersPortlet.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/server/portlet/CreateUsersPortlet.java @@ -1,15 +1,15 @@ package org.gcube.portlets.admin.createusers.server.portlet; -import javax.portlet.GenericPortlet; -import javax.portlet.ActionRequest; -import javax.portlet.RenderRequest; -import javax.portlet.ActionResponse; -import javax.portlet.RenderResponse; -import javax.portlet.PortletException; import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; -import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; /** * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) @@ -17,7 +17,6 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; public class CreateUsersPortlet extends GenericPortlet { public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { response.setContentType("text/html"); - ScopeHelper.setContext(request); PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/CreateUsers_view.jsp"); dispatcher.include(request, response); } diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 27e3836..d96e7cb 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -10,20 +10,13 @@ servlet org.gcube.portlets.admin.createusers.server.CreateUsersImpl - - scopeService - org.gcube.portlets.user.gcubewidgets.server.ScopeServiceImpl - + servlet /createusers/usersservice - - scopeService - /createusers/scopeService - - + CreateUsers.html