You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2003/02/12 15:29:07 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb DescriptorHandler.java GenericDeploymentTool.java
conor 2003/02/12 06:29:07
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
DescriptorHandler.java GenericDeploymentTool.java
Log:
Resolve DTD locations relative to project basedir
Also more into when dependency analyzer cannot be found.
PR: 13271
Revision Changes Path
1.26 +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.25
retrieving revision 1.26
diff -u -w -u -r1.25 -r1.26
--- DescriptorHandler.java 10 Feb 2003 14:13:49 -0000 1.25
+++ DescriptorHandler.java 12 Feb 2003 14:29:07 -0000 1.26
@@ -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
@@ -159,6 +159,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.44 +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.43
retrieving revision 1.44
diff -u -w -u -r1.43 -r1.44
--- GenericDeploymentTool.java 10 Feb 2003 14:13:49 -0000 1.43
+++ GenericDeploymentTool.java 12 Feb 2003 14:29:07 -0000 1.44
@@ -315,11 +315,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);
}
}