diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 8e4d34a..ee70df4 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,10 +5,10 @@
-
+
uses
-
+
uses
@@ -23,6 +23,9 @@
uses
+
+ uses
+
diff --git a/pom.xml b/pom.xml
index d9c9aee..3a66974 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
org.slf4j
slf4j-log4j12
- test
+ runtime
@@ -65,6 +65,18 @@
org.gcube.portal
custom-portal-handler
+
+ org.gcube.applicationsupportlayer
+ aslcore
+
+
+ org.slf4j
+ slf4j-jdk14
+
+
+
+
+
@@ -84,31 +96,34 @@
[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
+ org.gcube.portlets.user
+ td-importer-widget
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]
+
+
+
+
+ org.gcube.portlets.user
+ td-csv-importer-widget
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT]
+
+
org.gcube.portlets.user
sdmx-import-wizard
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
+ org.slf4j
+ log4j-over-slf4j
+
+
-
-
- org.gcube.portlets.user
- csv-import-wizard-gxt3
- [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
-
- org.gcube.portlets.user
- csv-import-wizard-workspace-gxt3
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
-
-
- org.gcube.portlets.user
- home-library-jcr
- runtime
-
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 597f447..a7ceeb3 100644
--- 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,15 +5,14 @@ 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;
import org.gcube.portlets.user.sdmximportwizard.shared.Dataset;
+import org.gcube.portlets.user.td.ciw.client.CSVImporterWidget;
import org.gcube.portlets.user.td.client.event.ImportTableEvent;
import org.gcube.portlets.user.td.client.event.ImportTableType;
+import org.gcube.portlets.user.td.importer.client.TabularDataImporterListener;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT;
@@ -108,26 +107,27 @@ public class TabularDataController {
@Override
public void onSuccess() {*/
- ImportWizard importWizard = new ImportWizard("DemoCSVTarget", LocalSource.INSTANCE);
- importWizard.addListener(new WizardListener() {
-
+ CSVImporterWidget csvImporterWidget = new CSVImporterWidget();
+ csvImporterWidget.show(new TabularDataImporterListener() {
+
@Override
public void failed(Throwable throwable, String reason, String details) {
- System.out.println("FAILED reason: "+reason+" details: "+details+" throwable: "+throwable);
+ // TODO Auto-generated method stub
+
}
-
+
@Override
public void completed() {
- System.out.println("COMPLETED");
+ // TODO Auto-generated method stub
+
}
-
+
@Override
public void aborted() {
- System.out.println("ABORT");
+ // TODO Auto-generated method stub
+
}
});
-
- importWizard.show();
/*}
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
index 2a18ede..ff48cc3 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
@@ -1,7 +1,7 @@
package org.gcube.portlets.user.td.client;
-import org.gcube.portlets.user.td.client.rpc.GreetingService;
-import org.gcube.portlets.user.td.client.rpc.GreetingServiceAsync;
+import org.gcube.portlets.user.td.client.rpc.TabularDataService;
+import org.gcube.portlets.user.td.client.rpc.TabularDataServiceAsync;
import org.gcube.portlets.user.td.client.toolbar.TabularDataTooBar;
import org.gcube.portlets.user.tdw.client.TabularData;
import org.gcube.portlets.user.tdw.client.TabularDataGridPanel;
@@ -53,7 +53,7 @@ public class TabularDataPortlet implements EntryPoint {
/**
* Create a remote service proxy to talk to the server-side Greeting service.
*/
- private final GreetingServiceAsync greetingService = GWT.create(GreetingService.class);
+ private final TabularDataServiceAsync greetingService = GWT.create(TabularDataService.class);
/**
diff --git a/src/main/java/org/gcube/portlets/user/td/client/rpc/GreetingService.java b/src/main/java/org/gcube/portlets/user/td/client/rpc/TabularDataService.java
similarity index 75%
rename from src/main/java/org/gcube/portlets/user/td/client/rpc/GreetingService.java
rename to src/main/java/org/gcube/portlets/user/td/client/rpc/TabularDataService.java
index dc95ab2..06348cf 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/rpc/GreetingService.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/rpc/TabularDataService.java
@@ -6,7 +6,7 @@ import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
/**
* The client side stub for the RPC service.
*/
-@RemoteServiceRelativePath("greet")
-public interface GreetingService extends RemoteService {
+@RemoteServiceRelativePath("tds")
+public interface TabularDataService extends RemoteService {
String greetServer(String name) throws IllegalArgumentException;
}
diff --git a/src/main/java/org/gcube/portlets/user/td/client/rpc/GreetingServiceAsync.java b/src/main/java/org/gcube/portlets/user/td/client/rpc/TabularDataServiceAsync.java
similarity index 65%
rename from src/main/java/org/gcube/portlets/user/td/client/rpc/GreetingServiceAsync.java
rename to src/main/java/org/gcube/portlets/user/td/client/rpc/TabularDataServiceAsync.java
index c08f7dd..46837bb 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/rpc/GreetingServiceAsync.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/rpc/TabularDataServiceAsync.java
@@ -9,11 +9,11 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
* @author "Federico De Faveri defaveri@isti.cnr.it"
*
*/
-public interface GreetingServiceAsync {
+public interface TabularDataServiceAsync {
/**
*
- * @see org.gcube.portlets.user.td.client.rpc.GreetingService#greetServer(java.lang.String)
+ * @see org.gcube.portlets.user.td.client.rpc.TabularDataService#greetServer(java.lang.String)
*/
void greetServer(String name, AsyncCallback callback);
diff --git a/src/main/java/org/gcube/portlets/user/td/server/GreetingServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java
similarity index 72%
rename from src/main/java/org/gcube/portlets/user/td/server/GreetingServiceImpl.java
rename to src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java
index a776cb0..f189a53 100644
--- a/src/main/java/org/gcube/portlets/user/td/server/GreetingServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/td/server/TabularDataServiceImpl.java
@@ -5,7 +5,9 @@ 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.ciw.server.CSVTDImporter;
+import org.gcube.portlets.user.td.client.rpc.TabularDataService;
+import org.gcube.portlets.user.td.importer.server.TabularDataImporterManager;
import org.gcube.portlets.user.td.shared.FieldVerifier;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -13,7 +15,7 @@ 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 TabularDataServiceImpl extends RemoteServiceServlet implements TabularDataService {
/**
* {@inheritDoc}
@@ -21,9 +23,16 @@ public class GreetingServiceImpl extends RemoteServiceServlet implements Greetin
@Override
public void init() throws ServletException {
super.init();
+
+ System.out.println("initializing the TabularDataImporterManager");
+ TabularDataImporterManager importerManager = new TabularDataImporterManager();
+ //importerManager.scanAvailableImporters();
+ importerManager.add(new CSVTDImporter());
+ importerManager.setupImporters();
+
//register the demo csv target
- CSVTargetRegistry.getInstance().add(new DemoCSVTarget());
- System.out.println("Registered DemoCSVTarget");
+ //CSVTargetRegistry.getInstance().add(new DemoCSVTarget());
+ //System.out.println("Registered DemoCSVTarget");
ScopeProvider.instance.set("/gcube/devsec");
}
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 01737c9..67e7d82 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -7,3 +7,5 @@ log4j.appender.A1=org.apache.log4j.ConsoleAppender
# A1 uses PatternLayout.
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} [%t,%M:%L] %m%n
+
+log4j.logger.org.gcube.portlets.user=TRACE, A1
\ No newline at end of file
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 87d86bf..b0e0a8e 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
@@ -9,8 +9,7 @@
-
-
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d13a10c..c4905ef 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -7,14 +7,14 @@
- greetServlet
- org.gcube.portlets.user.td.server.GreetingServiceImpl
+ tdservlet
+ org.gcube.portlets.user.td.server.TabularDataServiceImpl
1
- greetServlet
- /tabulardataportlet/greet
+ tdservlet
+ /tabulardataportlet/tds