PAYARA-1525 removed password encrytion algorithm from JDBCRealm confi…

…g in admin console (#1484)
payara · Mar 29, 2017 · ef20c6d · ef20c6d
1 parent 8c0c6d2
commit ef20c6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/appserver/admingui/common/src/main/resources/security/realms/realmAttrs.inc b/appserver/admingui/common/src/main/resources/security/realms/realmAttrs.inc
@@ -38,6 +38,7 @@
     only if the new code is made subject to such option by the copyright
     holder.
 
+    Portions Copyright [2017] Payara Foundation and/or affiliates
 -->
 
 <!-- security/realms/realmAttrs.inc -->
@@ -174,9 +175,6 @@
         <sun:property id="groupName" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.realm.groupName}" helpText="$resource{i18nc.realm.groupNameHelp}" >
             <sun:textField id="groupName" columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.realm.groupName']}" text="#{attrMap.groupNameColumn}" required="#{true}" />
         </sun:property>
-        <sun:property id="pswdEnc" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.realm.pswdEnc}" helpText="$resource{i18nc.realm.pswdEncHelp}" >
-            <sun:textField id="pswdEnc" columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.realm.pswdEncAlgorithm']}" text="#{attrMap.pswdEncAlgorithm}"  required="#{true}" />
-        </sun:property>
         <sun:property id="asgroup" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nc.realm.asgroup}" helpText="$resource{i18nc.realm.asgroupHelp}" >
             <sun:textField id="asgroup" columns="$int{60}" maxLength="#{sessionScope.fieldLengths['maxLength.realm.asgroup']}" text="#{attrMap.jdbcAsGroups}"  />
         </sun:property> 

diff --git a/appserver/admingui/common/src/main/resources/security/realms/realmjs.inc b/appserver/admingui/common/src/main/resources/security/realms/realmjs.inc
@@ -37,7 +37,8 @@
     and therefore, elected the GPL Version 2 license, then the option applies
     only if the new code is made subject to such option by the copyright
     holder.
-
+    
+    Portions Copyright [2017] Payara Foundation and/or affiliates
 -->
 
 <f:verbatim>
@@ -92,8 +93,7 @@ function checkClassname() {
 		checkRequired(id="form1:jdbcSection:userName:userName", '#{reqMsg}' )  &&
 		checkRequired(id="form1:jdbcSection:pswd:pswd" , '#{reqMsg}' )  &&
 		checkRequired(id="form1:jdbcSection:groupTable:groupTable" , '#{reqMsg}' )  &&
-		checkRequired(id="form1:jdbcSection:groupName:groupName" , '#{reqMsg}' ) &&
-                checkRequired(id="form1:jdbcSection:pswdEnc:pswdEnc" , '#{reqMsg}' );
+		checkRequired(id="form1:jdbcSection:groupName:groupName" , '#{reqMsg}' );
 	} else if (type.match('PamRealm') != null) {
 	    return checkRequired(id="form1:pamSection:jaax:jaax" , '#{reqMsg}') ;
 	} else if (type == '') {