diff --git a/.classpath b/.classpath
index b614208..7991cd2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -45,5 +45,5 @@
-
+
diff --git a/config/profile.xml b/config/profile.xml
new file mode 100644
index 0000000..0ea0b9b
--- /dev/null
+++ b/config/profile.xml
@@ -0,0 +1,29 @@
+
+
+
+ Service
+
+ tabular-data-manager manages tabular data
+ PortletsUser
+ tabular-data-manager
+ 2.7.0-SNAPSHOT
+
+
+ tabular-data-manager manages tabular data
+ tabular-data-manager
+ 2.7.0-SNAPSHOT
+
+ org.gcube.portlets.user
+ tabular-data-manager
+ 2.7.0-SNAPSHOT
+
+ webapplication
+
+ tabular-data-manager-2.7.0-SNAPSHOT.war
+
+
+
+
+
+
+
diff --git a/distro/INSTALL b/distro/INSTALL
new file mode 100644
index 0000000..e69de29
diff --git a/distro/LICENSE b/distro/LICENSE
new file mode 100644
index 0000000..cc51139
--- /dev/null
+++ b/distro/LICENSE
@@ -0,0 +1,6 @@
+gCube System - License
+------------------------------------------------------------
+
+The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
+The software and documentation is provided by its authors/distributors "as is" and no expressed or
+implied warranty is given for its use, quality or fitness for a particular case.
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
new file mode 100644
index 0000000..0bc9be3
--- /dev/null
+++ b/distro/MAINTAINERS
@@ -0,0 +1 @@
+Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/distro/README b/distro/README
new file mode 100644
index 0000000..27f4f3a
--- /dev/null
+++ b/distro/README
@@ -0,0 +1,48 @@
+The gCube System - tabular-data-manager
+------------------------------------------------------------
+
+This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2)
+
+Authors
+-------
+
+Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
+Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+
+
+Version and Release Date
+------------------------
+
+v. 2.7.0-SNAPSHOT (2015-04-30)
+
+
+Description
+-----------
+
+tabular-data-manager manages tabular data
+
+
+Download information
+--------------------
+Source code is available from SVN:
+ https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet
+
+Binaries can be downloaded from:
+ http://software.d4science.research-infrastructures.eu/
+
+
+Documentation
+-------------
+
+tabular-data-manager manages tabular data
+
+Documentation is available on-line from the Projects Documentation Wiki:
+ https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager
+
+
+Licensing
+---------
+
+This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
+
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
new file mode 100644
index 0000000..ab40620
--- /dev/null
+++ b/distro/changelog.xml
@@ -0,0 +1,172 @@
+
+
+ Added column position
+ Added downscale C-Square
+ Added JobClassifier
+ Updated expression to support Soundex, Levenshtein,
+ Similarity, MD5, Upper and Lower
+ Updated replace panel to support template
+ Updated Inline Filter to support soundex, text begin and text
+ end
+
+ Update operation for open from ribbon [issue #3154]
+ Updated Add Column now support expression
+ Updated Duplicate
+ Updated Monitor
+ Updated Commons Event
+ Updated Toolbox
+ Updated Ribbon
+ Updated GwtService
+
+
+ Updated to GWT 2.6.1
+ Updated to GXT 3.1.1
+ Added creation of Geospatial C-Square and Ocean Area
+ Added creation of Geometry Point
+ Added support to formats on Change Column Type [issue #3233]
+
+ Added Extract Codelist and automatically attach the codelist
+ extracted [issue #3235]
+
+ R-Studio support [issue #3236]
+ Support Tabular Resource on Multi Scope [issue #3237]
+ Strengthen tabular-data-widgetx [issue #3238]
+ Strengthen on Replace By Expression [issue #3239]
+ Added Chart
+ Added editing on multiline [issue #3219]
+ Fixed open tabular resources on different scope
+ Updated monitor
+ Updated Commons Event
+ Updated Toolbox
+ Updated Ribbon
+ Updated GwtService
+
+
+ Added Export JSON
+ Added multi tabular resources management
+ Added Main Box
+ Added flows support
+ Added template share
+ Added Resources management
+ Added Statistical Widget
+ Added Map creation
+ Added Resume UI state
+ Added Time Aggregation
+ Fixed Final and Lock errors
+ Fixed template diplay
+ Fixed JAXP jdk.xml.entityExpansionLimit error
+ Updated monitor
+ Updated Commons Event
+ Updated Toolbox
+ Updated Ribbon
+ Updated GwtService
+
+
+ Added validation from and validation until to
+ Added licences
+ Added union
+ Added replace by expression
+ Added background tasks
+ Fixed edit row
+ Fixed add row
+ Updated clone
+ Updated expression
+ Updated validation tasks
+ Updated extract codelist
+ Updated split column
+ Updated merge column
+ Updated monitor
+ Updated Commons Event
+ Updated Toolbox
+ Updated Ribbon
+ Updated GwtService
+
+
+ Added GroupBy
+ Added Column Mapping
+ Added context menu to Validations
+ Added Security Exception
+ Added Normalize
+ Added Denormalize
+ Added Share for groups
+ Updated Extract Codelist
+ Updated Codelist Mapping Import
+ Updated informations properties
+ Updated open tabular resource
+ Updated replace column
+ Updated grid, added error colored lines
+ Updated grid, now shows single view column
+ Updated Open Tabular Resource
+ Updated context menu of grid
+ Updated header column menu of grid
+ Updated TabularDataController
+ Updated Commons Event
+ Updated Toolbox
+ Updated Ribbon
+ Updated GwtService
+
+
+ Added Replace Bacth
+ Added History
+ Added Validations
+ Added Inline Filter
+ Added Extract Codelist
+ Added Codelist Mapping Import
+ Added Add Column
+ Added Merge Column
+ Added Split Column
+ Added Add Row
+ Added Edit Row
+ Updated Commons Event
+ Updated Toolbox
+ Updated CSV Export
+ Updated SDMX Export
+ Updated CSV Import
+ Updated SDMX Import
+ Updated Open Tabular Resource
+ Updated context menu of grid
+ Updated header column menu of grid
+ Updated TabularDataController
+ Updated Ribbon
+
+
+ Added Clone
+ Added Share
+ Added New, Delete and Apply Template
+ Added HelpPanel
+ Added LabelColumnPanel
+ Added ChangeTableTypePanel
+ Added DuplicatesRowsPanel
+ Added Filter column
+ Added Replace Value
+ Updated Commons Event
+ Updated Toolbox
+ Updated CSV Export
+ Updated SDMX Export
+ Updated CSV Import
+ Updated SDMX Import
+ Updated Open Tabular Resource
+ Updated context menu of grid
+ Updated header column menu of grid
+ Updated TabularDataController
+ Updated Ribbon
+
+
+ Added Timeline
+ Added Menù to grid
+ Added Common Event
+ Added Toolbox
+ Added tooltip information to grid
+ Added column delete operation
+ Added column change type operation
+ Added CSV Export
+ Added SDMX Export
+ Updated CSV Import
+ Updated SDMX Import
+ Updated information on tabular resources
+ Fixed rows display on grid
+
+
+ First Release
+
+
\ No newline at end of file
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
new file mode 100644
index 0000000..b32abff
--- /dev/null
+++ b/distro/svnpath.txt
@@ -0,0 +1 @@
+https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 55dc67f..5b75ec9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-manager
- 2.6.0-SNAPSHOT
+ 2.7.0-SNAPSHOT
war
@@ -41,8 +41,8 @@
${project.basedir}/distro
${project.build.directory}/${project.build.finalName}
- 2015-02-16
- https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Service
+ 2015-04-30
+ https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager
templates
distro
config
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
index fa8e860..384cd99 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/TabularDataRibbon.java
@@ -58,12 +58,12 @@ public class TabularDataRibbon {
con.add(modifyToolBar.getToolBar(), vldata);
ribbon.add(con, msgs.modify());
-
+ /*
ruleToolBar = new RuleToolBar(eventBus);
con = new VerticalLayoutContainer();
con.add(ruleToolBar.getToolBar(), vldata);
ribbon.add(con, msgs.rule());
-
+ */
templateToolBar = new TemplateToolBar(eventBus);
con = new VerticalLayoutContainer();
diff --git a/templates/changelog.xml b/templates/changelog.xml
index b569dbd..c36c86e 100644
--- a/templates/changelog.xml
+++ b/templates/changelog.xml
@@ -1,16 +1,37 @@
+
+ Added column position
+ Added downscale C-Square
+ Added JobClassifier
+ Updated expression to support Soundex, Levenshtein,
+ Similarity, MD5, Upper and Lower
+ Updated replace panel to support template
+ Updated Inline Filter to support soundex, text begin and text
+ end
+
+ Update operation for open from ribbon [issue #3154]
+ Updated Add Column now support expression
+ Updated Duplicate
+ Updated Monitor
+ Updated Commons Event
+ Updated Toolbox
+ Updated Ribbon
+ Updated GwtService
+
Updated to GWT 2.6.1
Updated to GXT 3.1.1
Added creation of Geospatial C-Square and Ocean Area
Added creation of Geometry Point
- Added support to formats on Change Column Type [issue #3233]
- Added Extract Codelist and automatically attach the codelist
- extracted [issue #3235]
- R-Studio support [issue #3236]
- Support Tabular Resource on Multi Scope [issue #3237]
- Strengthen tabular-data-widgetx [issue #3238]
- Strengthen on Replace By Expression [issue #3239]
+ Added support to formats on Change Column Type [issue #3233]
+
+ Added Extract Codelist and automatically attach the codelist
+ extracted [issue #3235]
+
+ R-Studio support [issue #3236]
+ Support Tabular Resource on Multi Scope [issue #3237]
+ Strengthen tabular-data-widgetx [issue #3238]
+ Strengthen on Replace By Expression [issue #3239]
Added Chart
Added editing on multiline [issue #3219]
Fixed open tabular resources on different scope