[jboss-cvs] JBossAS SVN: r66599 - branches/JBPAPP_4_2/test/src/main/org/jboss/test.

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

Author: wolfc
Date: 2007-10-31 07:41:50 -0400 (Wed, 31 Oct 2007)
New Revision: 66599

Modified:
   branches/JBPAPP_4_2/test/src/main/org/jboss/test/JBossTestServices.java
Log:
JBPAPP-347: Allow the usage of system properties in deployment names

Modified: branches/JBPAPP_4_2/test/src/main/org/jboss/test/JBossTestServices.java
===================================================================
--- branches/JBPAPP_4_2/test/src/main/org/jboss/test/JBossTestServices.java	2007-10-31 10:05:32 UTC (rev 66598)
+++ branches/JBPAPP_4_2/test/src/main/org/jboss/test/JBossTestServices.java	2007-10-31 11:41:50 UTC (rev 66599)
@@ -36,6 +36,7 @@
 
 import org.apache.log4j.Category;
 import org.jboss.test.util.AppCallbackHandler;
+import org.jboss.util.StringPropertyReplacer;
 
 /**
  * This is provides services for jboss junit test cases and TestSetups. It supplies
@@ -161,13 +162,15 @@
     * Otherwise, it looks for jbosstest.deploy.dir or if missing ../lib. Then it
     * tries to construct a file url or a url.
     *
-    * @param filename                   name of the file/url you want
+    * @param filenameExpression         name of the file/url you want
     * @return                           A URL
     * @exception MalformedURLException  Description of Exception
     */
-   protected URL getDeployURL(final String filename)
+   protected URL getDeployURL(final String filenameExpression)
       throws MalformedURLException
    {
+      final String filename = StringPropertyReplacer.replaceProperties(filenameExpression);
+      
       // First see if it is already a complete url.
       try
       {