Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org Received: (qmail 91928 invoked by uid 500); 8 Aug 2001 11:54:22 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk Reply-To: ant-dev@jakarta.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 91919 invoked by uid 500); 8 Aug 2001 11:54:21 -0000 Delivered-To: apmail-jakarta-ant-cvs@apache.org Date: 8 Aug 2001 11:52:25 -0000 Message-ID: <20010808115225.77779.qmail@icarus.apache.org> From: conor@apache.org To: jakarta-ant-cvs@apache.org Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb BorlandDeploymentTool.java X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N conor 01/08/08 04:52:25 Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb BorlandDeploymentTool.java Log: Fixes to the borland ejbjar component to get it to handle non-windows builds. Make work with ejb-naming schemes Submitted by: Tom Palmer Revision Changes Path 1.8 +2 -2 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java Index: BorlandDeploymentTool.java =================================================================== RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- BorlandDeploymentTool.java 2001/07/07 12:57:36 1.7 +++ BorlandDeploymentTool.java 2001/08/08 11:52:25 1.8 @@ -110,7 +110,7 @@ protected static final String BAS_DD = "ejb-inprise.xml"; /** Java2iiop executable **/ - protected static final String JAVA2IIOP = "java2iiop.exe"; + protected static final String JAVA2IIOP = "java2iiop"; /** Verify class */ protected static final String VERIFY = "com.inprise.ejb.util.Verify"; @@ -218,7 +218,7 @@ File borlandDD = new File(getConfig().descriptorDir,BAS_DD); if (borlandDD.exists()) { log("Borland specific file found "+ borlandDD, Project.MSG_VERBOSE); - ejbFiles.put(META_DIR + BAS_DD, borlandDD); + ejbFiles.put(META_DIR + BAS_DD, ddPrefix + borlandDD); } else { log("Unable to locate borland deployment descriptor. It was expected to be in " +