From 274dbf124a11243ce5a434a9d02a64fa01a177e4 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Tue, 7 May 2013 13:33:13 +0000
Subject: [PATCH] 2.14 fixes for TM Collections

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/rmp-common-library@74620 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    | 23 +++++++++++++++----
 .settings/com.google.gwt.eclipse.core.prefs   |  1 +
 .../server/gcube/ISClientRequester.java       | 10 ++++----
 .../queries/xquery/resources/Collection.xq    |  9 ++++----
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/.classpath b/.classpath
index 58ffa9f..5d07f51 100644
--- a/.classpath
+++ b/.classpath
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<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 kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<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"/>
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gwt.eclipse.core.prefs b/.settings/com.google.gwt.eclipse.core.prefs
index 9898e9b..134bd09 100644
--- a/.settings/com.google.gwt.eclipse.core.prefs
+++ b/.settings/com.google.gwt.eclipse.core.prefs
@@ -1,3 +1,4 @@
+#Tue Apr 23 12:12:43 CEST 2013
 eclipse.preferences.version=1
 entryPointModules=
 filesCopiedToWebInfLib=gwt-servlet.jar
diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/ISClientRequester.java b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/ISClientRequester.java
index 2fd15cf..f228710 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/ISClientRequester.java
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/ISClientRequester.java
@@ -641,17 +641,17 @@ public class ISClientRequester {
 					boolean foundRequest = false;
 					Document doc = ScopeManager.getDocumentGivenXML(entry);
 					String name = doc.getElementsByTagName("name").item(0).getFirstChild().getNodeValue();
-					_log.trace("[LOAD-PLUGIN] found: *** name " + name);
+					_log.trace("[LOAD-TMPLUGIN] found: *** name " + name);
 					String pluginType = doc.getElementsByTagName("Type").item(0).getFirstChild().getNodeValue();
-					_log.trace("[LOAD-PLUGIN] found: *** type " + pluginType);
+					_log.trace("[LOAD-TMPLUGIN] found: *** type " + pluginType);
 					String description = doc.getElementsByTagName("description").item(0).getFirstChild().getNodeValue();
-					_log.trace("[LOAD-PLUGIN] found: *** description " + description);
+					_log.trace("[LOAD-TMPLUGIN] found: *** description " + description);
 					String namespace = null;
 					try {
 						namespace =  doc.getElementsByTagName("namespace").item(0).getFirstChild().getNodeValue();
-						_log.trace("[LOAD-PLUGIN] found: *** namespace " + namespace);
+						_log.trace("[LOAD-TMPLUGIN] found: *** namespace " + namespace);
 					} catch (Exception e) {
-						_log.warn("[LOAD-PLUGIN] namespace not found");
+						_log.warn("[LOAD-TMPLUGIN] namespace not found");
 					}
 
 					NodeList params = doc.getElementsByTagName("param");
diff --git a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/Collection.xq b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/Collection.xq
index 2c9b328..d173bd4 100644
--- a/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/Collection.xq
+++ b/src/main/java/org/gcube/resourcemanagement/support/server/gcube/queries/xquery/resources/Collection.xq
@@ -4,10 +4,10 @@
         where $subtype = "TheSubType" and $wsresource/Data//child::*[local-name()='Type'][0]/string() eq 'gDocRead'
  -->
 
-for $profiles in collection('/db/Profiles/GenericResource')//Resource, $wsresource in collection('/db/Properties')//Document
+for $profiles in collection('/db/Profiles/GenericResource')//Resource,  $wsresource in collection('/db/Properties')//Document 
 let $scopes := string-join( $profiles/Scopes//Scope/text(), ';')
 let $subtype := $profiles//Resource/Profile/SecondaryType/text()
-where $subtype = "GCUBECollection" and $profiles//Resource/ID eq $wsresource/SourceKey and $wsresource/Data//child::*[local-name()='Type']/string() eq 'gDocRead'
+where $subtype = "DataSource" and $profiles//Resource/ID eq $wsresource/SourceKey and $wsresource/Data//child::*[local-name()='ServiceName']/string() eq 'tree-manager-service'
 <RES_SUBTYPE ISdefault =''/> 
     return 
     <Resource>
@@ -16,7 +16,8 @@ where $subtype = "GCUBECollection" and $profiles//Resource/ID eq $wsresource/Sou
         <SubType>{$subtype}</SubType>
         <Scopes>{$scopes}</Scopes>
         <Name>{$profiles//Resource/Profile/Name/text()}</Name>
-        <CreationTime>{$profiles//Resource/Profile/Body/CollectionInfo/creationTime/text()}</CreationTime>
+        <CreationTime>{$profiles//Resource/Profile/Body/SourceProperties/creationTime/text()}</CreationTime>
+        <UserCollection>{$profiles//Resource/Profile/Body/SourceProperties/user/text()}</UserCollection>
         <LastUpdateTime>{$wsresource/LastUpdateHuman/text()}</LastUpdateTime>
         <NumberOfMembers>{$wsresource//child::*[local-name()='Cardinality']/text()}</NumberOfMembers>
-    </Resource>
\ No newline at end of file
+    </Resource>    
\ No newline at end of file