[jboss-svn-commits] JBL Code SVN: r34900 - in labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main: plugin and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 26 09:16:44 EDT 2010
Author: lkrzyzanek
Date: 2010-08-26 09:16:42 -0400 (Thu, 26 Aug 2010)
New Revision: 34900
Added:
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/NukesUserSearchAction.java
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/admin/
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/admin/nukes-user-search.ftl
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/struts.xml
labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties
Log:
Implemented ORG-702
Added: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/NukesUserSearchAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/NukesUserSearchAction.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/NukesUserSearchAction.java 2010-08-26 13:16:42 UTC (rev 34900)
@@ -0,0 +1,85 @@
+/*
+ * JBoss Community http://jboss.org/
+ *
+ * Copyright (c) 2010 Red Hat Middleware, LLC. All rights reserved.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT A WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License, v.2.1 along with this distribution; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * Red Hat Author(s): Libor Krzyzanek
+ */
+package org.jboss.labs.sbs.plugin.nukesauth.struts;
+
+import java.util.List;
+
+import org.jboss.labs.sbs.plugin.nukesauth.NukesAccountManager;
+import org.jboss.labs.sbs.plugin.nukesauth.dao.NukesUser;
+
+import com.jivesoftware.community.action.JiveActionSupport;
+import com.jivesoftware.util.StringUtils;
+
+/**
+ * Action provides searching nukes users.
+ *
+ * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
+ */
+public class NukesUserSearchAction extends JiveActionSupport {
+
+ private String query;
+
+ private List<NukesUser> accounts;
+
+ private NukesAccountManager nukesAccountManager;
+
+ public String execute() {
+ if (StringUtils.isBlank(query)) {
+ addActionError(getText("plugin.nukesauth.admin.search.query.required"));
+ return INPUT;
+ }
+
+ accounts = nukesAccountManager.getNukesAccountsByEmail(query);
+
+ NukesUser account = nukesAccountManager.getAccountByUsername(query);
+ if (account != null) {
+ accounts.add(account);
+ }
+ if (accounts.isEmpty()) {
+ addActionMessage(getText("plugin.nukesauth.admin.search.text.nomatches"));
+ return INPUT;
+ }
+
+ return SUCCESS;
+ }
+
+ public void setQuery(String query) {
+ this.query = query;
+ }
+
+ public String getQuery() {
+ return query;
+ }
+
+ public void setNukesAccountManager(NukesAccountManager nukesAccountManager) {
+ this.nukesAccountManager = nukesAccountManager;
+ }
+
+ public List<NukesUser> getAccounts() {
+ return accounts;
+ }
+
+ public void setAccounts(List<NukesUser> accounts) {
+ this.accounts = accounts;
+ }
+
+}
Property changes on: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/java/org/jboss/labs/sbs/plugin/nukesauth/struts/NukesUserSearchAction.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-08-26 13:12:08 UTC (rev 34899)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/plugin.xml 2010-08-26 13:16:42 UTC (rev 34900)
@@ -5,5 +5,17 @@
<author>JBoss Community</author>
<version>1.1.0</version>
<minServerVersion>4.5.3</minServerVersion>
-
+
+ <components>
+ <component id="admin-console">
+ <tab id="usersgroups">
+ <section id="section-users-management">
+ <item id="system-nukessearch" name="plugin.nukesauth.admin.search.name"
+ url="nukes-user-search!input.jspa" description="plugin.nukesauth.admin.search.desc"
+ role="Manage System" />
+ </section>
+ </tab>
+ </component>
+ </components>
+
</plugin>
Added: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/admin/nukes-user-search.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/admin/nukes-user-search.ftl (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/resources/templates/admin/nukes-user-search.ftl 2010-08-26 13:16:42 UTC (rev 34900)
@@ -0,0 +1,83 @@
+<html>
+ <head>
+ <#assign pageTitle=action.getText('plugin.nukesauth.admin.search.name') />
+ <title>${pageTitle}</title>
+ <content tag="pagetitle">${pageTitle}</content>
+ <content tag="pageID">system-nukessearch</content>
+ </head>
+ <body>
+
+ <#include "/template/global/include/form-message.ftl" />
+
+ <@s.form theme="simple" action="nukes-user-search">
+ <table>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.admin.search.query"/>:</td>
+ <td><@s.textfield name="query" required="true"/></td>
+ <td><@s.submit value="${action.getText('plugin.nukesauth.admin.search.submit')}"/></td>
+ </tr>
+ </table>
+ </@s.form>
+ <@s.if test="accounts.size() > 0">
+ <br/>
+ <div class="jive-table">
+ <table cellspacing="2px" cellpadding="2px">
+ <tr>
+ <th><@s.text name="plugin.nukesauth.masteraccount.account.username" />:</th>
+ <@s.iterator value="accounts">
+ <th><@s.property value="username" /></th>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.creationDate" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.date name="creationDate" format="MMM d, yyyy" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.firstname" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="firstName" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.lastname" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="lastName" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.email" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="email" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.phone" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="profile[4]" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.bio" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="profile[11]" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.url" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="profile[9]" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ <tr>
+ <td><@s.text name="plugin.nukesauth.masteraccount.account.companyname" />:</td>
+ <@s.iterator value="accounts">
+ <td><@s.property value="profile[5001]" default="-" /></td>
+ </@s.iterator>
+ </tr>
+ </table>
+ </div>
+ </@s.if>
+ </body>
+</html>
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml 2010-08-26 13:12:08 UTC (rev 34899)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/plugin/struts.xml 2010-08-26 13:16:42 UTC (rev 34900)
@@ -112,4 +112,18 @@
</package>
+ <package name="nukes-authentication-actions-admin" namespace="/admin"
+ extends="community-admin-default">
+
+ <action name="nukes-user-search"
+ class="org.jboss.labs.sbs.plugin.nukesauth.struts.NukesUserSearchAction">
+ <result name="input" type="freemarker">
+ /plugins/nukesauthentication/resources/templates/admin/nukes-user-search.ftl
+ </result>
+ <result name="success" type="freemarker">
+ /plugins/nukesauthentication/resources/templates/admin/nukes-user-search.ftl
+ </result>
+ </action>
+ </package>
+
</struts>
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-08-26 13:12:08 UTC (rev 34899)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-nukesauthentication/trunk/src/main/resources/plugin_i18n.properties 2010-08-26 13:16:42 UTC (rev 34900)
@@ -1,3 +1,11 @@
+# Admin: nukes user search
+plugin.nukesauth.admin.search.name=Nukes User Search
+plugin.nukesauth.admin.search.desc=Click to search Nukes Users
+plugin.nukesauth.admin.search.query=Enter username or e-mail
+plugin.nukesauth.admin.search.submit=Search
+plugin.nukesauth.admin.search.query.required=Please enter e-mail or username
+plugin.nukesauth.admin.search.text.nomatches=No user exists with this username or e-mail.
+
# Choose Master Account
plugin.nukesauth.masteraccount.name=Setup a Master Account
plugin.nukesauth.masteraccount.description=It appears you have multiple accounts using the same email address. Please choose one of these to be the Master Account which you will then use to keep the data between them synchronized.
More information about the jboss-svn-commits
mailing list