From 99c414b7c05911739a91250ab97498a3b37ceabe Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Thu, 8 Oct 2015 09:24:53 +0000 Subject: [PATCH] Changed bootstrap dependency at 2.3.2.0 git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@119504 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 --- pom.xml | 2 +- src/main/webapp/WEB-INF/web.xml | 12 +++++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index bdff2e9..8562dc6 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -8,9 +8,6 @@ uses - - uses - diff --git a/pom.xml b/pom.xml index 8935b7d..27fac71 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ com.github.gwtbootstrap gwt-bootstrap - 2.2.1.0 + 2.3.2.0 diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index a03cde6..5812293 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -69,6 +69,11 @@ org.gcube.portlets.user.workspace.server.ImageServlet + + workspaceExplorer + org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl + + workspaceUploadServletStream @@ -80,6 +85,11 @@ org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderServiceImpl + + workspaceExplorer + /workspace/WorkspaceExplorerService + + workspaceUploadServletStream /workspace/workspaceUploadServletStream @@ -91,7 +101,7 @@ - + ImageService /workspace/ImageService