From 5f18191d19920fbb6a5e7c7e12f5581b797f76ab Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 11 Apr 2016 10:52:23 +0000 Subject: [PATCH] Fixing distro directory git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/accounting-analytics@126984 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/INSTALL | 1 - distro/LICENSE | 6 +-- distro/MAINTAINERS | 2 - distro/README | 85 +++++++++++++++++++++++++++++++------------ distro/changelog.xml | 11 +++++- distro/descriptor.xml | 13 +------ distro/profile.xml | 8 ++-- distro/svnpath.txt | 1 - pom.xml | 8 +++- 9 files changed, 83 insertions(+), 52 deletions(-) delete mode 100644 distro/INSTALL delete mode 100644 distro/MAINTAINERS delete mode 100644 distro/svnpath.txt diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index 049006c..0000000 --- a/distro/INSTALL +++ /dev/null @@ -1 +0,0 @@ -Used as library in the gCube Framework \ No newline at end of file diff --git a/distro/LICENSE b/distro/LICENSE index 07f22ed..cdf50bd 100644 --- a/distro/LICENSE +++ b/distro/LICENSE @@ -1,8 +1,4 @@ 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 2cdfd00..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1,2 +0,0 @@ -Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, -Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo". diff --git a/distro/README b/distro/README index 632a1bc..ed2b585 100644 --- a/distro/README +++ b/distro/README @@ -1,28 +1,65 @@ -The gCube System - Accounting Common Library ------------------------------------------------------------- - -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 -------- - -* Luca Frosini (luca.frosini@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo". - - -Version and Release Date ------------------------- - -v 1.0, 30/09/2015 - - -Description ------------ - +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 +-------------------------------------------------- + +* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). +Maintainers +----------- + +* Luca Frosini (luca.frosini-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). + + +Download information +-------------------------------------------------- + +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: + ${gcube.wikiRoot}/Accounting_Analytics + + +Documentation +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + ${gcube.wikiRoot}/Accounting_Analytics + + +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 1ec01ad..dbbfff1 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,5 +1,14 @@ - + + Reoganized API and added new API to get top values #2253 + + + Ready for ScopeProvider Removal #2194 + + + Internal Changes due to Accounting Lib generalization #1746 + + First Release \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml index 21d8c88..089683d 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -15,28 +15,17 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml + profile.xml 755 true - - ${distroDirectory}/profile.xml - / - true - target/${build.finalName}.jar /${artifactId} - - ${distroDirectory}/svnpath.txt - /${artifactId} - true - \ No newline at end of file diff --git a/distro/profile.xml b/distro/profile.xml index 70d3ede..014ca47 100644 --- a/distro/profile.xml +++ b/distro/profile.xml @@ -1,15 +1,14 @@ - + Service - Accounting - ${artifactId} ${description} + ${serviceClass} + ${artifactId} 1.0.0 - ${description} ${artifactId} ${version} @@ -17,7 +16,6 @@ ${artifactId} ${version} - library ${build.finalName}.jar diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index dcd0d22..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -${scm.url} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3bb0ee2..8cb009e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,13 @@ accounting-analytics 2.0.0-SNAPSHOT accounting-analytics - + + + UTF-8 + ${project.basedir}/distro + Accounting + + scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId} scm:https://svn.d4science.research-infrastructures.eu/gcube/trunk/accounting/${project.artifactId}