[jboss-svn-commits] JBL Code SVN: r35707 - in labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main: java/org/jboss/community/sbs/plugin/reports/monthly and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Oct 25 08:55:50 EDT 2010


Author: lkrzyzanek
Date: 2010-10-25 08:55:48 -0400 (Mon, 25 Oct 2010)
New Revision: 35707

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManager.java
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/MonthlyReportsAction.java
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl
   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/schema.xml
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties
Log:
Added Aggregate Configuration
Improved format of timestamps

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/DbReportDAOImpl.java	2010-10-25 12:55:48 UTC (rev 35707)
@@ -43,12 +43,12 @@
 
   public static final int DB_REPORT_SEQ = 6000;
 
-  private static final String SELECT_ALL_REPORTS = "SELECT id, fromDate, toDate, redHatUsersSnapshot, status, statusMessage FROM reportsMonthly";
+  private static final String SELECT_ALL_REPORTS = "SELECT id, fromDate, toDate, redHatUsersSnapshot, configurationId, status, statusMessage FROM reportsMonthly";
 
   private static final String SELECT_REPORT_BY_ID = SELECT_ALL_REPORTS + " WHERE id = ?";
 
-  private static final String INSERT_REPORT = "INSERT INTO reportsMonthly (id, fromDate, toDate, redHatUsersSnapshot, status, statusMessage) "
-      + "VALUES (?, ?, ?, ?, ?, ?)";
+  private static final String INSERT_REPORT = "INSERT INTO reportsMonthly (id, fromDate, toDate, redHatUsersSnapshot, configurationId, status, statusMessage) "
+      + "VALUES (?, ?, ?, ?, ?, ?, ?)";
 
   private static final String UPDATE_REPORT_STATUS = "UPDATE reportsMonthly SET status = ?, statusMessage = ? WHERE id = ?";
 
@@ -60,7 +60,7 @@
     bean.setId(SequenceManager.nextID(DB_REPORT_SEQ));
 
     getSimpleJdbcTemplate().update(INSERT_REPORT, bean.getId(), bean.getFrom(), bean.getTo(),
-        bean.getRedHatUsersSnapshot(), bean.getStatus(), bean.getStatusMessage());
+        bean.getRedHatUsersSnapshot(), bean.getConfigurationId(), bean.getStatus(), bean.getStatusMessage());
 
     return bean;
   }
@@ -110,8 +110,9 @@
       bean.setFrom(rs.getLong(2));
       bean.setTo(rs.getLong(3));
       bean.setRedHatUsersSnapshot(rs.getLong(4));
-      bean.setStatus(rs.getInt(5));
-      bean.setStatusMessage(rs.getString(6));
+      bean.setConfigurationId(rs.getLong(5));
+      bean.setStatus(rs.getInt(6));
+      bean.setStatusMessage(rs.getString(7));
       return bean;
     }
   }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManager.java	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManager.java	2010-10-25 12:55:48 UTC (rev 35707)
@@ -23,10 +23,13 @@
 
 import java.io.InputStream;
 import java.util.Date;
+import java.util.Iterator;
 
+import com.jivesoftware.community.Attachment;
+
 /**
+ * Manager related to Monthly report
  * 
- * 
  * @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
  */
 public interface MonthlyReportManager {
@@ -39,7 +42,15 @@
    * @param from
    * @param to
    * @param redHatUsersSnapshot
+   * @param configurationID
    */
-  public void generateReport(Date from, Date to, Date redHatUsersSnapshot);
+  public void generateReport(Date from, Date to, Date redHatUsersSnapshot, long configurationID);
 
+  /**
+   * Get all configurations
+   * 
+   * @return
+   */
+  public Iterator<Attachment> getConfigurations();
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/monthly/MonthlyReportManagerImpl.java	2010-10-25 12:55:48 UTC (rev 35707)
@@ -25,12 +25,22 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Date;
+import java.util.Iterator;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.jboss.community.sbs.plugin.reports.dao.ReportBean;
 import org.jboss.community.sbs.plugin.reports.dao.ReportDAO;
+import org.springframework.dao.DataRetrievalFailureException;
 
+import com.jivesoftware.community.Attachment;
+import com.jivesoftware.community.AttachmentManager;
+import com.jivesoftware.community.AttachmentNotFoundException;
+import com.jivesoftware.community.Document;
+import com.jivesoftware.community.DocumentManager;
+import com.jivesoftware.community.DocumentObjectNotFoundException;
+import com.jivesoftware.community.JiveGlobals;
+
 /**
  * Implementation of {@link MonthlyReportManager} which uses
  * {@link ReportGenerator}
@@ -41,26 +51,65 @@
 
   private static final Logger log = LogManager.getLogger(MonthlyReportManagerImpl.class);
 
+  public static final String CONFIGURATION_DOCUMENT_ID_PROPERTY = "jbossorg.reports.monthly.configurationDocumentID";
+
   private ReportDAO reportDAO;
 
   private ReportGenerator reportGenerator;
 
+  private AttachmentManager attachmentManager;
+
+  private DocumentManager documentManager;
+
+  public static String getConfigurationDocumentId() {
+    return JiveGlobals.getJiveProperty(CONFIGURATION_DOCUMENT_ID_PROPERTY);
+  }
+  
   @Override
-  public void generateReport(Date from, Date to, Date redHatUsersSnapshot) {
+  public Iterator<Attachment> getConfigurations() {
+    String configurationDocument = getConfigurationDocumentId();
+    if (configurationDocument == null) {
+      log.error("jbossorg.reports.monthly.configurationDocumentID property is not defined");
+      return null;
+    }
+    try {
+      Document doc = documentManager.getDocument(configurationDocument);
+      return attachmentManager.getAttachments(doc);
+    } catch (DocumentObjectNotFoundException e) {
+      log.error(e);
+      return null;
+    }
+  }
+
+  @Override
+  public void generateReport(Date from, Date to, Date redHatUsersSnapshot, long configurationID) {
     if (log.isInfoEnabled()) {
       log.info("Generate report (" + from + " - " + to + "). RH UsersSnapshot: " + redHatUsersSnapshot);
     }
 
+    InputStream configStream = null;
+    try {
+      Attachment config = attachmentManager.getAttachment(configurationID);
+      configStream = config.getData();
+    } catch (AttachmentNotFoundException e) {
+      log.error(e);
+      throw new DataRetrievalFailureException(e.getMessage());
+    } catch (IOException e) {
+      log.error(e);
+      throw new DataRetrievalFailureException(e.getMessage());
+    }
+
     ReportBean report = new ReportBean();
     report.setFrom(from.getTime());
     report.setTo(to.getTime());
     report.setRedHatUsersSnapshot(redHatUsersSnapshot.getTime());
+    report.setConfigurationId(configurationID);
     report.setStatus(ReportBean.STATUS.CREATED.intValue());
     report.setStatusMessage("Pending in queue");
 
     ReportBean dbBean = reportDAO.createReport(report);
 
-    ReportGeneratorThread generatorThread = new ReportGeneratorThread(dbBean);
+    ReportGeneratorThread generatorThread = new ReportGeneratorThread(dbBean, configStream);
     generatorThread.start();
   }
 
@@ -102,18 +151,18 @@
 
     private ReportBean report;
 
-    public ReportGeneratorThread(ReportBean report) {
+    private InputStream configStream;
+
+    public ReportGeneratorThread(ReportBean report, InputStream configStream) {
       super("ReportGeneratorThread-reportID: " + report.getId());
       this.report = report;
+      this.configStream = configStream;
     }
 
     @Override
     public void run() {
-      InputStream configStream = null;
       try {
         reportStarted(report);
-        // TODO load configuration
-        configStream = MonthlyReportManagerImpl.class.getResourceAsStream("/aggregated-report-definition.xml");
         String result = reportGenerator.generateReport(configStream, new Date(report.getFrom()),
             new Date(report.getTo()), new Date(report.getRedHatUsersSnapshot()), new JiveSystemConfigProvider());
         configStream.close();
@@ -148,4 +197,12 @@
     return reportGenerator;
   }
 
+  public void setDocumentManager(DocumentManager documentManager) {
+    this.documentManager = documentManager;
+  }
+
+  public void setAttachmentManager(AttachmentManager attachmentManager) {
+    this.attachmentManager = attachmentManager;
+  }
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/MonthlyReportsAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/MonthlyReportsAction.java	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/struts/MonthlyReportsAction.java	2010-10-25 12:55:48 UTC (rev 35707)
@@ -25,6 +25,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -33,6 +34,7 @@
 import org.jboss.community.sbs.plugin.reports.dao.ReportDAO;
 import org.jboss.community.sbs.plugin.reports.monthly.MonthlyReportManager;
 
+import com.jivesoftware.community.Attachment;
 import com.jivesoftware.community.action.JiveActionSupport;
 import com.opensymphony.xwork2.Preparable;
 import com.opensymphony.xwork2.validator.annotations.Validation;
@@ -55,6 +57,8 @@
 
   private List<Long> snapshots;
 
+  private Iterator<Attachment> configurations;
+
   /**
    * Report range - from
    */
@@ -70,6 +74,11 @@
    */
   private Long redHatUsersSnapshot;
 
+  /**
+   * ID of configuration
+   */
+  private Long configurationID;
+
   private ReportDAO reportDAO;
 
   private RedHatUsersDAO redHatUsersDAO;
@@ -79,6 +88,7 @@
   public void prepare() {
     reports = reportDAO.getAllReports();
     snapshots = redHatUsersDAO.getSnapshots();
+    configurations = monthlyReportManager.getConfigurations();
   }
 
   private void resetForm() {
@@ -99,6 +109,10 @@
       addActionError(getText("plugin.reports.admin.monthlyrep.error.required",
           new String[] { "Red Hat Users Snapshot" }));
     }
+    if (configurationID == null) {
+      addActionError(getText("plugin.reports.admin.monthlyrep.error.required",
+          new String[] { "Agregator Configuration" }));
+    }
   }
 
   @Override
@@ -125,7 +139,7 @@
       return INPUT;
     }
 
-    monthlyReportManager.generateReport(fromDate, toDate, redHatUsersSnapshotDate);
+    monthlyReportManager.generateReport(fromDate, toDate, redHatUsersSnapshotDate, configurationID);
 
     reports = reportDAO.getAllReports();
 
@@ -187,4 +201,16 @@
     this.redHatUsersDAO = redHatUsersDAO;
   }
 
+  public Long getConfigurationID() {
+    return configurationID;
+  }
+
+  public void setConfigurationID(Long configurationID) {
+    this.configurationID = configurationID;
+  }
+
+  public Iterator<Attachment> getConfigurations() {
+    return configurations;
+  }
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/monthly-reports.ftl	2010-10-25 12:55:48 UTC (rev 35707)
@@ -11,18 +11,30 @@
     <table>
     <@s.form theme="simple" action="create-monthly-report">
       <tr><td><@s.text name="plugin.reports.admin.monthlyrep.from"/> <span>*</span>:</td>
-          <td><@s.textfield name="from" required="true"/></td></tr>
+          <td><@s.textfield name="from" required="true"/>&nbsp;<@s.text name="plugin.reports.admin.monthlyrep.from.desc" /></td>
+      </tr>
       <tr><td><@s.text name="plugin.reports.admin.monthlyrep.to"/> <span>*</span>:</td>
-          <td><@s.textfield name="to" required="true"/></td></tr>
+          <td><@s.textfield name="to" required="true"/>&nbsp;<@s.text name="plugin.reports.admin.monthlyrep.to.desc" /></td></tr>
       <tr><td><@s.text name="plugin.reports.admin.monthlyrep.snapshot"/> <span>*</span>:</td>
           <td>
             <select name="redHatUsersSnapshot">
             <#list snapshots as s>
-              <option value="${s}">${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(s)?datetime}</option>
+              <option value="${s}">${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(s)?string("yyyy-MM-dd HH:mm:ss")}</option>
             </#list>
             </select>
           </td>
       </tr>
+      <tr><td><@s.text name="plugin.reports.admin.monthlyrep.configuration"/> <span>*</span>:</td>
+          <td>
+            <select name="configurationID">
+            <#list configurations as c>
+              <option value="${c.ID?string("0")}">${c.ID?string("0")} - ${c.name}</option>
+            </#list>
+            </select>
+            &nbsp;
+            <a href="/docs/${statics['org.jboss.community.sbs.plugin.reports.monthly.MonthlyReportManagerImpl'].getConfigurationDocumentId()}"><@s.text name="plugin.reports.admin.monthlyrep.configuration.link"/></a>
+          </td>
+      </tr>
       <tr><td></td><td><@s.submit value="${action.getText('plugin.reports.admin.monthlyrep.createreport')}"/>
     </@s.form>
     </table>
@@ -43,10 +55,10 @@
         <tbody>
         <#list reports as report>
         <tr>
-          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.from)?datetime}</td>
-          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.to)?datetime}</td>
-          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.redHatUsersSnapshot)?datetime}</td>
-          <td>${report.configurationId}</td>
+          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.from)?string("yyyy-MM-dd HH:mm:ss")}</td>
+          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.to)?string("yyyy-MM-dd HH:mm:ss")}</td>
+          <td><a href="/admin/redhat-users-snapshot.jspa?timestamp=${report.redHatUsersSnapshot?string("0")}">${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(report.redHatUsersSnapshot)?string("yyyy-MM-dd HH:mm:ss")}</a></td>
+          <td>${report.configurationId?string("0")}</td>
           <td><@s.text name="plugin.reports.admin.monthlyrep.reports.status.#{report.status}"/> <#if report.statusMessage??><br/>${report.statusMessage}</#if></td>
           <td><#if report.status == 10><a href="/admin/download-monthly-report.jspa?reportId=${report.id?string("0")}"><@s.text name="plugin.reports.admin.monthlyrep.reports.download"/></a></#if></td>
         </tr>

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-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers-snaphost.ftl	2010-10-25 12:55:48 UTC (rev 35707)
@@ -8,7 +8,7 @@
   <body>
     <#include "/template/global/include/form-message.ftl" />
 
-    <p><@s.text name="plugin.reports.admin.rhusers.snapshot.timestamp" />: ${timestampDate?datetime!""}</p>
+    <p><@s.text name="plugin.reports.admin.rhusers.snapshot.timestamp" />: ${timestampDate?string("yyyy-MM-dd HH:mm:ss")!""}</p>
 
     <div class="jive-table" style="border: 0pt none;">
       <table style="border: 1px solid #BBBBBB">

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-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/resources/templates/admin/rhusers.ftl	2010-10-25 12:55:48 UTC (rev 35707)
@@ -22,7 +22,7 @@
         </tr>
         <#list snapshots.keySet() as key>
         <tr>
-          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(key)?datetime}</td>
+          <td>${statics['org.jboss.community.sbs.plugin.reports.struts.AdminRHUsersSnapshotAction'].convertToDate(key)?string("yyyy-MM-dd HH:mm:ss")}</td>
           <td>${snapshots.get(key)}</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>

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/schema.xml	2010-10-25 12:55:48 UTC (rev 35707)
@@ -11,8 +11,7 @@
     <column name="fromDate" type="bigint" nullable="false" description="Report from" />
     <column name="toDate" type="bigint" nullable="false" description="Report to" />
     <column name="redHatUsersSnapshot" type="bigint" nullable="false" description="Red Hat Users Snapshot" />
-    <!-- TODO: ConfigurationID <column name="configurationId" type="bigint" nullable="false" description="Red Hat Users Snapshot" 
-      /> -->
+    <column name="configurationId" type="bigint" nullable="false" description="Configuration ID (ID of Attachment)" />
     <column name="status" type="int" nullable="false" description="Status of report" />
     <column name="statusMessage" type="varchar" size="100" nullable="true" description="Status message" />
     <column name="reportData" type="blob" nullable="true" description="Report data" />

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml	2010-10-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/plugin/spring.xml	2010-10-25 12:55:48 UTC (rev 35707)
@@ -21,6 +21,8 @@
   <bean id="monthlyReportManager" class="org.jboss.community.sbs.plugin.reports.monthly.MonthlyReportManagerImpl">
     <property name="reportDAO" ref="reportDAO" />
     <property name="reportGenerator" ref="reportGenerator" />
+    <property name="documentManager" ref="documentManager" />
+    <property name="attachmentManager" ref="attachmentManager" />
   </bean>
 
   <bean id="reportGenerator" class="org.jboss.community.sbs.plugin.reports.monthly.ReportGenerator">

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-25 12:07:42 UTC (rev 35706)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties	2010-10-25 12:55:48 UTC (rev 35707)
@@ -23,8 +23,12 @@
 plugin.reports.admin.monthlyrep.name=Monthly Reports
 plugin.reports.admin.monthlyrep.description=View and create Monthly Reports
 plugin.reports.admin.monthlyrep.from=From
+plugin.reports.admin.monthlyrep.from.desc=Format: yyyy-MM-dd
 plugin.reports.admin.monthlyrep.to=To
+plugin.reports.admin.monthlyrep.to.desc=Format: yyyy-MM-dd
 plugin.reports.admin.monthlyrep.snapshot=Red Hat Users Snapshot
+plugin.reports.admin.monthlyrep.configuration=Agregator configuration
+plugin.reports.admin.monthlyrep.configuration.link=Change configuration
 plugin.reports.admin.monthlyrep.createreport=Create report
 plugin.reports.admin.monthlyrep.error.dateFormat=Date must be in {0} format.
 plugin.reports.admin.monthlyrep.error.required=Field {0} is required.
@@ -32,7 +36,7 @@
 
 plugin.reports.admin.monthlyrep.reports.caption=Available reports
 plugin.reports.admin.monthlyrep.reports.column.snapshot=Snapshot
-plugin.reports.admin.monthlyrep.reports.column.version=Version
+plugin.reports.admin.monthlyrep.reports.column.version=Configuration Version
 plugin.reports.admin.monthlyrep.reports.column.status=Status
 plugin.reports.admin.monthlyrep.reports.column.action=Action
 plugin.reports.admin.monthlyrep.reports.download=Download



More information about the jboss-svn-commits mailing list