[jboss-svn-commits] JBL Code SVN: r35585 - in labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main: java/org/jboss/community/sbs/plugin/reports/struts and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 20 04:49:51 EDT 2010
Author: lkrzyzanek
Date: 2010-10-20 04:49:51 -0400 (Wed, 20 Oct 2010)
New Revision: 35585
Modified:
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/RedHatUsersDAO.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersSnapshotAction.java
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers-snaphost.ftl
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
Log:
Finished RH users details
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbRedHatUsersDAOImpl.java 2010-10-20 08:49:51 UTC (rev 35585)
@@ -56,18 +56,18 @@
@Override
public List<Long> getRedHatUsers(Date date) {
- return this.getSimpleJdbcTemplate().query(SELECT_REDHAT_USERS_BY_DATE, longMapper, date);
+ return this.getSimpleJdbcTemplate().query(SELECT_REDHAT_USERS_BY_DATE, longMapper, date.getTime());
}
private SnapshotsCountMapper snapshotsCountMapper = new SnapshotsCountMapper();
@Override
- public Map<Date, Long> getSnapshotsCount() {
+ public Map<Long, Long> getSnapshotsCount() {
List<Object[]> data = this.getSimpleJdbcTemplate().query(SELECT_REDHAT_USERS_COUNTS, snapshotsCountMapper);
- HashMap<Date, Long> result = new HashMap<Date, Long>();
+ Map<Long, Long> result = new HashMap<Long, Long>();
for (Object[] object : data) {
- result.put((Date) object[0], (Long) object[1]);
+ result.put((Long) object[0], (Long) object[1]);
}
return result;
@@ -88,7 +88,7 @@
@Override
public Object[] mapRow(ResultSet rs, int rowNum) throws SQLException {
Object[] row = new Object[2];
- row[0] = new Date(rs.getLong(1));
+ row[0] = rs.getLong(1);
row[1] = rs.getLong(2);
return row;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/RedHatUsersDAO.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/RedHatUsersDAO.java 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/RedHatUsersDAO.java 2010-10-20 08:49:51 UTC (rev 35585)
@@ -48,8 +48,8 @@
/**
* Get snapshots counts
*
- * @return key is date of snapshot, count of snapshots
+ * @return key is timestamp of snapshot, count of snapshots
*/
- public Map<Date, Long> getSnapshotsCount();
+ public Map<Long, Long> getSnapshotsCount();
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersAction.java 2010-10-20 08:49:51 UTC (rev 35585)
@@ -37,7 +37,10 @@
*/
public class AdminRHUsersAction extends JiveActionSupport implements Preparable {
- private Map<Date, Long> snapshots;
+ /**
+ * Key is timestamp, value is count of users
+ */
+ private Map<Long, Long> snapshots;
private RedHatUsersDAO redHatUsersDAO;
@@ -64,7 +67,7 @@
return INPUT;
}
- public Map<Date, Long> getSnapshots() {
+ public Map<Long, Long> getSnapshots() {
return snapshots;
}
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersSnapshotAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersSnapshotAction.java 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/AdminRHUsersSnapshotAction.java 2010-10-20 08:49:51 UTC (rev 35585)
@@ -40,11 +40,13 @@
*
*/
public class AdminRHUsersSnapshotAction extends JiveActionSupport {
+
protected static final Logger log = LogManager.getLogger(AdminRHUsersSnapshotAction.class);
+
/**
- * Date of snaphost
+ * Snapshot timestamp
*/
- private Date snapshotDate;
+ private Long timestamp = null;
private List<User> users = null;
@@ -52,16 +54,13 @@
@Override
public String execute() {
- if (snapshotDate == null) {
+ if (timestamp == null || timestamp == 0) {
addActionError(getText("plugin.reports.admin.rhusers.snapshot.dateRequired"));
- log.error("snapshotDate is null");
return INPUT;
}
- this.users = toUsers(redHatUsersDAO.getRedHatUsers(snapshotDate));
- log.info("users: " + users);
-
- return INPUT;
+ this.users = toUsers(redHatUsersDAO.getRedHatUsers(new Date(timestamp)));
+ return SUCCESS;
}
private List<User> toUsers(List<Long> users) {
@@ -76,7 +75,7 @@
User jiveUser = userManager.getUser(userId);
jiveUsers.add(jiveUser);
} catch (UserNotFoundException e) {
- addActionError(getText("plugin.reports.admin.rhusers.snapshot.userNotFound"));
+ addActionError(getText("plugin.reports.admin.rhusers.snapshot.userNotFound", new String[] { "" + userId }));
log.error(e);
}
}
@@ -84,17 +83,25 @@
return jiveUsers;
}
+ public static Date convertToDate(long timestamp) {
+ return new Date(timestamp);
+ }
+
public void setRedHatUsersDAO(RedHatUsersDAO redHatUsersDAO) {
this.redHatUsersDAO = redHatUsersDAO;
}
- public void setSnapshotDate(Date snapshotDate) {
- this.snapshotDate = snapshotDate;
+ public void setTimestamp(Long timestamp) {
+ this.timestamp = timestamp;
}
- public Date getSnapshotDate() {
- return snapshotDate;
+ public Long getTimestamp() {
+ return timestamp;
}
+
+ public Date getTimestampDate() {
+ return new Date(timestamp);
+ }
public List<User> getUsers() {
return users;
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers-snaphost.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers-snaphost.ftl 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers-snaphost.ftl 2010-10-20 08:49:51 UTC (rev 35585)
@@ -8,7 +8,7 @@
<body>
<#include "/template/global/include/form-message.ftl" />
- <p>Snapshot Date: ${snapshotDate?datetime}</p>
+ <p><@s.text name="plugin.reports.admin.rhusers.snapshot.timestamp" />: ${timestampDate?datetime!""}</p>
<div class="jive-table" style="border: 0pt none;">
<table style="border: 1px solid #BBBBBB">
@@ -17,12 +17,12 @@
<th><@s.text name="plugin.reports.admin.rhusers.snapshot.column.firstname"/></th>
<th><@s.text name="plugin.reports.admin.rhusers.snapshot.column.lastname"/></th>
</tr>
- <#if list??>
+ <#if users??>
<#list users as user>
<tr>
<td>${user.username}</td>
- <td>${user.firstname}</td>
- <td>${user.lastname}</td>
+ <td>${user.firstName!""}</td>
+ <td>${user.lastName!""}</td>
</tr>
</#list>
</#if>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl 2010-10-20 08:49:51 UTC (rev 35585)
@@ -22,9 +22,9 @@
</tr>
<#list snapshots.keySet() as key>
<tr>
- <td>${key?datetime}</td>
+ <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(key)?datetime}</td>
<td>${snapshots.get(key)}</td>
- <td><a href="/admin/redhat-users-snapshot.jspa?snapshotDate=${key?datetime}"><@s.text name="plugin.reports.admin.rhusers.snapshots.detail"/></a></td>
+ <td><a href="/admin/redhat-users-snapshot.jspa?timestamp=${key?string("0")}"><@s.text name="plugin.reports.admin.rhusers.snapshots.detail"/></a></td>
</tr>
</#list>
</table>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/struts.xml 2010-10-20 08:49:51 UTC (rev 35585)
@@ -23,6 +23,9 @@
<result name="input" type="freemarker">
/plugins/reports/resources/templates/admin/rhusers-snaphost.ftl
</result>
+ <result name="success" type="freemarker">
+ /plugins/reports/resources/templates/admin/rhusers-snaphost.ftl
+ </result>
</action>
</package>
Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties 2010-10-20 08:48:09 UTC (rev 35584)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties 2010-10-20 08:49:51 UTC (rev 35585)
@@ -13,6 +13,7 @@
plugin.reports.admin.rhusers.text.created=Snapshot successfuly created
plugin.reports.admin.rhusers.snapshot.name=Red Hat users snapshot details
+plugin.reports.admin.rhusers.snapshot.timestamp=Snapshot date
plugin.reports.admin.rhusers.snapshot.column.username=Username
plugin.reports.admin.rhusers.snapshot.column.firstname=Firstname
plugin.reports.admin.rhusers.snapshot.column.lastname=Lastname
More information about the jboss-svn-commits
mailing list