From 0ec12284f245a6fa1faa472b7fb89f347cc4120b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 22 Oct 2013 17:30:23 +0000 Subject: [PATCH] Added Tabular Data Service operations for csv file import git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@83719 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 36 +++++++++++--- .../user/td/TabularDataPortlet.gwt.xml | 5 +- src/main/webapp/WEB-INF/web.xml | 47 ++++++------------ src/main/webapp/icon.png | Bin 0 -> 2190 bytes .../gcube/portlets/user/td/TestManager.java | 27 ---------- 5 files changed, 46 insertions(+), 69 deletions(-) create mode 100644 src/main/webapp/icon.png delete mode 100644 src/test/java/org/gcube/portlets/user/td/TestManager.java diff --git a/pom.xml b/pom.xml index 1044e81..89864d5 100644 --- a/pom.xml +++ b/pom.xml @@ -165,12 +165,35 @@ --> + + + + commons-io + commons-io + + + commons-fileupload + commons-fileupload + + + + com.googlecode.juniversalchardet + juniversalchardet + 1.0.3 + + + + + org.gcube.common + csv4j + [1.2.0-SNAPSHOT, 2.0.0-common) + org.gcube.portlets.user CSVImportWizardTD - 1.0.0-SNAPSHOT + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) @@ -235,10 +258,9 @@ org.slf4j slf4j-api - - + + junit @@ -282,9 +304,9 @@ compile - + @@ -323,6 +345,4 @@ - - diff --git a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml index d700929..ddbdef8 100644 --- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml @@ -6,7 +6,8 @@ - + + @@ -26,7 +27,7 @@ - + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 64b8f22..1c46cab 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -28,24 +28,18 @@ TDGXTService org.gcube.portlets.user.td.gxtservice.server.TDGXTServiceImpl - - - + - CSVImportService - org.gcube.portlets.user.csvimportwizardgxt3.server.CSVImportServiceImpl + CSVImportFileServlet + org.gcube.portlets.user.td.service.server.CSVImportFileServlet - + LocalUploadServlet - org.gcube.portlets.user.csvimportwizardgxt3.server.local.LocalUploadServlet - - - - CSVServlet - org.gcube.portlets.user.csvimportwizardgxt3.server.CSVServlet + org.gcube.portlets.user.td.service.server.LocalUploadServlet + @@ -65,10 +59,6 @@ org.gcube.portlets.user.workspace.server.DownloadServlet - - imageServlet - org.gcube.portlets.user.workspace.server.ImageServlet - gWTWorkspaceServiceImpl @@ -113,25 +103,22 @@ - - CSVImportService - /tabulardataportlet/CSVImportService + + CSVImportFileServlet + /tabulardataportlet/CSVImportFileServlet + + LocalUploadServlet + /tabulardataportlet/LocalUploadServlet + + + imageServlet /tabulardataportlet/ImageService - - LocalUploadServlet - /tabulardataportlet/LocalUploadServlet - - - - CSVServlet - /tabulardataportlet/CSVServlet - @@ -155,10 +142,6 @@ /tabulardataportlet/WorkspaceService - - imageServlet - /tabulardataportlet/ImageService - uploadServlet diff --git a/src/main/webapp/icon.png b/src/main/webapp/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..432066c921f2bfbf0a9e885f3bb910de4d7daa0d GIT binary patch literal 2190 zcmV;92yyp`P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2i*z~ z3LhgHcMw$o000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000N+NklZ8Rncf<2{2(023dx624i z@8w{EEOph!&$74e`Or5o)Mt5MXZe>kUF@s)aV84DYq@#HriN&gKEV-jW;e~Q!JhVp z_SUBA(fqjMxs*~P@ei6EEtRWO#-2`Yi?)^={`3aS!@#>d)5(ty_T-;@*{-aRG&Gu$Dw z36<_5xtqw?+i6nzMfomyeeXFoG{pLMBr{C=}xMjZ2stp8}~|K|v{@6d(+F z9)MB`LI6quzCZ|u07FAoba%GUE2lqvG(2GV?Xb-jQuJxz!Qg-(>r0DpX1e1QZuJJ8x#h3JH(;0pvGggkpFT*ns}AOLH}@dG>2-JyrdUk$m!lMFkls=K-B z<0(EqywVG$)3gos)h}frHDk@HOX3!`iU_ogB#By#X@vVoE6}rC=E5 zxgX220O6t_Z!LE0KLw}50ZIu30s*X63%y$OQBU!)174%H;kWhG-|(5?p5(O5WjF8F zVV+uwxcP~oAYfb+0{}w+7A_Vj3krh14jp2XSAfG60)(JdSBojof$!)g4vD{5d*}Qi zv(;f4bq>^3eRa=6##f|etcsfvI2j5LZ!io&M@s`LuU|k@LlyjkLcrnjz_JuBOt^5e z0Gfm}P*-|nLycIUm5JFi)M#t2M@PS{RM$|`Jn9@sU!Jkj)S<1v`;UBV+jE>62hD^X zw!&;SBYpKI*oMsb;`~XlPA3+x$^oGx$@C4L^*pa!E)P5*LHV_7u-R;gnG=e^1EDw*oQG?)+~Hb z@DW;D_1nfIMsf3EOn!b-ms*B~kPsh_*ysop7L~xuCji8i3JT!B&TKrsa|Kb!KS4%r zG6uO^$Q(`#vn;O4XIQcCHL z9dA)eDgEN|CHlQj2Otew8LVf)V~OpYU?qSKY0 zlh!1rum0)vvP+nswgzD;3X?;GM|JJ!Gw3lmWJ7%F>rlwu0f656=ZW%TAH1`8LN+21 zpX%Z>HWvqJQfTD-Wu!&lhC#*)vdJOvRQbVAtpSfmp}Jdyn!bM8Yk1oA;Kqd?KW%O_ zP6z`^rI+N7rz;1Y3+zK9EJ>#Rn+Z^)qIqTF1}@FWQ=%H}|dEw)?Zb zzAkfB|*A4-n4}nOG#%3*Aa}%*(?-nc!mO`OWKok8VSS@Bq<;u7s?-DQ&xRL@-2B1>_z+ zs&O-L`Qo{rr2@g6=0HW|n(7|GOXY_-fwGa8yZ!_e6y=ZmV76Fb?CrvUsh>u~rDQAR($>1F%7eyp0DUO2aBRx-MD-E1|(uJ+$X8vwA%^8vv^!LUOR zPnrRS%Y%oMi)LLtQWwn|SP&nbtW>&J{@_vE+1a_kWHQB3>WsBmtR7~IMQXQMJ#BV7 z-)gl>7(xYv0EA&248siaxIDX9Ebf#@#AcC5*ddijsyJL;g}3+Q>o3Or51K1x$5fc1 QNB{r;07*qoM6N<$g0GPfGynhq literal 0 HcmV?d00001 diff --git a/src/test/java/org/gcube/portlets/user/td/TestManager.java b/src/test/java/org/gcube/portlets/user/td/TestManager.java deleted file mode 100644 index 8bb586c..0000000 --- a/src/test/java/org/gcube/portlets/user/td/TestManager.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td; - -import org.gcube.portlets.user.td.importer.server.TabularDataImporter; -import org.gcube.portlets.user.td.importer.server.TabularDataImporterManager; - -/** - * @author "Federico De Faveri defaveri@isti.cnr.it" - * - */ -public class TestManager { - - /** - * @param args - */ - public static void main(String[] args) { - TabularDataImporterManager importerManager = new TabularDataImporterManager(); - //importerManager.scanAvailableImporters(); - - System.out.println("Importers:"); - for (TabularDataImporter importer:importerManager.getImporters()) System.out.println(importer.getName()); - - } - -}