From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 7 Jun 2016 18:31:03 +0000 (+0000)
Subject: Adapt to changes in Argeo TP.
X-Git-Tag: argeo-slc-2.1.7~48
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=01ed809bcc495a26cf11ff204a7722510231d39e;p=gpl%2Fargeo-slc.git

Adapt to changes in Argeo TP.

git-svn-id: https://svn.argeo.org/slc/trunk@8982 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
index 1830e4079..dda158a5e 100644
--- a/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
+++ b/org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
@@ -16,13 +16,13 @@ import org.apache.commons.io.IOUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.service.IServiceHandler;
+//import org.eclipse.rap.rwt.service.IServiceHandler;
 
 /**
  * Basic Default service handler that retrieves a file from a NT_FILE JCR node
  * and launch the download.
  */
-public class OpenJcrFileService implements IServiceHandler {
+public class OpenJcrFileService {//implements IServiceHandler {
 
 	/* DEPENDENCY INJECTION */
 	final private Node fileNode;
diff --git a/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
index 2bfc5588e..78cebc972 100644
--- a/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
+++ b/org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
@@ -29,8 +29,8 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.service.IServiceHandler;
-import org.eclipse.rap.rwt.service.IServiceManager;
+//import org.eclipse.rap.rwt.service.IServiceHandler;
+//import org.eclipse.rap.rwt.service.IServiceManager;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -75,8 +75,9 @@ public class OpenJcrFile extends AbstractHandler {
 			// yet.
 			currentServiceId = UUID.randomUUID().toString();
 			OpenJcrFileService ojfs = new OpenJcrFileService(result);
-			IServiceManager manager = RWT.getServiceManager();
-			manager.registerServiceHandler(currentServiceId, ojfs);
+			// FIXME replace it
+//			IServiceManager manager = RWT.getServiceManager();
+//			manager.registerServiceHandler(currentServiceId, ojfs);
 			String urlStr = createFullDownloadUrl(currentServiceId);
 			URL url = new URL(urlStr);
 			PlatformUI.getWorkbench().getBrowserSupport()
@@ -91,8 +92,8 @@ public class OpenJcrFile extends AbstractHandler {
 
 	@Override
 	public void dispose() {
-		IServiceManager manager = RWT.getServiceManager();
-		manager.unregisterServiceHandler(currentServiceId);
+//		IServiceManager manager = RWT.getServiceManager();
+//		manager.unregisterServiceHandler(currentServiceId);
 		super.dispose();
 	}
 
diff --git a/pom.xml b/pom.xml
index 55ce00ad6..2fa68a7d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.40</version>
+		<version>2.1.41-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -127,6 +127,7 @@ limitations under the License.
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 		</repository>
+		<!-- Disable Maven default repository -->
 		<repository>
 			<id>central</id>
 			<url>http://repo1.maven.org/maven2</url>