diff --git a/.classpath b/.classpath
index 0b14b16..50bae49 100644
--- a/.classpath
+++ b/.classpath
@@ -14,12 +14,12 @@
-
+
diff --git a/.settings/com.google.appengine.eclipse.core.prefs b/.settings/com.google.appengine.eclipse.core.prefs
index a60576c..5260f5f 100644
--- a/.settings/com.google.appengine.eclipse.core.prefs
+++ b/.settings/com.google.appengine.eclipse.core.prefs
@@ -1,3 +1,4 @@
-#Thu Jun 16 10:18:26 CEST 2011
eclipse.preferences.version=1
filesCopiedToWebInfLib=
+googleCloudSqlEnabled=false
+localDevMySqlEnabled=true
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 9f2b8a3..16b3d99 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/backup-old-home/francesco-mangiacrapa/workspace/speciesdiscovery/target/species-discovery-3.0.0-SNAPSHOT
+lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/speciesdiscovery(trunk)/target/species-discovery-3.0.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index da58eab..90bd875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,12 +52,12 @@
provided
-
- org.gcube.core
- common-fw-clients
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- runtime
-
+
+
+
+
+
+
org.gcube.data.spd
@@ -76,7 +76,8 @@
org.gcube.data.spd
spd-model
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+ 1.0.0-SNAPSHOT
+
provided
@@ -91,21 +92,36 @@
org.eclipse.persistence
eclipselink
- 2.4.0
+ 2.4.1
+
+
+
+ org.eclipse.persistence
+ javax.persistence
+ 2.0.4.v201112161009
org.gcube.contentmanagement
storage-manager-wrapper
- [1.0.1-SNAPSHOT, 1.1.0-SNAPSHOT)
+
+ [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
provided
org.gcube.contentmanagement
storage-manager-core
- [1.0.1-SNAPSHOT, 1.11.0-SNAPSHOT)
+
+ [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
+ provided
+
+
+
+ org.gcube.contentmanagement
+ storage-resource-link-plugin
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
@@ -150,7 +166,7 @@
com.h2database
h2
- 1.3.166
+ 1.3.170
@@ -212,12 +228,7 @@
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
-
- org.gcube.contentmanagement
- storage-resource-link-plugin
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
- provided
-
+
org.gcube.portlets.user
home-library
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/util/StorageUtil.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/util/StorageUtil.java
index 04d09c2..079c2e9 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/util/StorageUtil.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/util/StorageUtil.java
@@ -1,82 +1,97 @@
package org.gcube.portlets.user.speciesdiscovery.server.util;
+//import java.io.File;
import java.io.InputStream;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
-import org.gcube.common.core.scope.GCUBEScope;
+//import org.gcube.common.core.scope.GCUBEScope;
import org.gcube.common.core.utils.logging.GCUBELog;
-import org.gcube.contentmanagement.blobstorage.service.IClient;
-import org.gcube.contentmanager.storageclient.model.protocol.smp.StringEncrypter;
-import org.gcube.contentmanager.storageclient.wrapper.AccessType;
-import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
+//import org.gcube.contentmanagement.blobstorage.service.IClient;
+import org.gcube.contentmanager.storageclient.model.protocol.smp.Handler;
+//import org.gcube.contentmanager.storageclient.model.protocol.smp.StringEncrypter;
+//import org.gcube.contentmanager.storageclient.wrapper.AccessType;
+//import org.gcube.contentmanager.storageclient.wrapper.StorageClient;
public class StorageUtil {
protected static GCUBELog logger = new GCUBELog(StorageUtil.class);
public static InputStream getInputStreamByStorageClient(String url) throws Exception {
- logger.trace("url :" + url);
-
- String [] urlParam=url.split("\\?");
-// String param=urlParam[1];
- logger.info("String encrypted "+urlParam[1]);
- String param=new StringEncrypter("DES").decrypt(urlParam[1]);
- logger.info("String decrypted: "+param);
- String [] getParam=param.split("\\&");
- String serviceClass=null;
- String serviceName=null;
- String owner=null;
- String accessType=null;
- String scopeType=null;
- AccessType type = null;
- String server= null;
- String [] par1;
- for(String par : getParam){
- if(par.contains("ServiceClass")){
- par1=par.split("=");
- serviceClass=par1[1];
- }else if(par.contains("ServiceName")){
- par1=par.split("=");
- serviceName=par1[1];
- }else if(par.contains("owner")){
- par1=par.split("=");
- owner=par1[1];
- }else if(par.contains("scope")){
- par1=par.split("=");
- scopeType=par1[1];
- }else if(par.contains("server")){
- par1=par.split("=");
- server=par1[1];
- }else if(par.contains("AccessType")){
- par1=par.split("=");
- accessType=par1[1];
- if(accessType.equalsIgnoreCase("public")){
- type=AccessType.PUBLIC;
- }else if(accessType.equalsIgnoreCase("shared")){
- type=AccessType.SHARED;
- }
- }else{
- ;
- }
- }
- if((serviceName==null) || (serviceClass==null) || (owner == null) || (scopeType==null) || (type == null))
- throw new MalformedURLException();
- GCUBEScope scope=GCUBEScope.getScope(scopeType);
- String location=extractLocation(urlParam[0]);
-
- logger.trace("Storage instance with parameters "+serviceClass+" "+serviceName+" "+owner+" "+type+" "+scope+ " location: "+urlParam[0]);
- IClient client=new StorageClient(serviceClass, serviceName, owner, type, scope, server).getClient();
- InputStream is=null;
- is=client.get().RFileAStream(location);
-
+// logger.trace("url :" + url);
+//
+// String [] urlParam=url.split("\\?");
+//// String param=urlParam[1];
+// logger.info("String encrypted "+urlParam[1]);
+// String param=new StringEncrypter("DES").decrypt(urlParam[1]);
+// logger.info("String decrypted: "+param);
+// String [] getParam=param.split("\\&");
+// String serviceClass=null;
+// String serviceName=null;
+// String owner=null;
+// String accessType=null;
+// String scopeType=null;
+// AccessType type = null;
+// String server= null;
+// String [] par1;
+// for(String par : getParam){
+// if(par.contains("ServiceClass")){
+// par1=par.split("=");
+// serviceClass=par1[1];
+// }else if(par.contains("ServiceName")){
+// par1=par.split("=");
+// serviceName=par1[1];
+// }else if(par.contains("owner")){
+// par1=par.split("=");
+// owner=par1[1];
+// }else if(par.contains("scope")){
+// par1=par.split("=");
+// scopeType=par1[1];
+// }else if(par.contains("server")){
+// par1=par.split("=");
+// server=par1[1];
+// }else if(par.contains("AccessType")){
+// par1=par.split("=");
+// accessType=par1[1];
+// if(accessType.equalsIgnoreCase("public")){
+// type=AccessType.PUBLIC;
+// }else if(accessType.equalsIgnoreCase("shared")){
+// type=AccessType.SHARED;
+// }
+// }else{
+// ;
+// }
+// }
+// if((serviceName==null) || (serviceClass==null) || (owner == null) || (scopeType==null) || (type == null))
+// throw new MalformedURLException();
+// GCUBEScope scope=GCUBEScope.getScope(scopeType);
+// String location=extractLocation(urlParam[0]);
+//
+// logger.trace("Storage instance with parameters "+serviceClass+" "+serviceName+" "+owner+" "+type+" "+scope+ " location: "+urlParam[0]);
+// IClient client=new StorageClient(serviceClass, serviceName, owner, type, scope, server).getClient();
+// InputStream is=null;
+// is=client.get().RFileAStream(location);
// createFileTest(is);
+
+
+ Handler.activateProtocol();
+ URL smsHome = null;
+ try {
+ smsHome = new URL(url);
+ } catch (MalformedURLException e1) {
+ e1.printStackTrace();
+ }
+ URLConnection uc = null;
+ uc = ( URLConnection ) smsHome.openConnection ( );
+ InputStream is=uc.getInputStream();
return is;
}
- public static String extractLocation(String url) {
- String [] loc=url.split("//");
- logger.trace("url extracted: "+loc[1]);
- return loc[1];
- }
+// public static String extractLocation(String url) {
+// String [] loc=url.split("//");
+// logger.trace("url extracted: "+loc[1]);
+// return loc[1];
+// }
}