diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index fd3e0d8..75dc9e8 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,7 +5,7 @@ - + uses diff --git a/distro/changelog.xml b/distro/changelog.xml index d0651a0..c31a92d 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,8 +1,13 @@ + + [Project Activity #11690] Integrated with Task Executor Widget + [Task #11127] Porting to new ws-thredds engine - [Feature #11325] Workspace: add New URL feature in the context menu of right pane + [Feature #11325] Workspace: add New URL feature in the context + menu of right pane diff --git a/pom.xml b/pom.xml index 708f378..d413f58 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.portlets.user workspace war - 6.18.0-SNAPSHOT + 6.19.0-SNAPSHOT gCube Workspace Portlet gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. @@ -93,7 +93,7 @@ [1.0.0-SNAPSHOT,) compile - + org.gcube.common.portal @@ -205,6 +205,11 @@ provided + + org.gcube.portlets.widgets + ws-task-executor-widget + [0.0.1-SNAPSHOT, 2.0.0-SNAPSHOT) + @@ -251,8 +256,7 @@ org.gcube.portlets.widgets wsmail-widget - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - compile + [2.0.0-SNAPSHOT, 2.2.0-SNAPSHOT) @@ -296,6 +300,8 @@ sources test + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 7a59af0..a6accc6 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -104,6 +104,17 @@ wsThreddsSyncServlet org.gcube.portlets.widgets.wsthreddssync.server.ThreddsWorkspaceSyncServiceImpl + + + workspacetaskexecutorServlet + org.gcube.portlets.widgets.wstaskexecutor.server.WsTaskExecutorWidgetServiceImpl + + + + workspacetaskexecutorServlet + /workspace/workspacetaskexecutor + +