From 3d77ed2e095607845c48e8fc0af2f68e9b92c0ab Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 25 Mar 2010 16:45:00 +0000
Subject: [PATCH] rmic's sourcebase is broken.  PR 48970.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@927494 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  3 +++
 .../org/apache/tools/ant/taskdefs/Rmic.java   |  3 ++-
 src/tests/antunit/taskdefs/rmic-test.xml      | 27 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 6ec6b1ece..7eb1b949c 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -68,6 +68,9 @@ Fixed bugs:
    target if "ant -p" failed.
    Bugzilla Report 48980
 
+ * <rmic>'s sourcebase attribute was broken.
+   Bugzilla Report 48970
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 6dc23bc43..13a6d3bf1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -705,7 +705,8 @@ public class Rmic extends MatchingTask {
                 continue;
             }
             String sourceFileName = StringUtils.removeSuffix(generatedFile,
-                                                             ".class");
+                                                             ".class")
+                + ".java";
 
             File oldFile = new File(baseDir, sourceFileName);
             if (!oldFile.exists()) {
diff --git a/src/tests/antunit/taskdefs/rmic-test.xml b/src/tests/antunit/taskdefs/rmic-test.xml
index 65688de7e..e2b2f3a41 100644
--- a/src/tests/antunit/taskdefs/rmic-test.xml
+++ b/src/tests/antunit/taskdefs/rmic-test.xml
@@ -76,4 +76,31 @@ public class Adapter implements RmicAdapter {
     </rmic>
     <au:assertLogContains text="adapter called"/>
   </target>
+
+  <target name="testSourceBase"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=48970">
+    <mkdir dir="${input}/org/example"/>
+    <mkdir dir="${output}"/>
+    <echo file="${input}/org/example/Foo.java"><![CDATA[
+package org.example;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+public interface Foo extends Remote {
+    long bar() throws RemoteException ;
+}]]></echo>
+    <echo file="${input}/org/example/FooImpl.java"><![CDATA[
+package org.example;
+import java.rmi.RemoteException;
+public class FooImpl implements Foo {
+    public long bar() throws RemoteException {
+        return 0;
+    }
+}]]></echo>
+    <javac srcdir="${input}" destdir="${output}"/>
+    <rmic sourcebase="${input}" base="${output}">
+      <include name="**/*Impl.class"/>
+    </rmic>
+    <au:assertFileExists file="${input}/org/example/FooImpl_Stub.java"/>
+    <au:assertFileDoesntExist file="${output}/org/example/FooImpl_Stub.java"/>
+  </target>
 </project>