.hg_archival.txt

 repo: 1092b2dca366ed837f03d51f1a1b6002d52c4c12
-node: 4c6bba5f44e778f26f9bd45d0c3ce0167e921280
-branch: OrthancImageJ-1.1
+node: 985c7a53185a0c71d5738f912059d3419765a273
+branch: OrthancImageJ-1.2
 latesttag: null
-latesttagdistance: 10
+latesttagdistance: 17
+changessincelatesttag: 18

AUTHORS

 Orthanc - A Lightweight, RESTful DICOM Server
 =============================================
 
+
+Authors of Orthanc
+------------------
+
 * Sebastien Jodogne <s.jodogne@gmail.com>
-  Department of Medical Physics, CHU of Liege, Belgium
+
+  Overall design and lead developer.
+
+* Department of Medical Physics
+  University Hospital of Liege
+  4000 Liege
+  Belgium
+
+* Osimis S.A.
+  Rue du Bois Saint-Jean 15/1
+  4102 Seraing
+  Belgium
+  http://www.osimis.io/

NEWS

@@ -2,14 +2,20 @@ Pending changes in the mainline
 ===============================
 
 
-Version 1.1 (2016/04/15)
+Version 1.2 (2018-10-31)
+========================
+
+* Compatibility with OpenJDK 11 (fix Debian bug #912363)
+
+
+Version 1.1 (2016-04-15)
 ========================
 
 * Fix issue #9 ("Error while importing this image: null")
 * Fix issue #10 ("Cannot access an Orthanc running with a self-signed HTTPS certificate")
 
 
-Version 1.0.0 (2014/12/08)
+Version 1.0.0 (2014-12-08)
 ==========================
 
 * Initial release

README

@@ -27,16 +27,16 @@ publications. Similarly, we ask open-source and closed-source products
 that make use of Orthanc to warn us about this use. You can cite our
 work using the following BibTeX entry:
 
-@inproceedings{Jodogne:ISBI2013,
-  author = {Jodogne, S. and Bernard, C. and Devillers, M. and Lenaerts, E. and Coucke, P.},
-  title = {Orthanc -- {A} Lightweight, {REST}ful {DICOM} Server for Healthcare and Medical Research},
-  booktitle={Biomedical Imaging ({ISBI}), {IEEE} 10th International Symposium on}, 
-  year={2013}, 
-  pages={190-193}, 
-  ISSN={1945-7928},
-  month=apr,
-  url={http://ieeexplore.ieee.org/xpl/articleDetails.jsp?tp=&arnumber=6556444},
-  address={San Francisco, {CA}, {USA}}
+@Article{Jodogne2018,
+  author="Jodogne, S{\'e}bastien",
+  title="The {O}rthanc Ecosystem for Medical Imaging",
+  journal="Journal of Digital Imaging",
+  year="2018",
+  month="May",
+  day="03",
+  issn="1618-727X",
+  doi="10.1007/s10278-018-0082-y",
+  url="https://doi.org/10.1007/s10278-018-0082-y"
 }
 
 

com/orthancserver/DicomDecoder.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

com/orthancserver/GridLayout2.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

com/orthancserver/HttpsTrustModifier.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

com/orthancserver/Orthanc.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

com/orthancserver/OrthancConfigurationDialog.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

com/orthancserver/OrthancConnection.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -28,8 +29,8 @@ import java.io.InputStreamReader;
 import java.net.ConnectException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.Base64;
 import javax.imageio.ImageIO;
-import javax.xml.bind.DatatypeConverter;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 
@@ -40,6 +41,21 @@ public class OrthancConnection
   private String name_;
   private boolean insecure_;
 
+
+  public static String EncodeBase64(String content)
+  {
+    // https://stackoverflow.com/a/13109632/881731
+    return new String(Base64.getEncoder().encode(content.getBytes()));
+  }
+
+
+  public static String DecodeBase64(String content)
+  {
+    // https://stackoverflow.com/a/13109632/881731
+    return new String(Base64.getDecoder().decode(content.getBytes()));
+  }
+  
+	
 	OrthancConnection()
 	{
 		baseUrl_ = "http://localhost:8042/";
@@ -96,8 +112,7 @@ public class OrthancConnection
                                               String password)
   {
 		String auth = (new StringBuffer(username).append(":").append(password)).toString();
-		// http://stackoverflow.com/a/14413290/881731
-		return DatatypeConverter.printBase64Binary(auth.getBytes());
+    return EncodeBase64(auth);
   }
 
   

com/orthancserver/PreviewPanel.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as

com/orthancserver/SelectImageDialog.java

@@ -2,6 +2,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2018 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -25,6 +26,7 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -49,7 +51,6 @@ import java.awt.FlowLayout;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
-import javax.xml.bind.DatatypeConverter;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeWillExpandListener;
 import javax.swing.event.TreeSelectionEvent;
@@ -552,7 +553,9 @@ public class SelectImageDialog extends JDialog
     }
     else
     {
-      String decoded = new String(DatatypeConverter.parseBase64Binary(s));
+      // https://stackoverflow.com/a/13109632/881731
+      String decoded = OrthancConnection.DecodeBase64(s);
+      
       JSONArray config = (JSONArray) JSONValue.parse(decoded);
       if (config != null)
       {
@@ -575,6 +578,8 @@ public class SelectImageDialog extends JDialog
     }
 
     String config = servers.toJSONString();
-    return DatatypeConverter.printBase64Binary(config.getBytes());
+
+    // https://stackoverflow.com/a/13109632/881731
+    return new String(Base64.getEncoder().encode(config.getBytes()));
   }
 }

debian/changelog

+orthanc-imagej (1.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream version. (Closes: #912363)
+
+ -- Sebastien Jodogne <s.jodogne@gmail.com>  Wed, 31 Oct 2018 08:28:01 +0100
+
 orthanc-imagej (1.1+dfsg-3) unstable; urgency=medium
 
   * Team upload.

debian/control

@@ -7,11 +7,11 @@ Priority: optional
 Build-Depends: cmake,
                default-jdk,
                debhelper (>= 9),
-               imagej,
+               libij-java,
                libjson-simple-java
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/orthanc-imagej.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/orthanc-imagej.git
+Standards-Version: 4.2.1
+Vcs-Browser: https://salsa.debian.org/med-team/orthanc-imagej
+Vcs-Git: https://salsa.debian.org/med-team/orthanc-imagej.git
 Homepage: http://www.orthanc-server.com/static.php?page=imagej
 
 Package: orthanc-imagej

debian/patches/json-simple

@@ -2,10 +2,10 @@ Description: Patch to link against Debian's libjson-simple-java package
 Author: Sebastien Jodogne <s.jodogne@gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancImageJ-1.1/CMakeLists.txt
+Index: OrthancImageJ-1.2/CMakeLists.txt
 ===================================================================
---- OrthancImageJ-1.1.orig/CMakeLists.txt
-+++ OrthancImageJ-1.1/CMakeLists.txt
+--- OrthancImageJ-1.2.orig/CMakeLists.txt
++++ OrthancImageJ-1.2/CMakeLists.txt
 @@ -6,7 +6,7 @@ find_package(Java REQUIRED)
  include(UseJava)
  

debian/rules

@@ -14,6 +14,3 @@ override_dh_auto_install:
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k NEWS
-
-get-orig-source:
-	uscan --verbose --force-download --repack --compression xz