From a3064aea77324261be1e6b92095cae07272f9a40 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Sun, 19 Nov 2000 13:51:45 +0000
Subject: [PATCH] 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.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268211 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java     | 5 ++---
 .../apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
index 481af3392..912637d00 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
@@ -116,8 +116,7 @@ public class DDCreatorHelper {
         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 @@ public class DDCreatorHelper {
             if (!serFile.exists() || serFile.lastModified() < descriptorFile.lastModified()) {
                 
                 String[] args = {"-noexit", 
-                                 "-d", generatedFilesDirectory.getPath(),
+                                 "-d", serFile.getParent(),
                                  "-outputfile", serFile.getName(),
                                  descriptorFile.getPath()};
                 try {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
index db67e58d3..72380f40f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
@@ -256,7 +256,7 @@ public class EjbcHelper {
             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);