[jboss-svn-commits] JBL Code SVN: r36015 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src: main/java/org/jboss/labs/sbs/plugin/nukesauth/struts and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Nov 22 07:32:44 EST 2010 

Author: lkrzyzanek
Date: 2010-11-22 07:32:43 -0500 (Mon, 22 Nov 2010)
New Revision: 36015

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
   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/plugin.xml
   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:
Implemented ORG-841

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml	2010-11-21 23:40:59 UTC (rev 36014)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/changes/changes.xml	2010-11-22 12:32:43 UTC (rev 36015)
@@ -10,7 +10,10 @@
 
   <body>
 
-    <release version="1.1.1" date="2010-??-??" description="Bugfix release">
+    <release version="1.1.1" date="2010-??-??" description="Bugfix and minor changes release">
+      <action type="add" dev="lkrzyzan" date="2010-10-14">
+        <fixes issue="ORG-841" />
+      </action>
       <action type="fix" dev="lkrzyzan" date="2010-10-14">
         <fixes issue="ORG-792" />
       </action>

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-11-21 23:40:59 UTC (rev 36014)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/ChooseMasterAccountAction.java	2010-11-22 12:32:43 UTC (rev 36015)
@@ -23,6 +23,7 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 import org.acegisecurity.BadCredentialsException;
@@ -62,6 +63,8 @@
 
   private List<NukesUser> duplicateAccounts;
 
+  private List<String> accountsToChoose;
+
   private String masterAccountUsername;
 
   private NukesAccountManager nukesAccountManager;
@@ -85,6 +88,13 @@
     }
     NukesUser user = nukesAccountManager.getAccountByUsername(username.toString());
     duplicateAccounts = nukesAccountManager.getNukesAccountsByEmail(user.getEmail());
+    accountsToChoose = new LinkedList<String>();
+
+    for (NukesUser account : duplicateAccounts) {
+      if (account.getUsername().indexOf('@') == -1) {
+        accountsToChoose.add(account.getUsername());
+      }
+    }
   }
 
   @Override
@@ -193,4 +203,8 @@
     this.sbsAccountManager = sbsAccountManager;
   }
 
+  public List<String> getAccountsToChoose() {
+    return accountsToChoose;
+  }
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml	2010-11-21 23:40:59 UTC (rev 36014)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml	2010-11-22 12:32:43 UTC (rev 36015)
@@ -3,7 +3,7 @@
   <name>nukesauthentication</name>
   <description>Provides integration with Nukes accounts</description>
   <author>JBoss Community</author>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <minServerVersion>4.5.3</minServerVersion>
   
   <components>

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-11-21 23:40:59 UTC (rev 36014)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/choose-master-account.ftl	2010-11-22 12:32:43 UTC (rev 36015)
@@ -82,8 +82,14 @@
         <p>&nbsp;</p>
         <@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.radio key="plugin.nukesauth.masteraccount.choosemaster" name="masterAccountUsername" list="accountsToChoose" theme="xhtml" required="true"/>
           <tr><td>&nbsp;</td></tr>
+
+          <#if accountsToChoose.size() != duplicateAccounts.size()>
+          <tr><td colspan="2"><@s.text name="plugin.nukesauth.masteraccount.note" /></td></tr>
+          <tr><td>&nbsp;</td></tr>
+          </#if>
+
           <tr><td colspan="2">
           <@s.submit key="plugin.nukesauth.masteraccount.submit" method="execute"/>
           &nbsp;&nbsp;

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-11-21 23:40:59 UTC (rev 36014)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties	2010-11-22 12:32:43 UTC (rev 36015)
@@ -32,6 +32,7 @@
 plugin.nukesauth.masteraccount.account.occupation=Occupation
 plugin.nukesauth.masteraccount.account.expertise=Expertise
 plugin.nukesauth.masteraccount.account.globallydisabled=Globally disabled
+plugin.nukesauth.masteraccount.note=You can choose only account which doesn''t contain @ character. 
 
 plugin.nukesauth.masteraccount.choosemaster=Master Account
 plugin.nukesauth.masteraccount.choosemaster.required=Please choose The Master Account

More information about the jboss-svn-commits mailing list