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

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

Author: lkrzyzanek
Date: 2010-10-25 10:08:27 -0400 (Mon, 25 Oct 2010)
New Revision: 35713

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.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/resources/plugin_i18n.properties
Log:
Added Configuration Error of Report status

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java	2010-10-25 13:59:07 UTC (rev 35712)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/java/org/jboss/community/sbs/plugin/reports/dao/ReportBean.java	2010-10-25 14:08:27 UTC (rev 35713)
@@ -29,7 +29,7 @@
 public class ReportBean {
 
   public enum STATUS {
-    CREATED(0), STARTED(1), FINISHED(10), ERROR(11);
+    CREATED(0), STARTED(1), FINISHED(10), ERROR(11), CONFIG_ERROR(12);
 
     int code;
 

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 13:59:07 UTC (rev 35712)
+++ 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 14:08:27 UTC (rev 35713)
@@ -31,6 +31,7 @@
 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.jboss.community.sbs.plugin.reports.monthly.config.ReportConfigFileParsingException;
 import org.springframework.dao.DataRetrievalFailureException;
 
 import com.jivesoftware.community.Attachment;
@@ -64,7 +65,7 @@
   public static String getConfigurationDocumentId() {
     return JiveGlobals.getJiveProperty(CONFIGURATION_DOCUMENT_ID_PROPERTY);
   }
-  
+
   @Override
   public Iterator<Attachment> getConfigurations() {
     String configurationDocument = getConfigurationDocumentId();
@@ -136,7 +137,11 @@
 
   public void reportFailed(ReportBean report, Exception e) {
     log.error(e);
-    report.setStatus(ReportBean.STATUS.ERROR.intValue());
+    if (e instanceof ReportConfigFileParsingException) {
+      report.setStatus(ReportBean.STATUS.CONFIG_ERROR.intValue());
+    } else {
+      report.setStatus(ReportBean.STATUS.ERROR.intValue());
+    }
     report.setStatusMessage(e.getMessage());
     reportDAO.updateReportStatus(report);
   }

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 13:59:07 UTC (rev 35712)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs/reports/trunk/src/main/resources/plugin_i18n.properties	2010-10-25 14:08:27 UTC (rev 35713)
@@ -43,4 +43,5 @@
 plugin.reports.admin.monthlyrep.reports.status.0=Created
 plugin.reports.admin.monthlyrep.reports.status.1=Report is creating
 plugin.reports.admin.monthlyrep.reports.status.10=Finished
-plugin.reports.admin.monthlyrep.reports.status.11=Error
\ No newline at end of file
+plugin.reports.admin.monthlyrep.reports.status.11=Error
+plugin.reports.admin.monthlyrep.reports.status.12=Aggregate Configuration Error