From 9daabe13bd92b06fb88bfb3b573c86ba5a994b49 Mon Sep 17 00:00:00 2001
From: "fabio.simeoni" <fabio.simeoni@mycompany.com>
Date: Mon, 7 Jan 2013 13:52:15 +0000
Subject: [PATCH] merged from trunk for release of 2.1.0 in gCube 2.12

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/common/common-gcore-clients/2.0@67130 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                          | 3 +++
 pom.xml                                                       | 2 +-
 .../org/gcube/common/clients/gcore/plugins/PluginAdapter.java | 4 +---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index bb1eadb..1496060 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -8,4 +8,7 @@
 	<Changeset component="${build.finalName}" date="2012-11-30">
 		<Change>Fixed W3CEndpointReference->EndpointReferenceType conversion util</Change>
 	</Changeset>
+	<Changeset component="${build.finalName}" date="11/01/2013">
+		<Change>Aligns with gCF 1.6.0+ and eliminates dependencies on legacy scope handling mechanisms</Change>
+	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d19c8d8..2d2da87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 	<groupId>org.gcube.core</groupId>
 	<artifactId>common-gcore-clients</artifactId>
 
-	<version>2.0.2-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<name>GCore Clients</name>
 
 	<description>A framework for client APIs that invoke GCore services</description>
diff --git a/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java b/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java
index ad8ddca..019266a 100644
--- a/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java
+++ b/src/main/java/org/gcube/common/clients/gcore/plugins/PluginAdapter.java
@@ -7,8 +7,6 @@ import org.apache.axis.message.addressing.EndpointReferenceType;
 import org.gcube.common.clients.config.ProxyConfig;
 import org.gcube.common.clients.delegates.ProxyDelegate;
 import org.gcube.common.core.contexts.GCUBERemotePortTypeContext;
-import org.gcube.common.core.scope.GCUBEScope;
-import org.gcube.common.scope.api.ScopeProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,7 +71,7 @@ public final class PluginAdapter<S,P> implements Plugin<S,P> {
 		//add scope
 		if (stub instanceof Remote) {
 			try {
-				remote = GCUBERemotePortTypeContext.getProxy((Remote) stub,GCUBEScope.getScope(ScopeProvider.instance.get()));
+				remote = GCUBERemotePortTypeContext.getProxy((Remote) stub);
 				
 			}
 			catch(Exception e) {