From ed63c3fb408c2628546c0d647a5c0558bcef4afe Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 8 Jul 2016 23:09:35 +0700
Subject: [PATCH] IDEMPIERE-3136:all stuff relate library of idempiere update
 restlet to 2.3 and replace p2 repository for maven repository

---
 .../feature.xml                                |  7 -------
 org.adempiere.sdk-feature/adempiere.cquery     |  1 -
 org.adempiere.sdk-feature/adempiere.rmap       | 14 ++++----------
 .../materialize.properties                     |  2 ++
 org.adempiere.ui.swing-feature/feature.xml     | 14 --------------
 org.adempiere.ui.swing/META-INF/MANIFEST.MF    | 18 ++----------------
 .../src/org/adempiere/client/Application.java  |  3 +--
 .../client/ClientSSLContextFactory.java        |  3 ++-
 8 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index 2ce363d71e..94ab1c1702 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -101,13 +101,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.restlet.ext.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.restlet.ext.servlet"
          download-size="0"
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index 019ddc2055..6e381a868b 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -9,7 +9,6 @@
     <cq:property key="target.ws" value="*"/>
 
     <cq:advisorNode namePattern="^org\.objectweb\.asm(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,6.0.0)"/>
-    <cq:advisorNode namePattern="^org\.restlet(\..+)?" componentType="osgi.bundle" versionOverride="[2.1.0,2.2.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" useTargetPlatform="false" useWorkspace="false" versionOverride="[4.2.2,4.3.0)"/>
     <cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" useTargetPlatform="false" useWorkspace="false" versionOverride="[1.0.0,1.0.0]"/>
     <cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" useTargetPlatform="false" useWorkspace="false" versionOverride="[0.0.0,9.3.0]"/>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index d065d8f567..6925d5530b 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -27,7 +27,7 @@
   <rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit"/>
-  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven"/>
+  <rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.p2"/>
   <rm:locator pattern="^zcommon$" searchPathRef="zkoss.osgi"/>
   <rm:locator pattern="^zel$" searchPathRef="zkoss.osgi"/>
   <rm:locator pattern="^zhtml$" searchPathRef="zkoss.osgi"/>
@@ -88,17 +88,11 @@
       <rm:uri format="${url.orbit}"/>
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="restlet.maven">
-    <rm:provider xsi:type="maven:MavenProvider" componentTypes="osgi.bundle" readerType="maven2" source="false" mutable="false">
+  <rm:searchPath name="restlet.p2">
+    <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="${url.maven.restlet}"/>
-      <maven:mappings>
-        <maven:entry artifactId="org.restlet" groupId="org.restlet.osgi" name="org.restlet"/>
-        <maven:entry artifactId="org.restlet.ext.net" groupId="org.restlet.osgi" name="org.restlet.ext.net"/>
-        <maven:entry artifactId="org.restlet.ext.servlet" groupId="org.restlet.osgi" name="org.restlet.ext.servlet"/>
-        <maven:entry artifactId="org.restlet.ext.ssl" groupId="org.restlet.osgi" name="org.restlet.ext.ssl"/>
-      </maven:mappings>
+      <rm:uri format="${url.restlet.p2}"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="bundles.maven">
diff --git a/org.adempiere.sdk-feature/materialize.properties b/org.adempiere.sdk-feature/materialize.properties
index 9deea9000d..07695a5190 100644
--- a/org.adempiere.sdk-feature/materialize.properties
+++ b/org.adempiere.sdk-feature/materialize.properties
@@ -23,3 +23,5 @@ url.jetty=http://download.eclipse.org/jetty/updates/jetty-bundles-9.x
 url.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository
 
 url.file.srv=http://downloads.sourceforge.net/project/idempiere/binary.file
+
+url.restlet.p2=http://p2.restlet.com/2.3
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index 6aee3ada64..19d4af5d65 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -33,20 +33,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.restlet.ext.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.restlet.ext.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.restlet.ext.servlet"
          download-size="0"
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index aef69966cb..cc955f6fad 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -71,9 +71,7 @@ Export-Package: com.jgoodies.looks,
 Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
  org.adempiere.ui;bundle-version="0.0.0",
  org.restlet;bundle-version="0.0.0",
- org.restlet.ext.net;bundle-version="0.0.0",
- org.restlet.ext.servlet;bundle-version="0.0.0",
- org.restlet.ext.ssl;bundle-version="0.0.0"
+ org.restlet.ext.servlet;bundle-version="0.0.0"
 Eclipse-ExtensibleAPI: true
 Eclipse-RegisterBuddy: org.adempiere.base
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -85,18 +83,6 @@ Import-Package: javax.net.ssl,
  org.compiere.css,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.equinox.app,
- org.osgi.framework;version="1.5.0",
- org.restlet,
- org.restlet.data,
- org.restlet.engine,
- org.restlet.engine.connector,
- org.restlet.engine.security,
- org.restlet.ext.net,
- org.restlet.ext.ssl,
- org.restlet.representation,
- org.restlet.resource,
- org.restlet.security,
- org.restlet.service,
- org.restlet.util
+ org.osgi.framework;version="1.5.0"
 Service-Component: OSGI-INF/*.xml
 Bundle-ActivationPolicy: lazy
diff --git a/org.adempiere.ui.swing/src/org/adempiere/client/Application.java b/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
index beaf8560cf..9cc3b5f1b0 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/client/Application.java
@@ -8,13 +8,12 @@ import javax.net.ssl.SSLSession;
 
 import org.compiere.Adempiere;
 import org.compiere.util.CLogger;
-
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.restlet.Client;
 import org.restlet.Context;
 import org.restlet.data.Protocol;
-import org.restlet.ext.net.HttpClientHelper;
+import org.restlet.engine.connector.HttpClientHelper;
 
 public class Application implements IApplication {
 	private static CLogger log = CLogger.getCLogger(Application.class);
diff --git a/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java b/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
index d804e382c4..078299a515 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
@@ -22,7 +22,8 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import org.restlet.ext.ssl.DefaultSslContextFactory;
+import org.restlet.engine.ssl.DefaultSslContextFactory;
+
 
 /**
  * Temporary workaround to support ssl connection to server with self signed certificate.