[jboss-cvs] JBossAS SVN: r111204 - projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core.

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

Author: gaol
Date: 2011-04-19 05:09:56 -0400 (Tue, 19 Apr 2011)
New Revision: 111204

Modified:
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceComponent.java
Log:
[JBJCA-541] allow uploaded file extension be: .rar or -ds.xml.

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceComponent.java	2011-04-19 07:28:06 UTC (rev 111203)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarResourceComponent.java	2011-04-19 09:09:56 UTC (rev 111204)
@@ -74,9 +74,9 @@
       ContentServices contentServices = contentContext.getContentServices();
       String tmpDir = System.getProperty("java.io.tmpdir");
       String fileName = pkgDetail.getFileName();
-      if (!fileName.toLowerCase().endsWith(".rar"))
+      if (!fileName.toLowerCase().endsWith(".rar") && !fileName.toLowerCase().endsWith("-ds.xml"))
       {
-         report.setErrorMessage(fileName + " is not a valid RAR file.");
+         report.setErrorMessage(fileName + " is not a valid RAR or Datasource file.");
          report.setStatus(CreateResourceStatus.FAILURE);
          return report;
       }