diff --git a/.classpath b/.classpath index 0f53f3e..e43402f 100644 --- a/.classpath +++ b/.classpath @@ -1,10 +1,36 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 5d06b25..ec4300d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,5 @@ -#Tue Feb 14 11:06:25 CET 2012 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/distro/INSTALL b/distro/INSTALL deleted file mode 100644 index 7e9ee1c..0000000 --- a/distro/INSTALL +++ /dev/null @@ -1 +0,0 @@ -Used as a Plugin in the gCube Framework \ No newline at end of file diff --git a/distro/LICENSE b/distro/LICENSE index 630ba97..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. +${gcube.license} \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS deleted file mode 100644 index 237e600..0000000 --- a/distro/MAINTAINERS +++ /dev/null @@ -1 +0,0 @@ -* Valentina Marioli (valentina.marioli@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo". \ No newline at end of file diff --git a/distro/README b/distro/README index 2d27b0d..e7fa133 100644 --- a/distro/README +++ b/distro/README @@ -1,44 +1,65 @@ -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). +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 -------- - +-------------------------------------------------- + * Federico De Faveri (federico.defaveri@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - -Version and Release Date ------------------------- -${version} +* Lucio Lelii (lucio.lelii-AT-isti.cnr.it) Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). -Description +Maintainers ----------- -${description} - -Description ------------ -A plugin for the Ocean Bibliographic Information System. - - -Source code is available from SVN: -${scm.url} - -Binaries can be downloaded from: +* Lucio Lelii (lucio.lelii-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}/Biodiversity_Access + Documentation -------------- -https://gcube.wiki.gcube-system.org/gcube/index.php - - +-------------------------------------------------- + +Documentation is available on-line in the gCube Wiki: + ${gcube.wikiRoot}/Biodiversity_Access + + +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. - - - +-------------------------------------------------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. \ No newline at end of file diff --git a/distro/descriptor.xml b/distro/descriptor.xml index 21d8c88..a5af171 100644 --- a/distro/descriptor.xml +++ b/distro/descriptor.xml @@ -15,9 +15,8 @@ README LICENSE - INSTALL - MAINTAINERS changelog.xml + profile.xml 755 true @@ -25,18 +24,9 @@ - ${distroDirectory}/profile.xml - / - true - - - target/${build.finalName}.jar + target/${build.finalName}.${project.packaging} /${artifactId} - - ${distroDirectory}/svnpath.txt - /${artifactId} - true - + \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt deleted file mode 100644 index e697b00..0000000 --- a/distro/svnpath.txt +++ /dev/null @@ -1 +0,0 @@ -https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/data-access/obis-spd-plugin \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3bbcadc..e8a0a78 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.gcube.core gcf - [1.6.0-SNAPSHOT,2.0.0) + [1.6.0-SNAPSHOT,1.6.3-SNAPSHOT] @@ -45,7 +45,7 @@ org.gcube.core - common-utils-encryption + common-encryption [1.0.2-SNAPSHOT,2.0.0-SNAPSHOT) diff --git a/src/main/java/org/gcube/data/spd/obisplugin/ObisPlugin.java b/src/main/java/org/gcube/data/spd/obisplugin/ObisPlugin.java index 01537a8..cf82e09 100644 --- a/src/main/java/org/gcube/data/spd/obisplugin/ObisPlugin.java +++ b/src/main/java/org/gcube/data/spd/obisplugin/ObisPlugin.java @@ -8,7 +8,7 @@ import java.util.Set; import org.gcube.common.core.utils.logging.GCUBELog; import org.gcube.common.resources.gcore.ServiceEndpoint; import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; -import org.gcube.common.utils.encryption.StringEncrypter; +import org.gcube.common.encryption.StringEncrypter; import org.gcube.data.spd.model.Conditions; import org.gcube.data.spd.model.Condition; import org.gcube.data.spd.model.RepositoryInfo;