diff --git a/config/profile.xml b/config/profile.xml new file mode 100644 index 0000000..0af0981 --- /dev/null +++ b/config/profile.xml @@ -0,0 +1,29 @@ + + + + Service + + tabular-data-gwt-service allows communication between the GUI and services + PortletsUser + tabular-data-gwt-service + 2.7.0-SNAPSHOT + + + tabular-data-gwt-service allows communication between the GUI and services + tabular-data-gwt-service + 2.7.0-SNAPSHOT + + org.gcube.portlets.user + tabular-data-gwt-service + 2.7.0-SNAPSHOT + + library + + tabular-data-gwt-service-2.7.0-SNAPSHOT.jar + + + + + + + diff --git a/distro/INSTALL b/distro/INSTALL new file mode 100644 index 0000000..e69de29 diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..cc51139 --- /dev/null +++ b/distro/LICENSE @@ -0,0 +1,6 @@ +gCube System - License +------------------------------------------------------------ + +The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl). +The software and documentation is provided by its authors/distributors "as is" and no expressed or +implied warranty is given for its use, quality or fitness for a particular case. \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS new file mode 100644 index 0000000..0bc9be3 --- /dev/null +++ b/distro/MAINTAINERS @@ -0,0 +1 @@ +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README new file mode 100644 index 0000000..aad1d2c --- /dev/null +++ b/distro/README @@ -0,0 +1,48 @@ +The gCube System - tabular-data-gwt-service +------------------------------------------------------------ + +This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) + +Authors +------- + +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, +Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" + + +Version and Release Date +------------------------ + +v. 2.7.0-SNAPSHOT (2015-04-30) + + +Description +----------- + +tabular-data-gwt-service allows communication between the GUI and services + + +Download information +-------------------- +Source code is available from SVN: + https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service + +Binaries can be downloaded from: + http://software.d4science.research-infrastructures.eu/ + + +Documentation +------------- + +tabular-data-gwt-service allows communication between the GUI and services + +Documentation is available on-line from the Projects Documentation Wiki: + https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager + + +Licensing +--------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. + + diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..ffda598 --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,70 @@ + + + Added JobClassifier + Added PositionColumn + Added Open TR with parameter on url + Updated Geospatial operations + Updated Resource management + + + Updated background operation monitor + Updated to GWT 2.6.1 + Updated to GXT 3.1.1 + Added editing on multiline + Added support to format type + Added Geospatial C-Square and Ocean Area + Added Point creation + Added Charts + Added support Tabular Resource on Multi Scope [issue #3237] + + + + Updated Discard + Updated CSVExportSession + Added JSON Export + Added Uri Resolver + Added Multi Tab Management + Added Map Creation + Added Resource Management + Added Resume UI State + Added Time Aggregation + + + Added union + Added replace by expression + Added background monitor + Updated operation factory + Updated monitor + + + Added GroupBy + Added SecurtyException + Updated OperationInvocation + Updated Replace + + + Added replace batch operation + Added history + Added resubmit task + Added resume task + + + Added replace value operation + Added share + Added clone operation + Added retrieve of codelist + Added delete and apply template operation + Added the management of views + + + Added column delete operation + Added column change type operation + Added CSV Export operation + Added SDMX Export operation + Updated CSV Import operation + Updated SDMX Import operation + + + First Release + + \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt new file mode 100644 index 0000000..1e5a6dd --- /dev/null +++ b/distro/svnpath.txt @@ -0,0 +1 @@ +https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1ead584..443f7b2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-gwt-service - 2.6.0-SNAPSHOT + 2.7.0-SNAPSHOT tabular-data-gwt-service tabular-data-gwt-service allows communication between the GUI and services @@ -38,8 +38,8 @@ ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} - 2015-02-16 - https://gcube.wiki.gcube-system.org/gcube/index.php + 2015-04-30 + https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager templates distro config diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java index 9e4d4a5..0bfaf28 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java @@ -88,8 +88,9 @@ public class SessionUtil { if (username == null) { logger.warn("no user found in session, using test one"); throw new TDGWTSessionExpiredException("Session Expired!"); - /* + // Remove comment for Test + /* username = Constants.DEFAULT_USER; String scope = Constants.DEFAULT_SCOPE; diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java index e8a1836..ad6223d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/resource/ResourceTDCreator.java @@ -103,8 +103,13 @@ public class ResourceTDCreator { String url = internalURI.getUri().toString(); Thumbnail thumbnail = internalURI.getThumbnail(); - ThumbnailTD thumbnailTD = new ThumbnailTD(thumbnail.getUri() - .toString(),thumbnail.getMimeType()); + ThumbnailTD thumbnailTD=null; + if(thumbnail!=null&& thumbnail.getUri()!=null){ + thumbnailTD = new ThumbnailTD(thumbnail.getUri() + .toString(),thumbnail.getMimeType()); + } + + return new InternalURITD(url, internalURI.getMimeType(), thumbnailTD); } else { diff --git a/templates/changelog.xml b/templates/changelog.xml index 8c98b11..cb09a60 100644 --- a/templates/changelog.xml +++ b/templates/changelog.xml @@ -1,6 +1,12 @@ - + + Added JobClassifier + Added PositionColumn + Added Open TR with parameter on url + Updated Geospatial operations + Updated Resource management + + Updated background operation monitor Updated to GWT 2.6.1 Updated to GXT 3.1.1 @@ -9,12 +15,12 @@ Added Geospatial C-Square and Ocean Area Added Point creation Added Charts - Added support Tabular Resource on Multi Scope [issue #3237] + Added support Tabular Resource on Multi Scope [issue #3237] + - + Updated Discard - Updated CSVExportSession + Updated CSVExportSession Added JSON Export Added Uri Resolver Added Multi Tab Management @@ -23,30 +29,26 @@ Added Resume UI State Added Time Aggregation - + Added union Added replace by expression Added background monitor Updated operation factory - Updated monitor + Updated monitor - + Added GroupBy Added SecurtyException Updated OperationInvocation Updated Replace - + Added replace batch operation Added history Added resubmit task Added resume task - + Added replace value operation Added share Added clone operation @@ -54,8 +56,7 @@ Added delete and apply template operation Added the management of views - + Added column delete operation Added column change type operation Added CSV Export operation @@ -63,8 +64,7 @@ Updated CSV Import operation Updated SDMX Import operation - + First Release \ No newline at end of file