From f38a0348eec2633033f424fe666e9483d5a6d519 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Sun, 16 Feb 2003 13:19:40 +0000
Subject: [PATCH] Merge

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274082 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index 876e304dd..c8c6589ea 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -699,6 +699,13 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
      */
     public void validateConfigured() throws BuildException {
         super.validateConfigured();
+        if (ejbdeploy) {
+            String home = getTask().getProject().getProperty("websphere.home");
+            if (home == null) {
+                throw new BuildException("The 'websphere.home' property must be set when 'ejbdeploy=true'");
+            }
+            websphereHome = getTask().getProject().resolveFile(home);
+        }
     }