maguro 2004/11/10 15:25:10
Modified: modules/core/src/java/org/openejb/corba/compiler
OpenORBSkeletonGenerator.java
SkeletonGenerator.java
Log:
Fixes for my GBeans.
Revision Changes Path
1.3 +16 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenORBSkeletonGenerator.java 10 Nov 2004 04:38:31 -0000 1.2
+++ OpenORBSkeletonGenerator.java 10 Nov 2004 20:25:10 -0000 1.3
@@ -50,6 +50,7 @@
import java.util.HashSet;
import java.util.Set;
import java.util.Iterator;
+import java.util.Properties;
import org.openorb.compiler.CompilerHost;
import org.openorb.compiler.object.IdlObject;
@@ -76,12 +77,13 @@
/**
* @version $Revision$ $Date$
*/
-public class OpenORBSkeletonGenerator extends SkeletonGenerator implements
GBeanLifecycle, CompilerHost {
+public class OpenORBSkeletonGenerator implements SkeletonGenerator,
GBeanLifecycle, CompilerHost {
private static Log log =
LogFactory.getLog(OpenORBSkeletonGenerator.class);
private final ClassLoader classLoader;
private boolean verbose;
+ private Properties props = new Properties();
private Compiler compiler;
public OpenORBSkeletonGenerator(ClassLoader classLoader) {
@@ -96,6 +98,14 @@
this.verbose = verbose;
}
+ public Properties getProps() {
+ return props;
+ }
+
+ public void setProps(Properties props) {
+ this.props = props;
+ }
+
public Compiler getCompiler() {
return compiler;
}
@@ -194,8 +204,10 @@
// Install the lame tools jar hack
ToolsJarHack.install();
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(OpenORBSkeletonGenerator.class, SkeletonGenerator.GBEAN_INFO);
+ GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(OpenORBSkeletonGenerator.class);
+ infoFactory.addInterface(SkeletonGenerator.class);
infoFactory.addAttribute("verbose", Boolean.TYPE, true);
+ infoFactory.addAttribute("props", Properties.class, true);
infoFactory.addReference("Compiler", Compiler.class);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
infoFactory.setConstructor(new String[]{"classLoader"});
1.3 +4 -28
openejb/modules/core/src/java/org/openejb/corba/compiler/SkeletonGenerator.java
Index: SkeletonGenerator.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/compiler/SkeletonGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SkeletonGenerator.java 10 Nov 2004 04:38:31 -0000 1.2
+++ SkeletonGenerator.java 10 Nov 2004 20:25:10 -0000 1.3
@@ -57,31 +57,7 @@
*
* @version $Revision$ $Date$
*/
-public abstract class SkeletonGenerator {
- private Properties props = new Properties();
+public interface SkeletonGenerator {
- public Properties getProps() {
- return props;
- }
-
- public void setProps(Properties props) {
- this.props = props;
- }
-
- public abstract void generateSkeletons(Set interfaces, File destination,
ClassLoader cl) throws CompilerException;
-
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoFactory = new
GBeanInfoBuilder(SkeletonGenerator.class);
-
- infoFactory.addAttribute("props", Properties.class, true);
- infoFactory.addOperation("generateSkeletons", new Class[]
{Set.class, File.class, ClassLoader.class});
-
- GBEAN_INFO = infoFactory.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
+ public void generateSkeletons(Set interfaces, File destination,
ClassLoader cl) throws CompilerException;
}
