midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3136:all stuff relate library of idempiere 

update restlet to 2.3 and replace p2 repository for maven repository
This commit is contained in:
hieplq 2016-07-08 23:09:35 +07:00
parent b91df9f899
commit ed63c3fb40
8 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.bundles.external-feature/feature.xml
View File

@ -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"

1
org.adempiere.sdk-feature/adempiere.cquery
View File

@ -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]"/>

14
org.adempiere.sdk-feature/adempiere.rmap
View File

@ -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">

2
org.adempiere.sdk-feature/materialize.properties
View File

@ -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

14
org.adempiere.ui.swing-feature/feature.xml
View File

@ -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"

18
org.adempiere.ui.swing/META-INF/MANIFEST.MF
View File

@ -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

3
org.adempiere.ui.swing/src/org/adempiere/client/Application.java
View File

@ -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);

3
org.adempiere.ui.swing/src/org/adempiere/client/ClientSSLContextFactory.java
View File

@ -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.