diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 062e198..81ec451 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,5 @@ eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/fedy2/workspace/tabular-data-portlet/target/tabular-data-portlet-1.0.0-SNAPSHOT +lastWarOutDir=/home/giancarlo/workspace/tabular-data-portlet/target/tabular-data-portlet-1.0.0-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index ee70df4..ec3b4fb 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,27 +5,6 @@ - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - diff --git a/TabularDataPortletTest-dev.launch b/TabularDataPortletTest-dev.launch index 9d1e2b3..afcfc4b 100644 --- a/TabularDataPortletTest-dev.launch +++ b/TabularDataPortletTest-dev.launch @@ -7,10 +7,10 @@ - + - + diff --git a/TabularDataPortletTest-prod.launch b/TabularDataPortletTest-prod.launch index 35eacdb..98710e1 100644 --- a/TabularDataPortletTest-prod.launch +++ b/TabularDataPortletTest-prod.launch @@ -7,10 +7,10 @@ - + - + diff --git a/pom.xml b/pom.xml index 3a66974..302a5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -49,10 +49,17 @@ org.slf4j slf4j-api + runtime + + + + + - org.slf4j - slf4j-log4j12 + ch.qos.logback + logback-classic + 1.0.1 runtime @@ -77,7 +84,11 @@ - + + org.gcube.portlets.user + workspace-light-tree-gxt3 + 2.9.1-SNAPSHOT + org.gcube.portlets.user @@ -90,6 +101,12 @@ + + org.gcube.portlets.user + tabular-data-widget + [1.1.0-SNAPSHOT,2.0.0-SNAPSHOT) + sources + org.gcube.portlets.user tabular-data-widget @@ -102,6 +119,12 @@ td-importer-widget [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT] + + org.gcube.portlets.user + td-importer-widget + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT] + sources + @@ -109,12 +132,31 @@ td-csv-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] + sources + org.gcube.portlets.user sdmx-import-wizard [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + org.slf4j + log4j-over-slf4j + + + + + org.gcube.portlets.user + sdmx-import-wizard + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + sources org.slf4j @@ -122,8 +164,6 @@ - - @@ -168,15 +208,6 @@ ${webappDirectory} - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - 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 b0e0a8e..b5de836 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 @@ -10,7 +10,8 @@ - + +