diff --git a/config/profile.xml b/config/profile.xml
deleted file mode 100644
index 190f3d3..0000000
--- a/config/profile.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Service
-
- tabular-data-manager manages tabular data
- PortletsUser
- tabular-data-manager
- 1.0.0
-
-
- tabular-data-manager manages tabular data
- tabular-data-manager
- 2.9.0-SNAPSHOT
-
- org.gcube.portlets.user
- tabular-data-manager
- 2.9.0-SNAPSHOT
-
- webapplication
-
- tabular-data-manager-2.9.0-SNAPSHOT.war
-
-
-
-
-
-
-
diff --git a/distro/INSTALL b/distro/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/distro/LICENSE b/distro/LICENSE
index cc51139..2d9616a 100644
--- a/distro/LICENSE
+++ b/distro/LICENSE
@@ -1,6 +1 @@
-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
+${gcube.license}
\ No newline at end of file
diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS
deleted file mode 100644
index 0bc9be3..0000000
--- a/distro/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-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
index 482b02f..739a430 100644
--- a/distro/README
+++ b/distro/README
@@ -1,50 +1,68 @@
-The gCube System - tabular-data-manager
-------------------------------------------------------------
-
-This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
-D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
-and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
+The gCube System - ${name}
+--------------------------------------------------
+
+${description}
+
+${gcube.description}
+
+${gcube.funding}
+
+
+Version
+--------------------------------------------------
+
+${version} (${buildDate})
+
+Please see the file named "changelog.xml" in this directory for the release notes.
+
+
Authors
--------
+--------------------------------------------------
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it),
+ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT
-
-Version and Release Date
-------------------------
-
-v. 2.9.0-SNAPSHOT (2015-10-15)
-
-
-Description
+
+Maintainers
-----------
+
+* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it),
+ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT
-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/
-
-
+--------------------------------------------------
+
+Source code is available from SVN:
+ ${scm.url}
+
+Binaries can be downloaded from the gCube website:
+ ${gcube.website}
+
+
+Installation
+--------------------------------------------------
+
+Installation documentation is available on-line in the gCube Wiki:
+ https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager
+
+
Documentation
--------------
-
-tabular-data-manager manages tabular data
-
-Documentation is available on-line from the Projects Documentation Wiki:
-http://wiki.gcube-system.org/gcube/Tabular_Data_Manager
-
-
+--------------------------------------------------
+
+Documentation is available on-line in the gCube Wiki:
+ https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager
+
+
+Support
+--------------------------------------------------
+
+Bugs and support requests can be reported in the gCube issue tracking tool:
+ ${gcube.issueTracking}
+
+
Licensing
----------
-
+--------------------------------------------------
+
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
-
-
diff --git a/templates/descriptor.xml b/distro/descriptor.xml
similarity index 63%
rename from templates/descriptor.xml
rename to distro/descriptor.xml
index 9e88168..a5af171 100644
--- a/templates/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,26 +15,18 @@
README
LICENSE
- INSTALL
- MAINTAINERS
changelog.xml
+ profile.xml
755
+ true
-
- /${artifactId}-${version}
+
+ /${artifactId}
-
-
- /
-
-
-
- /${artifactId}-${version}
-
-
+
\ No newline at end of file
diff --git a/templates/profile.xml b/distro/profile.xml
similarity index 100%
rename from templates/profile.xml
rename to distro/profile.xml
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index b32abff..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-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 b702fd4..b7ff665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,7 @@
- ${project.basedir}/distro
${project.build.directory}/${project.build.finalName}
- 2015-10-15
- http://wiki.gcube-system.org/gcube/Tabular_Data_Manager
- templates
distro
config
@@ -578,99 +574,26 @@
-
-
- maven-resources-plugin
- 2.6
-
-
- copy-profile
- process-resources
-
- copy-resources
-
-
- ${configDirectory}
-
-
- ${templatesDirectory}
-
- profile.xml
-
- true
-
-
-
-
-
- copy-distro-resources
- process-resources
-
- copy-resources
-
-
- ${distroDirectory}
-
-
- ${templatesDirectory}
-
- profile.xml
- descriptor.xml
-
- true
-
-
-
-
-
-
-
-
- maven-clean-plugin
- 2.5
-
-
-
- ${distroDirectory}
-
- **
-
- false
-
-
- ${configDirectory}
-
- **
-
- false
-
-
-
-
-
-
-
org.apache.maven.plugins
maven-assembly-plugin
2.2
- ${templatesDirectory}/descriptor.xml
+ ${distroDirectory}/descriptor.xml
- ${project.build.finalName}
servicearchive
- package
+ install
single
-
+
diff --git a/templates/INSTALL b/templates/INSTALL
deleted file mode 100644
index e69de29..0000000
diff --git a/templates/LICENSE b/templates/LICENSE
deleted file mode 100644
index cc51139..0000000
--- a/templates/LICENSE
+++ /dev/null
@@ -1,6 +0,0 @@
-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/templates/MAINTAINERS b/templates/MAINTAINERS
deleted file mode 100644
index 0bc9be3..0000000
--- a/templates/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
diff --git a/templates/README b/templates/README
deleted file mode 100644
index f770e7b..0000000
--- a/templates/README
+++ /dev/null
@@ -1,50 +0,0 @@
-The gCube System - ${name}
-------------------------------------------------------------
-
-This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
-D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
-and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
-
-Authors
--------
-
-Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa,
-Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
-
-
-Version and Release Date
-------------------------
-
-v. ${version} (${release.date})
-
-
-Description
------------
-
-${project.description}
-
-
-Download information
---------------------
-Source code is available from SVN:
- ${scm.url}
-
-Binaries can be downloaded from:
- http://software.d4science.research-infrastructures.eu/
-
-
-Documentation
--------------
-
-${project.description}
-
-Documentation is available on-line from the Projects Documentation Wiki:
-${wikiurl}
-
-
-Licensing
----------
-
-This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
-
-
diff --git a/templates/changelog.xml b/templates/changelog.xml
deleted file mode 100644
index f6906ee..0000000
--- a/templates/changelog.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-
-
- Added support to WorkspaceExplorer [issue #428]
- Updated i18N support
-
-
- Added Delete Validations
- Added expression on table [issue #81]
- Added ListView widget to show the resources [issue #209]
-
- Added Notifications [issue #197]
- Added support to Storage Id [issue #180]
- Added different colors for columns of different type [issue
- #251]
- Added to long text [issue #108]
- Updated Templates
- Updated Commons Event
- Updated Toolbox
- Updated Ribbon
- Updated GwtService
-
-
- Added column position
- Added downscale C-Square
- Added JobClassifier
- Added rules support
- 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/templates/svnpath.txt b/templates/svnpath.txt
deleted file mode 100644
index dcd0d22..0000000
--- a/templates/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-${scm.url}
\ No newline at end of file