changed distro dir to fit the new readme and license file

removed common-utils-encryprion dependency

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/branches/data-access/obis-spd-plugin/1.8@126089 82a268e6-3cf1-43bd-a215-b396298e98cf

.classpath

@@ -1,10 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+		<attributes>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+			<attribute name="optional" value="true"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+			<attribute name="maven.pomderived" value="true"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+		</attributes>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.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.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.6
+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

distro/INSTALL

@@ -1 +0,0 @@
-Used as a Plugin in the gCube Framework

distro/LICENSE

@@ -1,6 +1 @@
-gCube System - License
+${gcube.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.

distro/MAINTAINERS

@@ -1 +0,0 @@
-* Valentina Marioli (valentina.marioli@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".

distro/README

@@ -1,44 +1,65 @@
 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.
  
-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).
 
 
 Authors
--------
+--------------------------------------------------
  
 * Federico De Faveri (federico.defaveri@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it) Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
 
-Version and Release Date
+Maintainers
-------------------------
-${version}
-
-Description
 -----------
-${description}
 
-Description
+* Lucio Lelii (lucio.lelii-AT-isti.cnr.it) Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy). 
------------
-A plugin for the Ocean Bibliographic Information System.
 
  
+Download information
+--------------------------------------------------
+ 
 Source code is available from SVN: 
     ${scm.url}
  
-Binaries can be downloaded from:
+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.
-
-
-

distro/descriptor.xml

@@ -15,9 +15,8 @@
 			<includes>
 				<include>README</include>
 				<include>LICENSE</include>
-				<include>INSTALL</include>
-				<include>MAINTAINERS</include>
 				<include>changelog.xml</include>
+                                <include>profile.xml</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
@@ -25,18 +24,9 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>${distroDirectory}/profile.xml</source>
+			<source>target/${build.finalName}.${project.packaging}</source>
-			<outputDirectory>/</outputDirectory>
-			<filtered>true</filtered>
-		</file>
-		<file>
-			<source>target/${build.finalName}.jar</source>
 			<outputDirectory>/${artifactId}</outputDirectory>
 		</file>
-		<file>
+
-			<source>${distroDirectory}/svnpath.txt</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-			<filtered>true</filtered>
-		</file>
 	</files>
 </assembly>

distro/svnpath.txt

@@ -1 +0,0 @@
-https://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/data-access/obis-spd-plugin

pom.xml

@@ -23,7 +23,7 @@
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>gcf</artifactId>
-			<version>[1.6.0-SNAPSHOT,2.0.0)</version>
+			<version>[1.6.0-SNAPSHOT,1.6.3-SNAPSHOT]</version>
 		</dependency>
 
 		<dependency>
@@ -45,7 +45,7 @@
 		</dependency>
 	<dependency>
 			<groupId>org.gcube.core</groupId>
-			<artifactId>common-utils-encryption</artifactId>
+			 <artifactId>common-encryption</artifactId>
 			<version>[1.0.2-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
 		

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;