conor 01/02/05 02:45:55
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
WeblogicTOPLinkDeploymentTool.java
Log:
Fix up the location where the toplink element looks for descriptors.
Thanks to much persistence by Cyril Bouteille <[EMAIL PROTECTED]>
Revision Changes Path
1.5 +14 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
Index: WeblogicTOPLinkDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WeblogicTOPLinkDeploymentTool.java 2001/01/26 05:43:46 1.4
+++ WeblogicTOPLinkDeploymentTool.java 2001/02/05 10:45:55 1.5
@@ -108,12 +108,25 @@
// Setup a naming standard here?.
- File toplinkDD = new File(getConfig().descriptorDir,
toplinkDescriptor);
+ File toplinkDD = null;
+ if (usingBaseJarName()) {
+ toplinkDD = new File(getConfig().descriptorDir,
toplinkDescriptor);
+ }
+ else {
+ String ddPrefix = baseName + getConfig().baseNameTerminator;
+ File actualDir = (new File(getConfig().descriptorDir,
ddPrefix)).getParentFile();
+ toplinkDD = new File(actualDir, toplinkDescriptor);
+ }
+
if (toplinkDD.exists()) {
ejbFiles.put(META_DIR + toplinkDescriptor,
toplinkDD);
}
+ else {
+ log("Unable to locate toplink deployment descriptor. It was
expected to be in " +
+ toplinkDD.getPath(), Project.MSG_WARN);
+ }
}
/**
