ADE source of 12.6

progress · Oct 13, 2022 · 8e76c2c · 8e76c2c
1 parent 913533d
commit 8e76c2c
Show file tree

Hide file tree

Showing 128 changed files with 11,168 additions and 6,385 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1 @@
-This contains the source files of the OpenEdge 12.5 AppBuilder, Data admin API, HTTP client, webhandlers products. 
-Progress will not accept modifications to this code. 
-However, if you want to share something you develop using this code, please submit it to OpenEdge Code Share.
+This contains the source files of the OpenEdge 12.6 AppBuilder, Data admin API, HTTP client, webhandlers products. Progress will not accept modifications to this code. However, if you want to share something you develop using this code, please submit it to OpenEdge Code Share.
diff --git a/ablunit/OpenEdge/ABLUnit/Runner/ABLRunner.cls b/ablunit/OpenEdge/ABLUnit/Runner/ABLRunner.cls
diff --git a/ablunit/OpenEdge/ABLUnit/Writer/ResultsXmlWriter.cls b/ablunit/OpenEdge/ABLUnit/Writer/ResultsXmlWriter.cls
@@ -1,5 +1,5 @@
 /************************************************
-Copyright (c) 2020-2021 by Progress Software Corporation. All rights reserved.
+Copyright (c) 2020-2022 by Progress Software Corporation. All rights reserved.
 *************************************************/
 /*------------------------------------------------------------------------
     File        : ResultsXmlWriter
@@ -48,9 +48,6 @@ implements IResultsWriter:
         xmlDoc:save('longchar':u, xml).
 
         return xml.
-        finally:
-            delete widget-pool.
-        end finally.
     end method.
 
     /* Writes the test results in the xml file
@@ -66,12 +63,9 @@ implements IResultsWriter:
         assign xmlDoc = WriteXml(pTestEntity).
 
         xmlDoc:save('file':u, pXmlFileName).
-        finally:
-            delete widget-pool.
-        end finally.
     end method.
 
-    /* Writes the testENtity as XML
+    /* Writes the test entity as XML
        
        @param  TestEntity The test to write (root)
        @param  ICollection A collection holding all X-DOC or X-NODEREF handles for cleanup after writing of the doc.

diff --git a/adecomm/_dbconnc.p b/adecomm/_dbconnc.p
@@ -1,5 +1,5 @@
 /************************************************************************
-* Copyright (C) 2000,2009,2016 by Progress Software Corporation.        *
+* Copyright (C) 2000,2009,2016,2022 by Progress Software Corporation.   *
 * All rights reserved. Prior versions of this work may contain portions *
 * contributed by participants of Possenet.                              *
 *                                                                       *
@@ -62,6 +62,7 @@ Modified:
   07/30/92 by Elliot Chikofsky
   08/08/11 rkamboj -     fixed issue of login when special chracter in password 
                         at the time of db connect. Applied set-db-client method.
+  02/24/22 tmasood - Added the support for -Pin argument
 
 ----------------------------------------------------------------------------*/
 {adecomm/cbvar.i}
@@ -90,6 +91,7 @@ DEFINE              VARIABLE setdbclnt       AS LOGICAL NO-UNDO.
 DEFINE              VARIABLE currentdb       AS CHAR VIEW-AS TEXT FORMAT "x(32)" NO-UNDO.
 /*Define              variable  qbf_l_name    as logical NO-UNDO. / * l-name NOT needed */
 Define              variable  qbf_p_name     as logical  NO-UNDO. /* p-name NOT needed */
+DEFINE              VARIABLE  Pin            AS LOGICAL   NO-UNDO.   
 
 &IF "{&WINDOW-SYSTEM}" <> "TTY" &THEN
    /* "Blue bar" optional text */
@@ -145,10 +147,12 @@ form
    ext_Type              label "&Database Type"             colon  18
                                 format "x(11)" {&STDPH_FILL}     
 
-   p_Multi_User    label "&Multiple Users"      at     35
+   p_Multi_User    label "&Multiple Users"      at     31
                                 view-as TOGGLE-BOX
-   Pass_Phrase     label "Passphrase"      at     57
-                                view-as TOGGLE-BOX                       SKIP({&VM_WID})
+   Pass_Phrase     label "Passphrase"      at     49
+                                view-as TOGGLE-BOX                             
+   Pin             label "Pin"      at     63
+                                view-as TOGGLE-BOX                             SKIP({&VM_WID})
    p_UserId              label "&User ID"                         colon  18 
                                 format "x(50)" {&STDPH_FILL}             SKIP({&VM_WID})
    p_Password            label "Pass&word"                        colon  18
@@ -301,6 +305,7 @@ do:
 /*    input frame connect p_Type    */
       input frame connect p_Multi_User
       input frame connect Pass_Phrase
+      input frame connect Pin
       input frame connect p_UserId
       input frame connect p_Password
       input frame connect p_Trig_Loc
@@ -366,30 +371,43 @@ do:
        return no-apply.
        end.
       else do:
-       IF NOT Pass_Phrase THEN DO:
+       IF NOT Pass_Phrase AND NOT Pin THEN DO:
            run adecomm/_setcurs.p ("WAIT").
            connect VALUE(args) VALUE(p_Unix_Parms) NO-ERROR.
            run adecomm/_setcurs.p ("").
        END.
 
-       IF Pass_Phrase OR
-          (ERROR-STATUS:ERROR AND ERROR-STATUS:GET-NUMBER(1) = 15271) THEN DO:
-          /* if missing or incorrect passphrase for a database
+       IF Pass_Phrase OR Pin OR
+          (ERROR-STATUS:ERROR AND 
+          (ERROR-STATUS:GET-NUMBER(1) = 15271 OR ERROR-STATUS:GET-NUMBER(1) = 20409)) THEN DO:
+          /* if missing or incorrect passphrase/pin for a database
              with encryption enabled and manual start, prompt
              for the passphrase now.
           */
           DEFINE VARIABLE cpassPhrase AS CHARACTER NO-UNDO.
+          DEFINE VARIABLE cPin        AS CHARACTER NO-UNDO.
+          DEFINE VARIABLE cKeyStoreParams AS CHARACTER NO-UNDO INITIAL "".
 
-          RUN _passphrase.p (OUTPUT cpassPhrase).
+          RUN _passphrase.p (INPUT Pass_Phrase,
+                             INPUT Pin,
+                             OUTPUT cpassPhrase,
+                             OUTPUT cPin).
 
-          /* if they don't specify a passphrase when asked to, we will
+          /* if they don't specify a passphrase/pin when asked to, we will
              just display the errors we got above.
           */
           IF cpassPhrase <> ? AND length(cpassPhrase) > 0 THEN DO:
-             /* this will let them try once. If it fails, then they will
+               ASSIGN cKeyStoreParams = "-KeyStorePassPhrase " + QUOTER(cpassPhrase).
+          END.
+          IF cPin <> ? AND length(cPin) > 0 THEN DO:
+              ASSIGN cKeyStoreParams = cKeyStoreParams + " -KeyStorePin " + QUOTER(cPin).
+          END.
+
+          IF cKeyStoreParams NE ""  THEN DO:
+          /* this will let them try once. If it fails, then they will
                  need to try to connect again.
-             */
-              connect VALUE(args) VALUE("-KeyStorePassPhrase " + QUOTER(cpassPhrase)) VALUE(p_Unix_Parms) NO-ERROR.
+           */
+              connect VALUE(args) VALUE(cKeyStoreParams) VALUE(p_Unix_Parms) NO-ERROR.
           END.
        END.
        if  NUM-DBS > num then ASSIGN currentdb = LDBNAME(num + 1).
@@ -607,6 +625,7 @@ display
    ext_Type             
    p_Multi_User
    Pass_Phrase
+   Pin
    p_UserId
    p_Password    
    p_Trig_Loc
@@ -620,6 +639,7 @@ do ON ERROR UNDO,LEAVE  ON ENDKEY UNDO,LEAVE:
           p_LName   /* when qbf_l_name */
           p_Multi_User
           Pass_Phrase
+          Pin
           p_UserId
           p_Password
           p_Trig_Loc

diff --git a/adecomm/_dbconng.w b/adecomm/_dbconng.w
@@ -9,7 +9,7 @@ Use this template to create a new dialog-box. Alter this default template or cre
 &Scoped-define FRAME-NAME Connect
 &ANALYZE-SUSPEND _UIB-CODE-BLOCK _CUSTOM _DEFINITIONS Connect 
 /************************************************************************
-* Copyright (C) 2000,2009 by Progress Software Corporation.             *
+* Copyright (C) 2000,2009,2022 by Progress Software Corporation.        *
 * All rights reserved. Prior versions of this work may contain portions *
 * contributed by participants of Possenet.                              *
 *                                                                       *
@@ -70,7 +70,8 @@ Modified:
                         (sometimes people just enter pf-file. In this
                         case we need to ignore the other parameters)
     rkamboj   08/08/11  fixed issue of login when special chracter in password 
-                        at the time of db connect. Applied set-db-client method.                   
+                        at the time of db connect. Applied set-db-client method.
+    tmasood   02/24/22  Added the support for -Pin argument                    
 
 ----------------------------------------------------------------------------*/
 /*          This .W file was created with the Progress UIB.             */
@@ -162,10 +163,10 @@ btn_Options Btn_Help
 /* OPTIONAL-FIELDS,ENABLE-OPTIONAL,List-3,List-4,List-5,List-6          */
 &Scoped-define OPTIONAL-FIELDS Network Multi_User Pass_Phrase Host_Name ~
 Service_Name User_Id Pass_word Trig_Loc btn_filep Parm_File btn_filet ~
-Unix_Parms Unix_Label 
+Unix_Parms Unix_Label Pin 
 &Scoped-define ENABLE-OPTIONAL Network Multi_User Pass_Phrase Host_Name ~
 Service_Name User_Id Pass_word Trig_Loc btn_filep Parm_File btn_filet ~
-Unix_Parms Unix_Label 
+Unix_Parms Unix_Label Pin
 
 /* _UIB-PREPROCESSOR-BLOCK-END */
 &ANALYZE-RESUME
@@ -279,6 +280,11 @@ DEFINE VARIABLE Pass_Phrase AS LOGICAL INITIAL no
      VIEW-AS TOGGLE-BOX
      SIZE 17 BY .76 NO-UNDO.
 
+DEFINE VARIABLE Pin AS LOGICAL INITIAL no 
+     LABEL "Pin" 
+     VIEW-AS TOGGLE-BOX
+     SIZE 7.8 BY .81 NO-UNDO.
+
 
 /* ************************  Frame Definitions  *********************** */
 
@@ -293,7 +299,8 @@ DEFINE FRAME Connect
      DB_Type AT ROW 4.33 COL 18 COLON-ALIGNED
      Network AT ROW 5.86 COL 18.2 COLON-ALIGNED
      Multi_User AT ROW 5.86 COL 44
-     Pass_Phrase AT ROW 5.86 COL 64
+     Pass_Phrase AT ROW 5.86 COL 62.2
+     Pin AT ROW 5.91 COL 77.4 WIDGET-ID 2
      Host_Name AT ROW 7.19 COL 18 COLON-ALIGNED
      Service_Name AT ROW 7.19 COL 62 COLON-ALIGNED
      User_Id AT ROW 8.52 COL 18 COLON-ALIGNED
@@ -304,7 +311,7 @@ DEFINE FRAME Connect
      btn_filet AT ROW 12.67 COL 71
      Unix_Parms AT ROW 14.81 COL 4 NO-LABEL
      Unix_Label AT ROW 14 COL 1
-     SPACE(35.99) SKIP(3.23)
+     SPACE(36.40) SKIP(3.23)
     WITH VIEW-AS DIALOG-BOX KEEP-TAB-ORDER 
          SIDE-LABELS NO-UNDERLINE THREE-D  SCROLLABLE 
          TITLE "Connect Database"
@@ -367,6 +374,11 @@ ASSIGN
 ASSIGN 
        Pass_Phrase:HIDDEN IN FRAME Connect           = TRUE.
 
+/* SETTINGS FOR TOGGLE-BOX Pin IN FRAME Connect
+   NO-DISPLAY NO-ENABLE 1 2                                             */
+ASSIGN 
+       Pin:HIDDEN IN FRAME Connect           = TRUE.       
+
 /* SETTINGS FOR FILL-IN Pass_word IN FRAME Connect
    NO-DISPLAY NO-ENABLE 1 2                                             */
 ASSIGN 
@@ -803,6 +815,7 @@ PROCEDURE Pressed_OK :
       input frame connect DB_Type
       input frame connect Multi_User
       input frame connect Pass_Phrase
+      INPUT FRAME connect Pin
       input frame connect Network
       input frame connect Host_Name
       input frame connect Service_Name
@@ -884,29 +897,43 @@ PROCEDURE Pressed_OK :
        return error.
        end.
       else do:
-       IF NOT Pass_Phrase THEN DO:
+       IF NOT Pass_Phrase AND NOT Pin THEN DO:
           run adecomm/_setcurs.p ("WAIT").
           connect VALUE(args) VALUE(p_Unix_Parms) NO-ERROR.
           run adecomm/_setcurs.p ("").
        END.
 
-       IF Pass_Phrase OR (ERROR-STATUS:ERROR AND ERROR-STATUS:GET-NUMBER(1) = 15271) THEN DO:
-          /* if missing or incorrect passphrase for a database
+       IF Pass_Phrase OR Pin OR
+          (ERROR-STATUS:ERROR AND 
+          (ERROR-STATUS:GET-NUMBER(1) = 15271 OR ERROR-STATUS:GET-NUMBER(1) = 20409)) THEN DO:
+          /* if missing or incorrect passphrase/pin for a database
              with encryption enabled and manual start, prompt
              for the passphrase now.
           */
           DEFINE VARIABLE cpassPhrase     AS CHARACTER NO-UNDO.
+          DEFINE VARIABLE cPin            AS CHARACTER NO-UNDO.
+          DEFINE VARIABLE cKeyStoreParams AS CHARACTER NO-UNDO INITIAL "".
 
-          RUN _passphrase.p (OUTPUT cpassPhrase).
+          RUN _passphrase.p (INPUT Pass_Phrase,
+                             INPUT Pin,
+                             OUTPUT cpassPhrase,
+                             OUTPUT cPin).
 
-          /* if they don't specify a passphrase when asked to, we will
+          /* if they don't specify a passphrase/pin when asked to, we will
              just display the errors we got above.
           */
           IF cpassPhrase <> ? AND length(cpassPhrase) > 0 THEN DO:
-              /* this will let them try once. If it fails, then they will
+               ASSIGN cKeyStoreParams = "-KeyStorePassPhrase " + QUOTER(cpassPhrase).
+          END.
+          IF cPin <> ? AND length(cPin) > 0 THEN DO:
+              ASSIGN cKeyStoreParams = cKeyStoreParams + " -KeyStorePin " + QUOTER(cPin).
+          END.
+
+          IF cKeyStoreParams NE "" THEN DO:
+          /* this will let them try once. If it fails, then they will
                  need to try to connect again.
-              */
-              connect VALUE(args) VALUE("-KeyStorePassPhrase " + QUOTER(cpassPhrase)) VALUE(p_Unix_Parms) NO-ERROR.
+           */
+              connect VALUE(args) VALUE(cKeyStoreParams) VALUE(p_Unix_Parms) NO-ERROR.
           END.    
        END.
        if  NUM-DBS > num then ASSIGN currentdb = LDBNAME(num + 1).