Revert last 5 commits

3 files changed, 36 insertions, 24 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 f20baabab..e68ddf05c 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
@@ -157,10 +157,12 @@ public class DescriptorHandler extends HandlerBase {
             return;
         }
 
-        if (getClass().getResource(location) != null && publicId != null) {
-            resourceDTDs.put(publicId, location);
-            owningTask.log("Mapped publicId " + publicId + " to resource "
+        if (getClass().getResource(location) != null) {
+            if (publicId != null) {
+                resourceDTDs.put(publicId, location);
+                owningTask.log("Mapped publicId " + publicId + " to resource "
                     + location, Project.MSG_VERBOSE);
+            }
         }
 
         try {
@@ -381,8 +383,10 @@ public class DescriptorHandler extends HandlerBase {
         }
 
         // Get the value of the <ejb-name> tag.  Only the first occurrence.
-        if (currentElement.equals(EJB_NAME) && ejbName == null) {
-            ejbName = currentText.trim();
+        if (currentElement.equals(EJB_NAME)) {
+            if (ejbName == null) {
+                ejbName = currentText.trim();
+            }
         }
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
index 40a2b7c53..4484062fa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
@@ -1081,7 +1081,12 @@ public class IPlanetEjbc {
          *         be run to bring the stubs and skeletons up to date.
          */
         public boolean mustBeRecompiled(File destDir) {
-            return destClassesModified(destDir) < sourceClassesModified(destDir);
+
+            long sourceModified = sourceClassesModified(destDir);
+
+            long destModified = destClassesModified(destDir);
+
+            return (destModified < sourceModified);
         }
 
         /**
@@ -1231,7 +1236,8 @@ public class IPlanetEjbc {
          *         names for the stubs and skeletons to be generated.
          */
         private String[] classesToGenerate() {
-            String[] classnames = iiop ? new String[NUM_CLASSES_WITH_IIOP]
+            String[] classnames = (iiop)
+                ? new String[NUM_CLASSES_WITH_IIOP]
                 : new String[NUM_CLASSES_WITHOUT_IIOP];
 
             final String remotePkg     = remote.getPackageName() + ".";
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
index ef3749f8f..33e125176 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
@@ -468,27 +468,29 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
 
         String baseName = null;
 
-        // try to find JOnAS specific convention name
-        if (getConfig().namingScheme.getValue().equals(EjbJar.NamingScheme.DESCRIPTOR)
-                && !descriptorFileName.contains(getConfig().baseNameTerminator)) {
+        if (getConfig().namingScheme.getValue().equals(EjbJar.NamingScheme.DESCRIPTOR)) {
 
-            // baseNameTerminator not found: the descriptor use the
-            // JOnAS naming convention, ie [Foo.xml,jonas-Foo.xml] and
-            // not [Foo<baseNameTerminator>-ejb-jar.xml,
-            // Foo<baseNameTerminator>-jonas-ejb-jar.xml].
+            // try to find JOnAS specific convention name
+            if (!descriptorFileName.contains(getConfig().baseNameTerminator)) {
 
-            String aCanonicalDescriptor = descriptorFileName.replace('\\', '/');
-            int lastSeparatorIndex = aCanonicalDescriptor.lastIndexOf('/');
-            int endOfBaseName;
+                // baseNameTerminator not found: the descriptor use the
+                // JOnAS naming convention, ie [Foo.xml,jonas-Foo.xml] and
+                // not [Foo<baseNameTerminator>-ejb-jar.xml,
+                // Foo<baseNameTerminator>-jonas-ejb-jar.xml].
 
-            if (lastSeparatorIndex != -1) {
-                endOfBaseName = descriptorFileName.indexOf(".xml", lastSeparatorIndex);
-            } else {
-                endOfBaseName = descriptorFileName.indexOf(".xml");
-            }
+                String aCanonicalDescriptor = descriptorFileName.replace('\\', '/');
+                int lastSeparatorIndex = aCanonicalDescriptor.lastIndexOf('/');
+                int endOfBaseName;
 
-            if (endOfBaseName != -1) {
-                baseName = descriptorFileName.substring(0, endOfBaseName);
+                if (lastSeparatorIndex != -1) {
+                    endOfBaseName = descriptorFileName.indexOf(".xml", lastSeparatorIndex);
+                } else {
+                    endOfBaseName = descriptorFileName.indexOf(".xml");
+                }
+
+                if (endOfBaseName != -1) {
+                    baseName = descriptorFileName.substring(0, endOfBaseName);
+                }
             }
         }