diff options
| author | Conor MacNeill <conor@apache.org> | 2001-08-08 11:43:35 +0000 |
|---|---|---|
| committer | Conor MacNeill <conor@apache.org> | 2001-08-08 11:43:35 +0000 |
| commit | 2030358e5e65e1b1b3b27bbe4d74ed09e40b6d32 (patch) | |
| tree | adbcffff06f97029c35cf5687effed3bfc7343f4 /src/main/org | |
| parent | 8e8d51c354df7a741acbc48987b05e3d79ed8f9d (diff) | |
| download | ant-2030358e5e65e1b1b3b27bbe4d74ed09e40b6d32.tar.gz | |
Ignore any classes from java. and javax hierarchies. This allows
classes such as java.math.BigDecimal to be used as keys.
I also turned the missing file exception into a warning. Who knows
maybe the app server can find it even if ejbjar can't.
Submitted by: Luis Miguel Hernanz <luish@germinus.com>
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269516 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/main/org')
| -rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java | 3 | ||||
| -rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java index 406fe086e..ed43acee2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java @@ -338,7 +338,8 @@ public class DescriptorHandler extends org.xml.sax.HandlerBase { // If it's a primitive wrapper then we shouldn't try and put // it into the jar, so ignore it. - if (!className.startsWith("java.lang")) { + if (!className.startsWith("java.") && + !className.startsWith("javax.")) { // Translate periods into path separators, add .class to the // name, create the File object and add it to the Hashtable. className = className.replace('.', File.separatorChar); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index c052d1fa8..c0c20f0f8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -262,10 +262,9 @@ public class GenericDeploymentTool implements EJBDeploymentTool { } } catch (IOException ioe) { - String msg = "IOException while adding entry " - + logicalFilename + " to jarfile from " + inputFile.getPath() + "." - + ioe.getMessage(); - throw new BuildException(msg, ioe); + log("WARNING: IOException while adding entry " + + logicalFilename + " to jarfile from " + inputFile.getPath() + " " + + ioe.getClass().getName() + "-" + ioe.getMessage(), Project.MSG_WARN); } finally { // Close up the file input stream for the class file |