Adapt to changes in Argeo TP.
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 7 Jun 2016 18:31:03 +0000 (18:31 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 7 Jun 2016 18:31:03 +0000 (18:31 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@8982 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

org.argeo.slc.client.rap/src/org/argeo/slc/client/rap/OpenJcrFileService.java
org.argeo.slc.client.rap/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java
pom.xml

index 1830e4079946afd0b5b22a4c3fc1c744b3e13e6f..dda158a5e76ac77d3cef321d0ec32251a725f8d4 100644 (file)
@@ -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;
index 2bfc5588e26b82a2a04b265001cfbbc01634a364..78cebc972fdc4c21722ed2049ebe8e821a5e5b73 100644 (file)
@@ -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 55ce00ad661654d5e00892ef885521cdf73d2ec2..2fa68a7d598c02fe34ea305c91af0fb0d57e7b8c 100644 (file)
--- 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>