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...@locus.apache.org on 2000/11/19 14:51:46 UTC
cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb DDCreatorHelper.java EjbcHelper.java
conor 00/11/19 05:51:45
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
DDCreatorHelper.java EjbcHelper.java
Log:
Make both ddcreator and ejbc respect the hierarchy of the descriptors.
So, when writing the .ser file, it will be placed into the same relative
directory in which the source .txt file is found in the descriptor hierarchy.
Similary the .ser files will have the correct manifest entires in the generated
manifest file.
Revision Changes Path
1.3 +2 -3 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
Index: DDCreatorHelper.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DDCreatorHelper.java 2000/11/07 12:17:13 1.2
+++ DDCreatorHelper.java 2000/11/19 13:51:45 1.3
@@ -116,8 +116,7 @@
for (int i = 0; i < descriptors.length; ++i) {
String descriptorName = descriptors[i];
File descriptorFile = new File(descriptorDirectory, descriptorName);
- // flatten the generated file so all go into the
- descriptorName = descriptorFile.getName();
+
int extIndex = descriptorName.lastIndexOf(".");
String serName = null;
if (extIndex != -1) {
@@ -132,7 +131,7 @@
if (!serFile.exists() || serFile.lastModified() < descriptorFile.lastModified()) {
String[] args = {"-noexit",
- "-d", generatedFilesDirectory.getPath(),
+ "-d", serFile.getParent(),
"-outputfile", serFile.getName(),
descriptorFile.getPath()};
try {
1.7 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
Index: EjbcHelper.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EjbcHelper.java 2000/11/19 09:08:57 1.6
+++ EjbcHelper.java 2000/11/19 13:51:45 1.7
@@ -256,7 +256,7 @@
else {
System.out.println(descriptorFile.getName() + " is up to date");
}
- manifest += "Name: " + descriptorFile.getName() + "\nEnterprise-Bean: True\n\n";
+ manifest += "Name: " + descriptorName.replace('\\', '/') + "\nEnterprise-Bean: True\n\n";
}
FileWriter fw = new FileWriter(manifestFile);