[jboss-svn-commits] JBL Code SVN: r33679 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: plugin/resources/templates and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-06-29 03:57:33 -0400 (Tue, 29 Jun 2010)
New Revision: 33679

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
Log:
Removed password check

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java	2010-06-28 23:07:07 UTC (rev 33678)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java	2010-06-29 07:57:33 UTC (rev 33679)
@@ -64,8 +64,6 @@
 
   private String masterAccountUsername;
 
-  private String masterPassword;
-
   private NukesAccountManager nukesAccountManager;
 
   private SbsAccountManager sbsAccountManager;
@@ -115,12 +113,6 @@
       return UNAUTHORIZED;
     }
 
-    if (!checkUsernamePassword(masterAccountUsername, masterPassword)) {
-      addFieldError("masterPassword", getText("plugin.nukesauth.masteraccount.masterpassword.notcorrect",
-          new String[] { masterPassword }));
-      return INPUT;
-    }
-
     NukesUser masterAccount = nukesAccountManager.getAccountByUsername(masterAccountUsername);
     Date oldestRegDate = NukesAccountManagerImpl.getOldestRegistrationDate(duplicateAccounts);
     masterAccount.setCreationDate(oldestRegDate);
@@ -201,13 +193,4 @@
     this.sbsAccountManager = sbsAccountManager;
   }
 
-  public void setMasterPassword(String masterPassword) {
-    this.masterPassword = masterPassword;
-  }
-
-  @RequiredFieldValidator(fieldName = "masterPassword", key = "plugin.nukesauth.masteraccount.masterpassword.required", message = "Password is required")
-  public String getMasterPassword() {
-    return masterPassword;
-  }
-
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl	2010-06-28 23:07:07 UTC (rev 33678)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl	2010-06-29 07:57:33 UTC (rev 33679)
@@ -83,7 +83,6 @@
         <@s.form theme="simple">
         <table>
           <@s.radio key="plugin.nukesauth.masteraccount.choosemaster" name="masterAccountUsername" list="duplicateAccounts" listKey="username" listValue="username" theme="xhtml" required="true"/>
-          <@s.password key="plugin.nukesauth.masteraccount.masterpassword" name="masterPassword" theme="xhtml" required="true"/>
           <tr><td>&nbsp;</td></tr>
           <tr><td colspan="2">
           <@s.submit key="plugin.nukesauth.masteraccount.submit" method="execute"/>

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties	2010-06-28 23:07:07 UTC (rev 33678)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties	2010-06-29 07:57:33 UTC (rev 33679)
@@ -24,13 +24,9 @@
 plugin.nukesauth.masteraccount.account.occupation=Occupation
 plugin.nukesauth.masteraccount.account.expertise=Expertise
 
-plugin.nukesauth.masteraccount.masterpassword=Password
-plugin.nukesauth.masteraccount.masterpassword.required=Password is required
-plugin.nukesauth.masteraccount.masterpassword.notcorrect=Password is not correct.
-
 plugin.nukesauth.masteraccount.choosemaster=Master Account
 plugin.nukesauth.masteraccount.choosemaster.required=Please choose The Master Acount
-plugin.nukesauth.masteraccount.submit=Create The Master Account
+plugin.nukesauth.masteraccount.submit=Setup The Master Account
 plugin.nukesauth.masteraccount.cancel=Cancel
 
 plugin.nukesauth.masteraccount.name.created=Master account created