Updated Geochron api (#196)

* Updated geochron api to use https * New version
CIRDLES · Feb 24, 2021 · 4632f64 · 4632f64
1 parent a205418
commit 4632f64
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>org.cirdles</groupId>
     <artifactId>ET_Redux</artifactId>
     <name>ET_Redux</name>
-    <version>3.6.91</version>
+    <version>3.6.92</version>
     <description>Successor to U-Pb_Redux</description>
     <url>https://cirdles.org</url>
     <inceptionYear>2006</inceptionYear>
@@ -213,7 +213,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
-            <version>4.5.4</version>
+            <version>4.5.13</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

diff --git a/src/main/java/org/earthtime/ETReduxFrame.java b/src/main/java/org/earthtime/ETReduxFrame.java
@@ -3803,7 +3803,7 @@ private void reportResultsTableAsPDF_menuItemActionPerformed(java.awt.event.Acti
 }//GEN-LAST:event_reportResultsTableAsPDF_menuItemActionPerformed
 
 private void visitGeochronActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_visitGeochronActionPerformed
-    BrowserControl.displayURL("http://www.geochron.org/");
+    BrowserControl.displayURL("https://www.geochron.org/");
 }//GEN-LAST:event_visitGeochronActionPerformed
 
 private void newSampleCompilation_menuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newSampleCompilation_menuItemActionPerformed

diff --git a/src/main/java/org/earthtime/UPb_Redux/dialogs/aliquotManagers/AliquotEditorDialog.java b/src/main/java/org/earthtime/UPb_Redux/dialogs/aliquotManagers/AliquotEditorDialog.java
@@ -904,7 +904,7 @@ public void viewXMLAliquotAsHTML(String tempAliquotXML) {
 
         // read in the remote transform and save locally
         String tempXSLTcontents = URIHelper.getTextFromURI(
-                "http://www.geochron.org/upbgeochron.xslt");
+                "https://www.geochron.org/upbgeochron.xslt");
 
         // write this to a file
         String tempXSLT = "TempTransformer.xslt";
@@ -948,7 +948,7 @@ public void viewXMLAliquotAsHTML(String tempAliquotXML) {
 
         content
                 = //
-                "<html><head>" + "<link rel=\"stylesheet\" type = \"text/css\" href = \"http://www.geochron.org/geo.css\"/>" + "</head>" //
+                "<html><head>" + "<link rel=\"stylesheet\" type = \"text/css\" href = \"https://www.geochron.org/geo.css\"/>" + "</head>" //
                 + content//
                 + "</html>";
 
@@ -1823,7 +1823,7 @@ private void validateGeoPassID_buttonActionPerformed(java.awt.event.ActionEvent
 }//GEN-LAST:event_validateGeoPassID_buttonActionPerformed
 
     private void visitGeochron_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_visitGeochron_buttonActionPerformed
-        BrowserControl.displayURL("http://www.geochron.org/");
+        BrowserControl.displayURL("https://www.geochron.org/");
 }//GEN-LAST:event_visitGeochron_buttonActionPerformed
 
     private void saveAndUploadAliquotToGeochron_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_saveAndUploadAliquotToGeochron_buttonActionPerformed
@@ -4650,7 +4650,7 @@ private void validateGeoPassID(boolean isVerbose) {
 
     /**
      *
-     * http://www.geochron.org/post_to_redux_service.html
+     * https://www.geochron.org/post_to_redux_service.html
      */
     public void uploadAliquotToGeochronZip() throws ETException {
 
@@ -5094,7 +5094,7 @@ private GeochronValidationResults confirmAliquotArchivedInGeochron(AliquotInterf
         String password = ((ETReduxFrame) parent).getMyState().getReduxPreferences().getGeochronPassWord();
 
         String connectionString
-                = "http://www.geochron.org/getxml.php?sampleigsn="//
+                = "https://www.geochron.org/getxml.php?sampleigsn="//
                 + aliquot.getSampleIGSN() //
                 + "&aliquotname=" //
                 + aliquot.getAliquotName()//
@@ -5124,7 +5124,7 @@ public void testUploadedAliquotRetrieval() {
 
         String downloadURL
                 = //
-                "http://www.geochron.org/getxml.php?sampleigsn="//
+                "https://www.geochron.org/getxml.php?sampleigsn="//
                 + getMyAliquot().getSampleIGSN() //
                 + "&aliquotname=" //
                 + getMyAliquot().getAliquotName()//

diff --git a/.../UPb_Redux/dialogs/sampleManagers/compilationManagers/SampleCompilationManagerDialog.java b/.../UPb_Redux/dialogs/sampleManagers/compilationManagers/SampleCompilationManagerDialog.java
@@ -628,7 +628,7 @@ private void validateGeochronCredentials_buttonActionPerformed (java.awt.event.A
 }//GEN-LAST:event_validateGeochronCredentials_buttonActionPerformed
 
     private void visitGeochron_buttonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_visitGeochron_buttonActionPerformed
-        BrowserControl.displayURL("http://www.geochron.org/");
+        BrowserControl.displayURL("https://www.geochron.org/");
 }//GEN-LAST:event_visitGeochron_buttonActionPerformed
 
     private void sourceGeochron_jRadioButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sourceGeochron_jRadioButtonActionPerformed

diff --git a/src/main/java/org/earthtime/archivingTools/GeochronRetrievalUtility.java b/src/main/java/org/earthtime/archivingTools/GeochronRetrievalUtility.java
@@ -34,7 +34,7 @@ public class GeochronRetrievalUtility {
 
     /**
      *
-     * http://www.geochron.org/post_to_search_service.html
+     * https://www.geochron.org/post_to_search_service.html
      *
      * @param sample
      * @param username
@@ -81,7 +81,7 @@ public static String retrieveGeochronAliquotFile(SampleInterface sample, String
 
         String downloadURL
                 = 
-                "http://www.geochron.org/getxml.php?igsn="//
+                "https://www.geochron.org/getxml.php?igsn="//
                 + aliquotIGSN.toUpperCase().trim()//
                 + "&username="//
                 + userName//

diff --git a/src/main/java/org/earthtime/archivingTools/GeochronUploadImagesHelper.java b/src/main/java/org/earthtime/archivingTools/GeochronUploadImagesHelper.java
@@ -48,7 +48,7 @@ public static String uploadImage ( File imageFile, String username, String passw
         InputStream response = null;
         try {
             response = ClientHttpRequest.post(//
-                    new URL( "http://www.geochron.org/imageservice.php" ),//
+                    new URL( "https://www.geochron.org/imageservice.php" ),//
                     "username",
                     username,
                     "password",

diff --git a/src/main/java/org/earthtime/archivingTools/GeochronUploaderUtility.java b/src/main/java/org/earthtime/archivingTools/GeochronUploaderUtility.java
@@ -110,7 +110,7 @@ public static void uploadAliquotToGeochron(SampleInterface sample, AliquotInterf
         InputStream response = null;
         try {
             response = ClientHttpRequest.post(//
-                    new URL("http://www.geochron.org/redux_service.php"),//
+                    new URL("https://www.geochron.org/redux_service.php"),//
                     "filetoupload",
                     uploadFile);
         } catch (IOException iOException) {