bugfix release

JMMC-OpenDev · Jan 9, 2024 · 2df8d7e · 2df8d7e
1 parent 8fc4ce4
commit 2df8d7e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/main/java/fr/jmmc/oimaging/services/RemoteExecutionMode.java b/src/main/java/fr/jmmc/oimaging/services/RemoteExecutionMode.java
@@ -32,7 +32,7 @@ public final class RemoteExecutionMode implements OImagingExecutionMode {
 
     // Use -DRemoteExecutionMode.local=true (dev) to use local uws server (docker)
     private static boolean USE_LOCAL = Boolean.getBoolean("RemoteExecutionMode.local");
-
+    
     // Use -DRemoteExecution.beta=true (dev) to use remote beta uws server (docker)
     private static boolean USE_BETA = Boolean.getBoolean("RemoteExecution.beta")
             || ApplicationDescription.isBetaVersion();
@@ -51,7 +51,7 @@ public final class RemoteExecutionMode implements OImagingExecutionMode {
     private static String SERVER_URL = getServerUrl(USE_LOCAL, USE_BETA);
 
     private static String getServerUrl(final boolean local, final boolean beta) {
-        return ((local) ? "http://127.0.0.1:8080/OImaging-uws/"
+        return ((local) ? "http://127.0.0.1:8080/jmmc-uws/"
                 : ((beta) ? "http://oimaging-beta.jmmc.fr/OImaging-uws/"
                         : "http://oimaging.jmmc.fr/OImaging-uws/"));
     }
@@ -337,4 +337,18 @@ private static Throwable getRootCause(final Throwable th) {
         }
         return parent;
     }
+
+    public static void main(String[] args) {            
+        String filename="/home/mellag/test.txt";
+        ServiceResult result =  new ServiceResult(new File(filename));
+
+        try {
+            INSTANCE.callUwsOimagingService("ls", "/etc", filename, result);            
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        System.out.println("res = " + result.getOifitsResultFile());
+        System.out.println("log = " + result.getExecutionLog());
+
+    }
 }
diff --git a/src/main/resources/fr/jmmc/oimaging/resource/ApplicationData.xml b/src/main/resources/fr/jmmc/oimaging/resource/ApplicationData.xml
@@ -15,8 +15,8 @@
         <feedback_form_url>http://jmmc.fr/feedback/feedback.php</feedback_form_url>
     </company>
 
-    <program name="OImaging" version="1.0.4"/>
-    <compilation date="14/06/2023" compiler="JDK 1.8.0"/>
+    <program name="OImaging" version="1.0.5 beta 1"/>
+    <compilation date="09/01/2024" compiler="JDK 1.8.0"/>
 
     <text>OImaging send your interferometric observation reduced data as OIFits files to standardized Image Reconstruction software.</text>
 
@@ -179,6 +179,11 @@
     </menubar>
 
     <releasenotes>
+        <release version="1.0.5">
+            <prerelease version="1.0.5 beta 1">
+                <change type="BUGFIX" url="http://trac.jmmc.fr/jmmc-sw/ticket/1336">Avoid setting compression for PNG encoder (not supported on java 8)</change>
+            </prerelease>            
+        </release>
         <release version="1.0.4">
             <pubDate>Wed, 14 June 2023 16:00:00 GMT</pubDate>
             <prerelease version="1.0.4 beta 1">