From ec90991661f8ff4ed73ae7633db8eeb41d97a3c4 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Mon, 13 Jun 2016 09:02:53 +0000
Subject: [PATCH] Moved back to an old user-management version

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/widgets/ckan-metadata-publisher-widget@129071 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  1 -
 .settings/org.eclipse.wst.common.component    |  3 ---
 pom.xml                                       | 19 +++++++++----------
 .../client/CKanMetadataPublisher.java         |  3 ++-
 .../server/CKANPublisherServicesImpl.java     |  6 +++---
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index b43235b..7602c34 100644
--- a/.classpath
+++ b/.classpath
@@ -20,7 +20,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/costantino/Downloads/gwt-2.7.0/gwt-user.jar">
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5dbcbf7..0190c48 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,9 +5,6 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="ckan-util-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library/ckan-util-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <property name="context-root" value="ckan-metadata-publisher-widget"/>
         <property name="java-output-path" value="/ckan-metadata-publisher-widget/target/ckan-metadata-publisher-widget-1.0.0-SNAPSHOT/WEB-INF/classes"/>
     </wb-module>
diff --git a/pom.xml b/pom.xml
index 3b0fe63..e2c324a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.gcube.portlets.widgets</groupId>
 	<artifactId>ckan-metadata-publisher-widget</artifactId>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>gCube Ckan metadata publisher widget</name>
 
@@ -60,6 +60,7 @@
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
 			<version>2.9.1</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
@@ -84,19 +85,15 @@
 			<artifactId>gwt-bootstrap</artifactId>
 			<version>2.3.2.0</version>
 		</dependency>
-		<!-- CKAN client library -->
-		<dependency>
-			<groupId>eu.trentorise.opendata</groupId>
-			<artifactId>jackan</artifactId>
-			<version>0.4.2</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
@@ -148,18 +145,19 @@
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
 			<artifactId>usermanagement-core</artifactId>
-			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.data-catalogue</groupId>
 			<artifactId>ckan-util-library</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-scope-maps</artifactId>
-			<scope>compile</scope>
+			<scope>provided</scope>
 			<!-- put at provided for deploying -->
 		</dependency>
 		<dependency>
@@ -170,12 +168,13 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
-			<scope>provided</scope>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.htmlparser.jericho</groupId>
 			<artifactId>jericho-html</artifactId>
 			<version>3.3</version>
+			<scope>compile</scope>
 		</dependency>
 	</dependencies>
 
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java
index 2af2234..5bfbc0f 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanMetadataPublisher.java
@@ -16,10 +16,11 @@ public class CKanMetadataPublisher implements EntryPoint {
 	public void onModuleLoad() {
 
 		// remove comment to the below line for testing the widget
-		startExample();
+		//startExample();
 
 	}
 
+	@SuppressWarnings("unused")
 	private void startExample() {
 		
 		String idFolderWorkspace = "d3a37eb9-1589-4c95-a9d0-c473a02d4f0f";
diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
index 5413380..7737548 100644
--- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
+++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java
@@ -36,8 +36,8 @@ import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.MetaDataTypeWra
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.MetadataFieldWrapper;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.ResourceBean;
 import org.gcube.vomanagement.usermanagement.UserManager;
-import org.gcube.vomanagement.usermanagement.impl.LiferayUserManager;
-import org.gcube.vomanagement.usermanagement.model.GCubeUser;
+import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager;
+import org.gcube.vomanagement.usermanagement.model.UserModel;
 import org.slf4j.LoggerFactory;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -264,7 +264,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C
 						+ " whose owner is " + owner);
 				// get usermanager (liferay)
 				UserManager liferUserManager = new LiferayUserManager();
-				GCubeUser userOwner = liferUserManager.getUserByUsername(owner);
+				UserModel userOwner = liferUserManager.getUserByScreenName(owner);
 
 				// build bean
 				logger.debug("Building bean");