gCubeSystem
/
tabular-data-manager
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

428: TDM - Support the new Workspace Explorer 

Task-Url: https://support.d4science.org/issues/428

Updated support to workspace explorer

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@117645 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-08-03 16:57:05 +00:00
parent 40269a7b7e
commit 99d6481825
6 changed files with 51 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pom.xml
View File

@ -23,7 +23,7 @@
<scm>
<url>https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet</url>
</scm>
<developers>
<developer>
@ -53,7 +53,7 @@
<gxtVersion>3.1.1</gxtVersion>
<gxt2Version>2.6.1</gxt2Version>
<KEYS>${env.KEYS}</KEYS>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -91,6 +91,14 @@
<artifactId>storage-manager-wrapper</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
@ -141,7 +149,7 @@
</dependency>
<!-- PORTAL -->
<dependency>
<groupId>org.gcube.core</groupId>
@ -163,21 +171,21 @@
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>accesslogger</artifactId>
</dependency>
<!-- Social -->
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>aslsocial</artifactId>
<scope>provided</scope>
</dependency>
<!-- GCube Widgets -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
@ -188,16 +196,23 @@
<!-- WSLT dependencies -->
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>workspace-light-tree</artifactId>
<version>[2.13.1-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<artifactId>workspace-explorer</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>home-library-jcr</artifactId>
<scope>provided</scope>
</dependency>
<!-- service-client-impl -->
<dependency>
<groupId>org.gcube.data.analysis.tabulardata</groupId>
@ -302,7 +317,7 @@
<artifactId>tabular-data-share-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- tabular-data-rule-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
@ -429,7 +444,7 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!--tabular-data-tasks-widget -->
<dependency>

5
src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -59,10 +59,7 @@
<inherits
name='org.gcube.portlets.user.td.statisticalwidget.StatisticalWidget' />
<inherits
name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' />
<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />

6
src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -64,11 +64,9 @@
<inherits
name='org.gcube.portlets.user.td.statisticalwidget.StatisticalWidget' />
<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
<inherits
name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' />
<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />
<inherits name="org.gcube.portlets.user.tdcolumnoperation.TdColumnOperation" />
@ -94,7 +92,7 @@
values="en" /> <extend-property name="locale" values="it" /> <extend-property
name="locale" values="es" /> <set-property name="locale" value="en, it, es"
/> <set-property-fallback name="locale" value="en" /> -->
<!--
<set-property name="log_ConsoleLogger" value="ENABLED" />
<set-property name="log_DivLogger" value="ENABLED" />

2
src/main/webapp/WEB-INF/jsp/TabularDataPortlet_view.jsp
View File

@ -6,9 +6,11 @@
<!-- The module reference below is the link -->
<!-- between html and your Web Toolkit module -->
<link rel="stylesheet" href="<%= request.getContextPath()%>/tabulardataportlet/reset.css" type="text/css"/>
<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/gxt/css/gxt-all.css" />
<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/gxt2/css/gxt-all.css" />
<link rel="stylesheet" href="<%= request.getContextPath()%>/tabulardataportlet.css" type="text/css">
<script src='<%=request.getContextPath()%>/tabulardataportlet/js/jquery-1.10.1.min.js'></script>
<script src='<%=request.getContextPath()%>/tabulardataportlet/tabulardataportlet.nocache.js'></script>
<div id="tdp" style="width: 100%; height: 100%">

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

@ -128,6 +128,14 @@
<servlet-name>WorkspaceLightService</servlet-name>
<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
</servlet>
<!-- Workspace Explorer -->
<servlet>
<servlet-name>workspaceExplorer</servlet-name>
<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
</servlet>
<!-- CSV Import Wizard Workspace -->
@ -294,7 +302,13 @@
<servlet-name>WorkspaceLightService</servlet-name>
<url-pattern>/tabulardataportlet/WorkspaceLightService</url-pattern>
</servlet-mapping>
<!-- Workspace Explorer -->
<servlet-mapping>
<servlet-name>workspaceExplorer</servlet-name>
<url-pattern>/tabulardataportlet/WorkspaceExplorerService</url-pattern>
</servlet-mapping>
<!-- CSV Import Wizard Workspace -->
<!-- <servlet-mapping> <servlet-name>CSVImportServiceWorkspace</servlet-name>
<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
@ -333,7 +347,7 @@
<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
</servlet-mapping>
<!-- TD logs -->
<servlet-mapping>

6
src/main/webapp/tabulardataportlet.html
View File

@ -22,8 +22,10 @@
<link rel="stylesheet" type="text/css" href="gxt/css/gxt-all.css" />
<link type="text/css" rel="stylesheet" href="gxt2/css/gxt-all.css">
<link type="text/css" rel="stylesheet" href="tabulardataportlet.css">
<script type="text/javascript" language="javascript" src="tabulardataportlet/tabulardataportlet.nocache.js"></script>
<script type="text/javascript" src="tabulardataportlet/tabulardataportlet.nocache.js"></script>
<!-- <script type="text/javascript" src='tabulardataportlet/js/jquery-1.10.1.min.js'></script> -->
<!-- <script type="text/javascript" src='tabulardataportlet/js/bootstrap.min.js'></script> -->
</head>
<!-- -->
@ -32,10 +34,8 @@
<!-- to create a completely dynamic UI. -->
<!-- -->
<body>
<!-- OPTIONAL: include this if you want history support -->
<iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
<!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
<noscript>
<div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">