From d2d1f00a1f57386d13507b6b458b14cb0e032b10 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 11 Feb 2014 09:53:28 +0000
Subject: [PATCH] Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@91339 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                       | 12 ++++++++++++
 .settings/org.eclipse.jdt.core.prefs             |  4 ++--
 .settings/org.eclipse.wst.common.component       |  7 +++++--
 ...org.eclipse.wst.common.project.facet.core.xml |  2 +-
 log.txt                                          |  0
 .../user/td/client/ribbon/FileToolBar.java       |  8 ++++----
 .../portlets/user/td/tabulardataportlet.gwt.xml  |  7 +++++--
 .../portlets/user/td/tabulardataportlet.gwt.xml  |  4 +++-
 src/main/webapp/WEB-INF/web.xml                  | 16 ++++++++++++++++
 9 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 log.txt

diff --git a/.classpath b/.classpath
index cc134f7..67a8039 100644
--- a/.classpath
+++ b/.classpath
@@ -22,6 +22,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="lib" path="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/gwt-user.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/doc/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/gwt-dev.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="file:/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/doc/javadoc/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
+	<classpathentry kind="lib" path="/home/giancarlo/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 970976d..39ec1d9 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -6,7 +6,7 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -88,4 +88,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index d73238e..12ed9ce 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,15 +4,18 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="tabular-data-sdmx-import-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-import-widget/tabular-data-sdmx-import-widget">
+        <dependent-module archiveName="tabular-data-widget-common-event-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="tabular-data-sdmx-export-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-export-widget/tabular-data-sdmx-export-widget">
+        <dependent-module archiveName="tabular-data-gwt-service-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gwt-service/tabular-data-gwt-service">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="tabular-data-toolbox-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-toolbox-widget/tabular-data-toolbox-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-column-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="tabular-data-portlet"/>
         <property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index 7893960..4045d87 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -3,5 +3,5 @@
   <fixed facet="wst.jsdt.web"/>
   <installed facet="jst.web" version="2.3"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.5"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/log.txt b/log.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
index f7c8e15..326a9bd 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
@@ -282,8 +282,8 @@ public class FileToolBar {
 		templateOpenButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
-				// eventBus.fireEvent(new RibbonEvent(
-				// RibbonType.EXPORTSDMX));
+				eventBus.fireEvent(new RibbonEvent(
+						RibbonType.TEMPLATEOPEN));
 			}
 		});
 
@@ -300,8 +300,8 @@ public class FileToolBar {
 		templateNewButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
-				// eventBus.fireEvent(new RibbonEvent(
-				// RibbonType.EXPORTSDMX));
+				eventBus.fireEvent(new RibbonEvent(
+				RibbonType.TEMPLATENEW));
 			}
 		});
 
diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index 0347a9e..58207da 100644
--- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -18,7 +18,6 @@
 	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
 	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
 	
-	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
 	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
     <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
 	<inherits name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
@@ -27,7 +26,11 @@
 	<inherits name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' />
 	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
 	
-
+	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
+	<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />
+	
+	
+	
 	<!--  <inherits name='org.gcube.data.analysis.tabulardata.ServiceData'/> -->
 	<!-- Specify the app entry point class. -->
 	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
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 9d02d6f..81e6d33 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
@@ -18,7 +18,6 @@
 	<inherits name='org.gcube.portlets.user.td.wizardwidget.Wizard' />
 	<inherits name='org.gcube.portlets.user.td.widgetcommonevent.WidgetCommonEvent' />
 	
-	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
 	<inherits name='org.gcube.portlets.user.td.toolboxwidget.ToolBox' />
     <inherits name='org.gcube.portlets.user.td.openwidget.TDOpen' />
 	<inherits name='org.gcube.portlets.user.td.sdmximportwidget.SDMXImportWizardTD' />
@@ -27,6 +26,9 @@
 	<inherits name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' />
 	<inherits name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
 	
+	<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' /> 
+	<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />
+	
 
 	<!--  <inherits name='org.gcube.data.analysis.tabulardata.ServiceData'/> -->
 	<!-- Specify the app entry point class. -->
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ac1d07e..e619fbd 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -30,12 +30,21 @@
 	</servlet>
 	
 	
+	
 	<!-- TD Tasks Widget Service  -->
 	<servlet>
 		<servlet-name>tabularDataTasksWidgetService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.td.taskswidget.server.TdTasksWidgetServiceImpl</servlet-class>
 	</servlet>
 
+	<!--  Template Service -->
+	<servlet>
+		<servlet-name>tdTemplateServiceImpl</servlet-name>
+		<servlet-class>org.gcube.portlets.user.tdtemplate.server.TdTemplateServiceImpl</servlet-class>
+	</servlet>
+	
+	
+
 	<!-- CSV IMPORT WIZARD -->
 	<servlet>
 		<servlet-name>CSVImportFileServlet</servlet-name>
@@ -121,6 +130,13 @@
 		<url-pattern>/tabulardataportlet/tabularDataTasksService</url-pattern>
 	</servlet-mapping>
 
+	<!-- Template Servlet -->
+	<servlet-mapping>
+		<servlet-name>tdTemplateServiceImpl</servlet-name>
+		<url-pattern>/tabulardataportlet/tdtemplate</url-pattern>
+	</servlet-mapping>
+	
+
 
 	<!-- CSV IMPORT WIZARD -->
 	<servlet-mapping>