Integrated CSV import wizard

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@75236 82a268e6-3cf1-43bd-a215-b396298e98cf
2013-05-22 15:48:27 +00:00 · 2013-05-22 15:48:27 +00:00 · 084f4eaf5b
parent b425f33161
commit 084f4eaf5b
7 changed files with 193 additions and 41 deletions
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@ -11,6 +11,18 @@
        <dependent-module archiveName="sdmx-import-wizard-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sdmx-import-wizard/sdmx-import-wizard">
            <dependency-type>uses</dependency-type>
        </dependent-module>
+        <dependent-module archiveName="csv-import-wizard-gxt3-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv-import-wizard-gxt3/csv-import-wizard-gxt3">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="csv4j-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv4j-custom/csv4j-custom">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="csv-import-wizard-workspace-gxt3-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv-import-wizard-workspace-gxt3/csv-import-wizard-workspace-gxt3">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="workspace-light-tree-gxt3-2.9.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree-gxt3/workspace-light-tree-gxt3">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
    <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
        <property name="context-root" value="tabular-data-portlet"/>
  </wb-module>
--- a/pom.xml
+++ b/pom.xml
@ -83,7 +83,7 @@
 			<artifactId>tabular-data-widget</artifactId>
 			<version>[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 		<!-- SDMX IMPORT WIZARD -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
@ -91,6 +91,25 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>

+		<!-- CSV IMPORT WIZARD -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>csv-import-wizard-gxt3</artifactId>
+			<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>csv-import-wizard-workspace-gxt3</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>home-library-jcr</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 	</dependencies>

 	<build>
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@ -5,6 +5,9 @@ package org.gcube.portlets.user.td.client;

 import java.util.List;

+import org.gcube.portlets.user.csvimportwizardgxt3.client.ImportWizard;
+import org.gcube.portlets.user.csvimportwizardgxt3.client.general.WizardListener;
+import org.gcube.portlets.user.csvimportwizardgxt3.client.source.local.LocalSource;
 import org.gcube.portlets.user.sdmximportwizard.client.SDMXImportWizardWindow;
 import org.gcube.portlets.user.sdmximportwizard.client.SDMXWizardSelectionEvent;
 import org.gcube.portlets.user.sdmximportwizard.client.SDMXWizardSelectionEvent.WizardSelectionHandler;
@ -56,14 +59,14 @@ public class TabularDataController {
 		Log.trace("doImportTable importType: "+importType);
 		Info.display("ImportTableEvent", "importType: "+importType);
 		switch (importType) {
-			case SDMX: doSDMXDatasetImport(); break;
-
+			case SDMX: openSDMXDatasetImportWizard(); break;
+			case CSV: openCSVImportWizard(); break;
 			default:
 				break;
 		}
 	}
 	
-	protected void doSDMXDatasetImport()
+	protected void openSDMXDatasetImportWizard()
 	{
 		GWT.runAsync(new RunAsyncCallback() {
 			
@ -75,7 +78,7 @@ public class TabularDataController {

 					@Override
 					public void onSelected(SDMXWizardSelectionEvent<Dataset> event) {
-						doDataseImport(event.getSelected());
+						doSDMXDatasetImport(event.getSelected());
 					}

 					@Override
@ -89,15 +92,56 @@ public class TabularDataController {
 			
 			@Override
 			public void onFailure(Throwable reason) {
-				// TODO Auto-generated method stub
-				
+				asyncCodeLoadingFailed(reason);
 			}
 		});
 	}
 	
-	protected void doDataseImport(List<Dataset> datasets)
+	protected void doSDMXDatasetImport(List<Dataset> datasets)
 	{
 		
 	}
+	
+	protected void openCSVImportWizard()
+	{
+		/*GWT.runAsync(new RunAsyncCallback() {
+			
+			@Override
+			public void onSuccess() {*/
+				ImportWizard importWizard = new ImportWizard("DemoCSVTarget", LocalSource.INSTANCE);
+				importWizard.addListener(new WizardListener() {
+
+					@Override
+					public void failed(Throwable throwable, String reason, String details) {
+						System.out.println("FAILED reason: "+reason+" details: "+details+" throwable: "+throwable);
+					}
+
+					@Override
+					public void completed() {
+						System.out.println("COMPLETED");
+					}
+
+					@Override
+					public void aborted() {
+						System.out.println("ABORT");
+					}
+				});
+				
+				importWizard.show();
+
+			/*}
+			
+			@Override
+			public void onFailure(Throwable reason) {
+				asyncCodeLoadingFailed(reason);
+			}
+		});*/
+	}
+	
+	protected void asyncCodeLoadingFailed(Throwable reason)
+	{
+		Log.error("Async code loading failed", reason);
+		Info.display("Async code loading failed", "Please retry to lunch the operation");
+	}

 }
--- a/src/main/java/org/gcube/portlets/user/td/server/GreetingServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/server/GreetingServiceImpl.java
@ -1,5 +1,10 @@
 package org.gcube.portlets.user.td.server;

+import javax.servlet.ServletException;
+
+import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.portlets.user.csvimportwizardgxt3.server.csv.CSVTargetRegistry;
+import org.gcube.portlets.user.csvimportwizardgxt3.server.csv.DemoCSVTarget;
 import org.gcube.portlets.user.td.client.rpc.GreetingService;
 import org.gcube.portlets.user.td.shared.FieldVerifier;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@ -8,41 +13,56 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 * The server side implementation of the RPC service.
 */
@SuppressWarnings("serial")
-public class GreetingServiceImpl extends RemoteServiceServlet implements
-    GreetingService {
+public class GreetingServiceImpl extends RemoteServiceServlet implements GreetingService {

-  public String greetServer(String input) throws IllegalArgumentException {
-    // Verify that the input is valid.
-    if (!FieldVerifier.isValidName(input)) {
-      // If the input is not valid, throw an IllegalArgumentException back to
-      // the client.
-      throw new IllegalArgumentException(
-          "Name must be at least 4 characters long");
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void init() throws ServletException {
+		super.init();
+		//register the demo csv target
+		CSVTargetRegistry.getInstance().add(new DemoCSVTarget());
+		System.out.println("Registered DemoCSVTarget");
+		
+		ScopeProvider.instance.set("/gcube/devsec");
+	}

-    String serverInfo = getServletContext().getServerInfo();
-    String userAgent = getThreadLocalRequest().getHeader("User-Agent");
+	/**
+	 * {@inheritDoc}
+	 */
+	public String greetServer(String input) throws IllegalArgumentException {
+		// Verify that the input is valid.
+		if (!FieldVerifier.isValidName(input)) {
+			// If the input is not valid, throw an IllegalArgumentException back to
+			// the client.
+			throw new IllegalArgumentException(
+					"Name must be at least 4 characters long");
+		}

-    // Escape data from the client to avoid cross-site script vulnerabilities.
-    input = escapeHtml(input);
-    userAgent = escapeHtml(userAgent);
+		String serverInfo = getServletContext().getServerInfo();
+		String userAgent = getThreadLocalRequest().getHeader("User-Agent");

-    return "Hello, " + input + "!<br><br>I am running " + serverInfo
-        + ".<br><br>It looks like you are using:<br>" + userAgent;
-  }
+		// Escape data from the client to avoid cross-site script vulnerabilities.
+		input = escapeHtml(input);
+		userAgent = escapeHtml(userAgent);

-  /**
-   * Escape an html string. Escaping data received from the client helps to
-   * prevent cross-site script vulnerabilities.
-   *
-   * @param html the html string to escape
-   * @return the escaped string
-   */
-  private String escapeHtml(String html) {
-    if (html == null) {
-      return null;
-    }
-    return html.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(
-        ">", "&gt;");
-  }
+		return "Hello, " + input + "!<br><br>I am running " + serverInfo
+				+ ".<br><br>It looks like you are using:<br>" + userAgent;
+	}
+
+	/**
+	 * Escape an html string. Escaping data received from the client helps to
+	 * prevent cross-site script vulnerabilities.
+	 *
+	 * @param html the html string to escape
+	 * @return the escaped string
+	 */
+	private String escapeHtml(String html) {
+		if (html == null) {
+			return null;
+		}
+		return html.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(
+				">", "&gt;");
+	}
 }
--- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
@ -9,6 +9,8 @@
 	<!-- <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' /> -->
 	<inherits name="org.gcube.portlets.user.tdw.TabularDataWidget" />
 	<inherits name='org.gcube.portlets.user.sdmximportwizard.sdmximportwizard' />
+	<inherits name="org.gcube.portlets.user.csvimportwizardgxt3.csvimportwizardgxt3" />
+	<inherits name="org.gcube.portlets.user.csvimportwizardgxt3.ws.csvimportwizardworkspacegxt3" />

 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
--- a/src/main/webapp/TabularDataPortlet.html
+++ b/src/main/webapp/TabularDataPortlet.html
@ -21,7 +21,7 @@
    <!-- be added before this line.                -->
    <!--                                           -->
    <script type="text/javascript" language="javascript" src="tabulardataportlet/tabulardataportlet.nocache.js"></script>
-    <link rel="stylesheet" type="text/css" href="gxt/css/gxt-all.css" />
+    <!-- <link rel="stylesheet" type="text/css" href="gxt/css/gxt-all.css" /> -->

  </head>

--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@ -9,6 +9,7 @@
 	<servlet>
 		<servlet-name>greetServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.server.GreetingServiceImpl</servlet-class>
+		<load-on-startup>1</load-on-startup>
 	</servlet>

 	<servlet-mapping>
@ -60,6 +61,60 @@
 		<servlet-name>SDMXImportWizardServlet</servlet-name>
 		<url-pattern>/tabulardataportlet/SDMXImportWizardService</url-pattern>
 	</servlet-mapping>
+	
+	<!-- CSV IMPORT WIZARD -->
+	<servlet>
+		<servlet-name>CSVImportService</servlet-name>
+		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.CSVImportServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>CSVImportService</servlet-name>
+		<url-pattern>/tabulardataportlet/CSVImportService</url-pattern>
+	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>LocalUploadServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.local.LocalUploadServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>LocalUploadServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/LocalUploadServlet</url-pattern>
+	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>CSVServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.server.CSVServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>CSVServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/CSVServlet</url-pattern>
+	</servlet-mapping>
+	
+	<!-- Workspace Light Tree -->
+	<servlet>
+		<servlet-name>WorkspaceLightService</servlet-name>
+		<servlet-class>org.gcube.portlets.user.workspace.lighttreegxt3.server.WorkspaceServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>WorkspaceLightService</servlet-name>
+		<url-pattern>/tabulardataportlet/WorkspaceLightService</url-pattern>
+	</servlet-mapping>
+
+	<!-- CSV Import Wizard Workspace-->
+	<servlet>
+		<servlet-name>CSVImportServiceWorkspace</servlet-name>
+		<servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>CSVImportServiceWorkspace</servlet-name>
+		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern>
+	</servlet-mapping>
+	

 	<!-- Default page to serve -->
 	<welcome-file-list>