diff --git a/config/profile.xml b/config/profile.xml
deleted file mode 100644
index 66ad4f3..0000000
--- a/config/profile.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- Service
-
- Widget that allows visualization of tabular data
- PortletsUser
- tabular-data-widgetx
- 1.8.0-SNAPSHOT
-
-
- Widget that allows visualization of tabular data
- tabular-data-widgetx
- 1.8.0-SNAPSHOT
-
- org.gcube.portlets.user
- tabular-data-widgetx
- 1.8.0-SNAPSHOT
-
- library
-
- tabular-data-widgetx-1.8.0-SNAPSHOT.jar
-
-
-
-
-
-
-
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 b75ca5b..739a430 100644
--- a/distro/README
+++ b/distro/README
@@ -1,48 +1,68 @@
-The gCube System - tabular-data-widgetx
-------------------------------------------------------------
-
-This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2)
+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. 1.8.0-SNAPSHOT (2015-07-03)
-
-
-Description
+
+Maintainers
-----------
+
+* Giancarlo Panichi (giancarlo.panichi-AT-isti.cnr.it),
+ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT
-Widget that allows visualization of tabular data
-
-
+
Download information
---------------------
-Source code is available from SVN:
- https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx
-
-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
--------------
-
-Widget that allows visualization of tabular data
-
-Documentation is available on-line from the Projects Documentation Wiki:
- https://gcube.wiki.gcube-system.org/gcube/index.php/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/distro/changelog.xml b/distro/changelog.xml
index 050c2c6..947e361 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,12 +1,12 @@
-
+ Added different colors for columns of different type [issue #251]
-
+ Updated Inline Filter to support soundex, text begin and text
end
-
+ Updated to GWT 2.6.1Updated to GXT 3.1.1Strengthened tabular-data-widgetx now support more rows [issue
@@ -14,21 +14,21 @@
Fixed SelectionModel to select rows on different pages
-
+ Updated for multi tab supportUpdated Geometry type support
-
+ Updated grid behavior
-
+ Added error colored linesUpdated grid, now shows single view column
-
+ Added Inline Filter
-
+ Added GridAndCellSelectionModelAdded getCellValue, checkOnlyColumn and getSelectedRowsId
functions on GridSelectionPanel
@@ -37,7 +37,7 @@
Updated ColumnConfigGeneratorUpdated key of rows on GridSelectionPanel
-
+ First Release
\ No newline at end of file
diff --git a/templates/descriptor.xml b/distro/descriptor.xml
similarity index 68%
rename from templates/descriptor.xml
rename to distro/descriptor.xml
index b978636..b468e51 100644
--- a/templates/descriptor.xml
+++ b/distro/descriptor.xml
@@ -15,25 +15,18 @@
READMELICENSE
- INSTALL
- MAINTAINERSchangelog.xml
+ profile.xml755
+ true
- ${distroDirectory}/svnpath.txt
- /${artifactId}
-
-
- ${configDirectory}/profile.xml
- /
-
-
- target/${build.finalName}.${packaging}
+ target/${build.finalName}.${project.packaging}/${artifactId}
+
\ No newline at end of file
diff --git a/templates/profile.xml b/distro/profile.xml
similarity index 97%
rename from templates/profile.xml
rename to distro/profile.xml
index 19ed5bc..62ae9a7 100644
--- a/templates/profile.xml
+++ b/distro/profile.xml
@@ -1,7 +1,7 @@
- Service
+ Library${project.description}PortletsUser
diff --git a/distro/svnpath.txt b/distro/svnpath.txt
deleted file mode 100644
index 3895051..0000000
--- a/distro/svnpath.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1771d1d..a564f96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,10 +16,7 @@
Widget that allows visualization of tabular data
- ${project.basedir}/distro
- 2015-07-03
- https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager
- templates
+ ${project.build.directory}/${project.build.finalName}distroconfig
@@ -27,8 +24,7 @@
3.3.23.1.1
- ${project.build.directory}/${project.build.finalName}
-
+
${env.KEYS}
@@ -173,92 +169,28 @@
org.gcube.portlets.user.tdwx.TabularDataWidgetX
-
- 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.pluginsmaven-assembly-plugin2.2
- ${templatesDirectory}/descriptor.xml
+ ${distroDirectory}/descriptor.xmlservicearchive
- package
+ installsingle
+
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 7e3ad55..0000000
--- a/templates/README
+++ /dev/null
@@ -1,48 +0,0 @@
-The gCube System - ${name}
-------------------------------------------------------------
-
-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. ${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 947e361..0000000
--- a/templates/changelog.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
- Added different colors for columns of different type [issue #251]
-
-
- Updated Inline Filter to support soundex, text begin and text
- end
-
-
- Updated to GWT 2.6.1
- Updated to GXT 3.1.1
- Strengthened tabular-data-widgetx now support more rows [issue
- #3238]
- Fixed SelectionModel to select rows on different pages
-
-
-
- Updated for multi tab support
- Updated Geometry type support
-
-
- Updated grid behavior
-
-
- Added error colored lines
- Updated grid, now shows single view column
-
-
- Added Inline Filter
-
-
- Added GridAndCellSelectionModel
- Added getCellValue, checkOnlyColumn and getSelectedRowsId
- functions on GridSelectionPanel
-
- Updated ColumnDefinition
- Updated ColumnConfigGenerator
- Updated key of rows on GridSelectionPanel
-
-
- 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