djencks 2005/03/18 03:26:10
Modified: modules/core/src/java/org/openejb/corba/compiler
AntCompiler.java OpenORBSkeletonGenerator.java
OpenORBStubGenerator.java
Log:
Use jsr-77 like names for corba gbeans. Also fix a stupid mistake in
OpenORBStubClassLoader
Revision Changes Path
1.4 +4 -3
openejb/modules/core/src/java/org/openejb/corba/compiler/AntCompiler.java
Index: AntCompiler.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/compiler/AntCompiler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntCompiler.java 13 Mar 2005 03:19:58 -0000 1.3
+++ AntCompiler.java 18 Mar 2005 08:26:09 -0000 1.4
@@ -56,6 +56,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
@@ -96,7 +97,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(AntCompiler.class);
+ GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(AntCompiler.class, NameFactory.CORBA_SERVICE);
infoFactory.addInterface(Compiler.class);
1.11 +4 -4
openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBSkeletonGenerator.java
Index: OpenORBSkeletonGenerator.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBSkeletonGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OpenORBSkeletonGenerator.java 18 Mar 2005 00:48:59 -0000 1.10
+++ OpenORBSkeletonGenerator.java 18 Mar 2005 08:26:09 -0000 1.11
@@ -217,11 +217,11 @@
// Install the lame tools jar hack
ToolsJarHack.install();
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(OpenORBSkeletonGenerator.class);
+ GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(OpenORBSkeletonGenerator.class, NameFactory.CORBA_SERVICE);
infoFactory.addInterface(SkeletonGenerator.class);
infoFactory.addAttribute("verbose", Boolean.TYPE, true);
infoFactory.addAttribute("props", Properties.class, true);
- infoFactory.addReference("Compiler", Compiler.class,
NameFactory.GERONIMO_SERVICE);
+ infoFactory.addReference("Compiler", Compiler.class,
NameFactory.CORBA_SERVICE);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
infoFactory.setConstructor(new String[]{"classLoader"});
1.7 +4 -4
openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBStubGenerator.java
Index: OpenORBStubGenerator.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/compiler/OpenORBStubGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OpenORBStubGenerator.java 18 Mar 2005 01:35:07 -0000 1.6
+++ OpenORBStubGenerator.java 18 Mar 2005 08:26:10 -0000 1.7
@@ -213,11 +213,11 @@
// Install the lame tools jar hack
ToolsJarHack.install();
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(OpenORBStubGenerator.class);
+ GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(OpenORBStubGenerator.class, NameFactory.CORBA_SERVICE);
infoFactory.addInterface(StubGenerator.class);
infoFactory.addAttribute("verbose", Boolean.TYPE, true);
infoFactory.addAttribute("props", Properties.class, true);
- infoFactory.addReference("Compiler", Compiler.class,
NameFactory.GERONIMO_SERVICE);
+ infoFactory.addReference("Compiler", Compiler.class,
NameFactory.CORBA_SERVICE);
GBEAN_INFO = infoFactory.getBeanInfo();
}
