gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unused servlet 

Updated pom version at 6.12.0

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@128482 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2016-05-05 16:25:34 +00:00
parent 0800e43764
commit daab415b6d
5 changed files with 70 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.settings/org.eclipse.wst.common.component
View File

@ -5,6 +5,12 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="workspace-tree-widget-6.11.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget-TRUNK/workspace-tree-widget-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="workspace-uploader-1.1.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader-TRUNK/workspace-uploader-TRUNK">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/> <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="workspace"/> <property name="context-root" value="workspace"/>

85
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId> <groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace</artifactId> <artifactId>workspace</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>6.11.0-SNAPSHOT</version> <version>6.12.0-SNAPSHOT</version>
<name>gCube Workspace Portlet</name> <name>gCube Workspace Portlet</name>
<description> <description>
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. 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.
@ -41,7 +41,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId> <artifactId>maven-portal-bom</artifactId>
<version>LATEST</version> <version>2.6.0-SNAPSHOT</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
<exclusions> <exclusions>
@ -56,17 +56,16 @@
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<!-- UNCOMMENT THIS TO RUN IN DEVO MODE --> <!-- UNCOMMENT THIS TO RUN IN DEVO MODE -->
<!-- <dependency> --> <!-- <dependency> -->
<!-- <groupId>xerces</groupId> --> <!-- <groupId>xerces</groupId> -->
<!-- <artifactId>xerces</artifactId> --> <!-- <artifactId>xerces</artifactId> -->
<!-- <version>2.4.0</version> --> <!-- <version>2.4.0</version> -->
<!-- </dependency> --> <!-- </dependency> -->
<!-- This dependency is needed and is need on TOP to use GWT UI BInder <!-- This dependency is needed and is need on TOP to use GWT UI BInder
without old Xerces version of gCore complaining --> without old Xerces version of gCore complaining -->
@ -152,29 +151,23 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-tree-widget</artifactId>
<version>[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<!-- HOME LIBRARY --> <!-- HOME LIBRARY -->
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>home-library-model</artifactId> <artifactId>home-library-model</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>asm-debug-all</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.common</groupId> <groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId> <artifactId>home-library</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -183,6 +176,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.liferay.portal</groupId> <groupId>com.liferay.portal</groupId>
@ -196,6 +194,14 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>wsmail-widget</artifactId>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<!-- LOGGER --> <!-- LOGGER -->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
@ -212,41 +218,6 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-tree-widget</artifactId>
<version>[6.0.0-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<!-- WSLT dependencies -->
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>workspace-light-tree</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>fileupload-progress-bar</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>gwt-user</artifactId>
<groupId>com.google.gwt</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>wsmail-widget</artifactId>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

2
src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
View File

@ -57,7 +57,7 @@ public class WorkspacePortlet implements EntryPoint {
// if (rootHeight > 550) // if (rootHeight > 550)
// rootHeight = 550; // rootHeight = 550;
int rootHeight = (Window.getClientHeight() - topBorder - 4 - footer);// - ((footer == null)?0:(footer.getOffsetHeight()-15)); int rootHeight = Window.getClientHeight() - topBorder - 4 - footer;// - ((footer == null)?0:(footer.getOffsetHeight()-15));
if (rootHeight < 550) if (rootHeight < 550)
rootHeight = 550; rootHeight = 550;

5
src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
View File

@ -18,13 +18,8 @@
<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' /> <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' /> <inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />
<!-- <inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' /> -->
<inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' /> <inherits name='org.gcube.portlets.widgets.wsmail.WsMail_Widget' />
<inherits name='org.gcube.portlets.widgets.fileupload.FileUpload' />
<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' /> <inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
<inherits name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader"></inherits> <inherits name="org.gcube.portlets.widgets.workspaceuploader.WorkspaceUploader"></inherits>
<!-- Specify the app entry point class. --> <!-- Specify the app entry point class. -->

75
src/main/webapp/WEB-INF/web.xml
View File

@ -10,27 +10,11 @@
<welcome-file>WorkspacePortlet.html</welcome-file> <welcome-file>WorkspacePortlet.html</welcome-file>
</welcome-file-list> </welcome-file-list>
<!-- FILE UPLOAD WIDGET -->
<servlet>
<servlet-name>uploadprogress</servlet-name>
<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadProgressServlet</servlet-class>
</servlet>
<!-- DO NOT CHANGE - DO NOT Replace URL PATTERN HERE -->
<servlet>
<servlet-name>upload</servlet-name>
<servlet-class>org.gcube.portlets.widgets.fileupload.server.UploadServlet</servlet-class>
</servlet>
<servlet> <servlet>
<servlet-name>workspacesharing</servlet-name> <servlet-name>workspacesharing</servlet-name>
<servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class> <servlet-class>org.gcube.portlets.widgets.workspacesharingwidget.server.WorkspaceSharingServiceImpl</servlet-class>
</servlet> </servlet>
<!-- END DO NOT CHANGE -->
<servlet> <servlet>
<servlet-name>UploadService</servlet-name> <servlet-name>UploadService</servlet-name>
<servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class> <servlet-class>org.gcube.portlets.user.workspace.server.UploadServlet</servlet-class>
@ -63,7 +47,6 @@
<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class> <servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
</servlet> </servlet>
<servlet> <servlet>
<servlet-name>ImageService</servlet-name> <servlet-name>ImageService</servlet-name>
<servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class> <servlet-class>org.gcube.portlets.user.workspace.server.ImageServlet</servlet-class>
@ -90,6 +73,18 @@
<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderWsUtil</servlet-class> <servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderWsUtil</servlet-class>
</servlet> </servlet>
<servlet>
<servlet-name>jUnitHostImpl</servlet-name>
<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
</servlet>
<!-- Quick Tour -->
<servlet>
<servlet-name>quicktourServlet</servlet-name>
<servlet-class>org.gcube.portlets.widgets.guidedtour.server.TourServiceImpl</servlet-class>
</servlet>
<!-- ###################### MAPPING ######################à -->
<servlet-mapping> <servlet-mapping>
<servlet-name>workspaceUploaderWsUtil</servlet-name> <servlet-name>workspaceUploaderWsUtil</servlet-name>
<url-pattern>/workspace/workspaceUploaderWsUtil</url-pattern> <url-pattern>/workspace/workspaceUploaderWsUtil</url-pattern>
@ -110,22 +105,16 @@
<url-pattern>/workspace/workspaceUploaderService</url-pattern> <url-pattern>/workspace/workspaceUploaderService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- END Servlets UploadServletStream -->
<servlet-mapping>
<servlet-name>ImageService</servlet-name>
<url-pattern>/workspace/ImageService</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>WorkspaceService</servlet-name> <servlet-name>WorkspaceService</servlet-name>
<url-pattern>/workspace/WorkspaceService</url-pattern> <url-pattern>/workspace/WorkspaceService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>uploadprogress</servlet-name> <servlet-name>ImageService</servlet-name>
<url-pattern>/workspace/uploadprogress</url-pattern> <url-pattern>/workspace/ImageService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>checkServlet</servlet-name> <servlet-name>checkServlet</servlet-name>
<url-pattern>/workspace/checksession</url-pattern> <url-pattern>/workspace/checksession</url-pattern>
@ -136,17 +125,6 @@
<url-pattern>/workspace/mailWisdgetServlet</url-pattern> <url-pattern>/workspace/mailWisdgetServlet</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- Workspace Light Tree servlet -->
<servlet>
<servlet-name>WorkspaceLightService</servlet-name>
<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>WorkspaceLightService</servlet-name>
<url-pattern>/workspace/WorkspaceLightService</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>LocalUploadService</servlet-name> <servlet-name>LocalUploadService</servlet-name>
<url-pattern>/workspace/LocalUploadService</url-pattern> <url-pattern>/workspace/LocalUploadService</url-pattern>
@ -167,14 +145,7 @@
<url-pattern>/workspace/workspacesharing</url-pattern> <url-pattern>/workspace/workspacesharing</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<servlet-name>upload</servlet-name>
<url-pattern>/FileUpload/upload</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>jUnitHostImpl</servlet-name>
<servlet-class>com.google.gwt.junit.server.JUnitHostImpl</servlet-class>
</servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>jUnitHostImpl</servlet-name> <servlet-name>jUnitHostImpl</servlet-name>
<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/junithost/*</url-pattern> <url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/junithost/*</url-pattern>
@ -189,10 +160,10 @@
<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/DownloadService</url-pattern> <url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/DownloadService</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <!-- <servlet-mapping> -->
<servlet-name>WorkspaceService</servlet-name> <!-- <servlet-name>WorkspaceService</servlet-name> -->
<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/WorkspaceService</url-pattern> <!-- <url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/WorkspaceService</url-pattern> -->
</servlet-mapping> <!-- </servlet-mapping> -->
<servlet-mapping> <servlet-mapping>
<servlet-name>ImageService</servlet-name> <servlet-name>ImageService</servlet-name>
@ -203,11 +174,7 @@
<servlet-name>UploadService</servlet-name> <servlet-name>UploadService</servlet-name>
<url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/UploadService</url-pattern> <url-pattern>/org.gcube.portlets.user.workspace.WorkspacePortletJUnit/UploadService</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- Quick Tour -->
<servlet>
<servlet-name>quicktourServlet</servlet-name>
<servlet-class>org.gcube.portlets.widgets.guidedtour.server.TourServiceImpl</servlet-class>
</servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>quicktourServlet</servlet-name> <servlet-name>quicktourServlet</servlet-name>