Export auditlogging package & fix server address prefix check

refs #7684

Change-Id: I8d6cb285256d9fa909cae7c458b04be4290db54a

diff --git a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
index 61adfd1f827094419bb324c4a65429db2417e418..9ab486594e8207706e029d299b900bd5f472fcfb 100644 (file)
--- a/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.auditlogging/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.glassfish.jersey.core.jersey-common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
  org.glassfish.jersey.core.jersey-common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

+Export-Package: org.simantics.audit.server

diff --git a/bundles/org.simantics.auditlogging/src/org/simantics/audit/client/AuditLoggingAPIClient.java b/bundles/org.simantics.auditlogging/src/org/simantics/audit/client/AuditLoggingAPIClient.java
index 645a6065749911ff9bcbf222e9246e1b6430eb79..6f0ca1fd37ec89404d0912f7a78eabfef53a3270 100644 (file)
--- a/bundles/org.simantics.auditlogging/src/org/simantics/audit/client/AuditLoggingAPIClient.java
+++ b/bundles/org.simantics.auditlogging/src/org/simantics/audit/client/AuditLoggingAPIClient.java
@@ -34,7 +34,7 @@ public class AuditLoggingAPIClient {
         ClientConfig configuration = new ClientConfig();
         configuration.register(JacksonFeature.class);
         httpClient = ClientBuilder.newClient(configuration);
         ClientConfig configuration = new ClientConfig();
         configuration.register(JacksonFeature.class);
         httpClient = ClientBuilder.newClient(configuration);

-        if (!serverAddress.startsWith("http://")) {
+        if (!serverAddress.startsWith("http://") && !serverAddress.startsWith("https://")) {

             serverAddress = "http://" + serverAddress;
         }
         base = httpClient.target(serverAddress);
             serverAddress = "http://" + serverAddress;
         }
         base = httpClient.target(serverAddress);