handle feedback

axonivy-market · Jan 22, 2025 · 7426128 · 7426128
1 parent cfc7c57
commit 7426128
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/ldap-connector-demo/cms/cms_en.yaml b/ldap-connector-demo/cms/cms_en.yaml
@@ -20,13 +20,13 @@ Dialogs:
 Labels:
   AddAttribute: Add Attribute
   AttributeName: Attribute Name
-  AttributeNamePlaceholder: mail
+  AttributeNamePlaceholder: commonName
   AttributeValue: Attribute Value
-  AttributeValuePlaceholder: [email protected]
+  AttributeValuePlaceholder: octopus
   ConfigDialogHeader: Jndi Server Configuration
   DefaultUrlPlaceholder: ldap://localhost:1389
   DistinguishedName: Distinguished Name
-  DistinguishedNamePlaceHolder: cn=admin,dc=zugtstdomain,dc=wan
+  DistinguishedNamePlaceHolder: cn=Users,cn=Roles,dc=zugtstdomain,dc=wan
   Done: Done
   ExecuteQuery: Execute Query
   Filter: Filter
@@ -45,6 +45,5 @@ Labels:
   User: User
   UserPlaceholder: cn=admin,dc=zugtstdomain,dc=wan
   Value: Value
-  AddAttribute: Add Attribute
   ReplaceAttribute: Replace Attribute
   RemoveAttribute: Remove Attribute
diff --git a/...nnector-demo/src_hd/com/axonivy/connector/ldap/connector/demo/modify/modifyProcess.p.json b/...nnector-demo/src_hd/com/axonivy/connector/ldap/connector/demo/modify/modifyProcess.p.json
@@ -13,10 +13,10 @@
         "callSignature" : "start",
         "input" : {
           "map" : {
-            "out.password" : "ivy.var.LdapConnector_Password",
-            "out.provider" : "ivy.var.LdapConnector_Provider",
-            "out.url" : "ivy.var.LdapConnector_Url",
-            "out.user" : "ivy.var.LdapConnector_Username"
+            "out.password" : "ivy.var.get(\"LdapConnector.Password\")",
+            "out.provider" : "ivy.var.get(\"LdapConnector.Provider\")",
+            "out.url" : "ivy.var.get(\"LdapConnector.Url\")",
+            "out.user" : "ivy.var.get(\"LdapConnector.Username\")"
           }
         },
         "guid" : "17D93EE360B9ABAA"
@@ -105,8 +105,8 @@
             "            .url(in.url)",
             "            .userName(in.user)",
             "            .password(in.Password)",
-            "            .referral(ivy.var.LdapConnector_Referral)",
-            "            .connectionTimeout(ivy.var.LdapConnector_Connection_Timeout)",
+            "            .referral(ivy.var.get(\"LdapConnector.Referral\"))",
+            "            .connectionTimeout(ivy.var.get(\"LdapConnector.Connection.Timeout\"))",
             "            .toJndiConfig();",
             "            ",
             "SearchControls searchControl = new SearchControls();",

diff --git a/ldap-connector-product/pom.xml b/ldap-connector-product/pom.xml
@@ -41,10 +41,11 @@
                 <copy todir="${project.build.directory}">
                   <fileset dir="../../" includes="doc/**" />
                 </copy>
-                <copy file="README.md" tofile="${project.build.directory}/README.md" />
+                <copy todir="${project.build.directory}">
+                  <fileset dir="." includes="README*.md" />
+                </copy>
                 <loadfile property="variables.yaml" srcFile="${variables.yaml.file}" encoding="UTF-8" failonerror="false" />
                 <replace file="${project.build.directory}/README.md" token="@variables.yaml@" value="${variables.yaml}" />
-                <copy file="README_DE.md" tofile="${project.build.directory}/README_DE.md" />
                 <replace file="${project.build.directory}/README_DE.md" token="@variables.yaml@" value="${variables.yaml}" />
               </target>
             </configuration>

diff --git a/ldap-connector-test/src_test/com/axonivy/connector/ldap/test/TestLdap.java b/ldap-connector-test/src_test/com/axonivy/connector/ldap/test/TestLdap.java
@@ -58,8 +58,6 @@ class TestLdap {
   static void setupConfig() throws IOException {
     username = System.getProperty("adUsername");
     password = System.getProperty("adPassword");
-    username = "admin";
-    password = "admin";
 
     if (StringUtils.isEmpty(username)) {
       try (var in = TestLdap.class.getResourceAsStream("credentials.properties")) {