Allow policy file to exist outside of Weblogic Home

PR:	1161


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269332 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java

@@ -183,29 +183,39 @@ public class WLRun extends Task {
                                      " is not valid");
         }
 
+        File securityPolicyFile = null;
+        if (securityPolicy == null) {
+            securityPolicyFile = new File(weblogicSystemHome, DEFAULT_WL60_POLICY_FILE);
+        }
+        else {
+            securityPolicyFile = new File(weblogicSystemHome, securityPolicy);
+        }
+
+        if (!securityPolicyFile.exists()) {
+            // OK it maybe an absolute path. Use the project to resolve it
+            securityPolicyFile = project.resolveFile(securityPolicy);
+            if (!securityPolicyFile.exists()) {
+                throw new BuildException("Security policy " + securityPolicy +
+                                         " was not found.");
+            }                                         
+        }
+
+
         if (beaHome != null) {
-            executeWLS6();
+            executeWLS6(securityPolicyFile);
         }
         else {
-            executeWLS();
+            executeWLS(securityPolicyFile);
         }
     }
     
-    private void executeWLS6() {
+    private void executeWLS6(File securityPolicyFile) {
         
         if (!beaHome.isDirectory()) {
             throw new BuildException("BEA home " + beaHome.getPath() + 
                                      " is not valid");
         }
         
-        File securityPolicyFile = null;
-        if (securityPolicy == null) {
-            securityPolicyFile = new File(weblogicSystemHome, DEFAULT_WL60_POLICY_FILE);
-        }
-        else {
-            securityPolicyFile = new File(weblogicSystemHome, securityPolicy);
-        }
-
         File configFile = new File(weblogicSystemHome, "config/" + weblogicDomainName + "/config.xml");
         if (!configFile.exists()) {
             throw new BuildException("Server config file " + configFile + " not found.");
@@ -249,7 +259,7 @@ public class WLRun extends Task {
         }
      }
     
-    private void executeWLS() {
+    private void executeWLS(File securityPolicyFile) {
 
         File propertiesFile = null;
         
@@ -260,21 +270,13 @@ public class WLRun extends Task {
             propertiesFile = new File(weblogicSystemHome, weblogicPropertiesFile);
         }
         if (!propertiesFile.exists()) {
-            throw new BuildException("Properties file " + weblogicPropertiesFile +
-                                     " not found in weblogic home " + weblogicSystemHome);
-        }
-
-        File securityPolicyFile = null;
-        if (securityPolicy == null) {
-            securityPolicyFile = new File(weblogicSystemHome, DEFAULT_WL51_POLICY_FILE);
-        }
-        else {
-            securityPolicyFile = new File(weblogicSystemHome, securityPolicy);
-        }
-        
-        if (!securityPolicyFile.exists()) {
-            throw new BuildException("Security policy " + securityPolicyFile +
-                                     " was not found.");
+            // OK, properties file may be absolute
+            propertiesFile = project.resolveFile(weblogicPropertiesFile);
+            if (!propertiesFile.exists()) {
+                throw new BuildException("Properties file " + weblogicPropertiesFile +
+                                         " not found in weblogic home " + weblogicSystemHome +
+                                         " or as absolute file");
+            }                                         
         }
 
         Java weblogicServer = (Java)project.createTask("java");