diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 2440fe24df..3be27a101e 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -83,7 +83,7 @@
id="org.restlet"
download-size="0"
install-size="0"
- version="2.0.15.0"
+ version="0.0.0"
unpack="false"/>
-
+
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 2e641ef2f2..2564536198 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -72,9 +72,10 @@
-
-
-
+
+
+
+
diff --git a/org.adempiere.server/src/main/servlet/org/adempiere/web/server/BasicVerifier.java b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/BasicVerifier.java
index 9be478bd57..b02627e4f8 100644
--- a/org.adempiere.server/src/main/servlet/org/adempiere/web/server/BasicVerifier.java
+++ b/org.adempiere.server/src/main/servlet/org/adempiere/web/server/BasicVerifier.java
@@ -35,7 +35,7 @@ public class BasicVerifier extends SecretVerifier {
* @see org.restlet.security.SecretVerifier#verify(java.lang.String, char[])
*/
@Override
- public boolean verify(String identity, char[] password)
+ public int verify(String identity, char[] password)
throws IllegalArgumentException {
//authenticate with session token
if (identity.startsWith("AD_Session_ID#"))
@@ -49,35 +49,35 @@ public class BasicVerifier extends SecretVerifier {
catch (Exception e)
{
log.log(Level.WARNING, "Invalid session token: " + identity);
- return false;
+ return RESULT_INVALID;
}
MSession session = new MSession(Env.getCtx(), AD_Session_ID, null);
if (session.getAD_Session_ID() != AD_Session_ID)
{
log.log(Level.WARNING, "Session not exists in database: " + identity);
- return false;
+ return RESULT_INVALID;
}
if (session.isProcessed())
{
log.log(Level.WARNING, "Session have logout: " + identity);
- return false;
+ return RESULT_INVALID;
}
if (!session.isActive())
{
log.log(Level.WARNING, "Session isActive=false: " + identity);
- return false;
+ return RESULT_INVALID;
}
if (!session.getWebSession().equals(new String(password)))
{
log.log(Level.WARNING, "Session token doesn't match. identity=" + identity + ", token="+new String(password));
}
- return true;
+ return RESULT_VALID;
}
//authenticate with userid+password
Login login = new Login(new Properties());
KeyNamePair[] roles = login.getRoles(identity, new String(password));
- return (roles != null && roles.length > 0);
+ return (roles != null && roles.length > 0) ? RESULT_VALID : RESULT_INVALID;
}
}
diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml
index ed4c9cb3e8..f0955239e6 100644
--- a/org.adempiere.ui.swing-feature/feature.xml
+++ b/org.adempiere.ui.swing-feature/feature.xml
@@ -39,5 +39,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index 0e318566ec..9aad2ba838 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 65bff0cf8a..aad0c8369d 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -81,6 +81,7 @@ Import-Package: javax.net.ssl,
org.restlet.engine,
org.restlet.engine.security,
org.restlet.ext.net,
+ org.restlet.ext.ssl,
org.restlet.representation,
org.restlet.resource,
org.restlet.security,
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 6fbdf2de1d..d804e382c4 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,7 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
-import org.restlet.engine.security.DefaultSslContextFactory;
+import org.restlet.ext.ssl.DefaultSslContextFactory;
/**
* Temporary workaround to support ssl connection to server with self signed certificate.