conor 2003/02/12 06:35:09
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_15_BRANCH DescriptorHandler.java
GenericDeploymentTool.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.23.2.2 +6 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
Index: DescriptorHandler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -w -u -r1.23.2.1 -r1.23.2.2
--- DescriptorHandler.java 10 Feb 2003 14:25:06 -0000 1.23.2.1
+++ DescriptorHandler.java 12 Feb 2003 14:35:09 -0000 1.23.2.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -161,6 +161,11 @@
}
File fileDTD = new File(location);
+ if (!fileDTD.exists()) {
+ // resolve relative to project basedir
+ fileDTD = owningTask.getProject().resolveFile(location);
+ }
+
if (fileDTD.exists()) {
if (publicId != null) {
fileDTDs.put(publicId, fileDTD);
1.37.2.5 +4 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
Index: GenericDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -u -w -u -r1.37.2.4 -r1.37.2.5
--- GenericDeploymentTool.java 10 Feb 2003 14:25:06 -0000 1.37.2.4
+++ GenericDeploymentTool.java 12 Feb 2003 14:35:09 -0000 1.37.2.5
@@ -318,11 +318,13 @@
dependencyAnalyzer.addClassPath(config.classpath);
} catch (NoClassDefFoundError e) {
dependencyAnalyzer = null;
- task.log("Unable to load dependency analyzer: " +
analyzerClassName,
+ task.log("Unable to load dependency analyzer: " +
analyzerClassName
+ + " - dependent class not found: " + e.getMessage(),
Project.MSG_WARN);
} catch (Exception e) {
dependencyAnalyzer = null;
- task.log("Unable to load dependency analyzer: " +
analyzerClassName,
+ task.log("Unable to load dependency analyzer: " +
analyzerClassName
+ + " - exception: " + e.getMessage(),
Project.MSG_WARN);
}
}
