Workarounds for IDL generation using ASM classes

rmic/src/main/java/org/glassfish/rmic/iiop/IDLNames.java

@@ -261,7 +261,7 @@ public static String getClassOrInterfaceName (Identifier id,
 
             // 28.3.2.5 Inner classes...
 
-            result = replace(typeName,". ","__");
+            result = toInnerClassName(typeName);
 
             // 28.3.2.4 Illegal identifier characters...
 
@@ -284,6 +284,13 @@ public static String getClassOrInterfaceName (Identifier id,
         return result;
     }
 
+    private static String toInnerClassName(String typeName) {
+        if (typeName.contains(". "))
+            return replace(typeName,". ","__");
+        else
+            return replace(typeName,"$","__");
+    }
+
     /**
      * Convert an Exception name.
      * <p>

rmic/src/test/java/org/glassfish/rmic/RmicGenerationTest.java

@@ -64,6 +64,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * Tests RMIC by comparing the kept generated source files against the expected files.
@@ -72,6 +73,7 @@ public class RmicGenerationTest {
 
     private static int testNum = 0;
     private static File rootDir;
+    private static final boolean COMPILE_GENERATED = true;  // set false to check generated files without compiling
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     @BeforeClass
@@ -103,6 +105,7 @@ public void generateIiopStubsWithoutPoa() throws Exception {
 
     @Test
     public void whenKeepNotSpecified_deleteGeneratedJavaFiles() throws Exception {
+        assumeTrue(COMPILE_GENERATED);
         GenerationControl generator = new GenerationControl(RmiIIServant.class);
         generator.addArgs("-iiop");
 
@@ -113,6 +116,7 @@ public void whenKeepNotSpecified_deleteGeneratedJavaFiles() throws Exception {
 
     @Test
     public void afterProcessing_classFilesArePresent() throws Exception {
+        assumeTrue(COMPILE_GENERATED);
         GenerationControl generator = new GenerationControl(RmiIIServant.class);
         generator.addArgs("-iiop");
 
@@ -353,6 +357,7 @@ String getWarning() {
         }
 
         private void generate() throws IOException {
+            if (argList.contains("-iiop") && !COMPILE_GENERATED) addArgs("-Xnocompile");
             for (String name : classNames)
                 addArgs(name);
             ByteArrayOutputStream out = new ByteArrayOutputStream();