hammant 02/03/26 03:24:06 Modified: altrmi PROPOSAL tests.xml tests2.xml altrmi/src/java/org/apache/commons/altrmi/common ProxyGenerator.java altrmi/src/java/org/apache/commons/altrmi/generator ProxyGeneratorImpl.java altrmi/src/java/org/apache/commons/altrmi/server AltrmiProxyGenerator.java AltrmiPublisher.java PublicationDescription.java altrmi/src/java/org/apache/commons/altrmi/server/impl AbstractServer.java altrmi/src/java/org/apache/commons/altrmi/server/impl/adapters PublicationAdapter.java altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers DynamicGeneratorClassRetriever.java Added: altrmi/src/java/org/apache/commons/altrmi/generator/ant AltrmiProxyTask.java Removed: altrmi/src/java/org/apache/commons/altrmi/generator/ant AltrmiInterfaceTask.java Log: classesOrInterfacesToExpose (etc) changes to interfacesToExpose Revision Changes Path 1.16 +2 -2 jakarta-commons-sandbox/altrmi/PROPOSAL Index: PROPOSAL =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/PROPOSAL,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- PROPOSAL 12 Mar 2002 17:24:06 -0000 1.15 +++ PROPOSAL 26 Mar 2002 11:24:05 -0000 1.16 @@ -9,7 +9,7 @@ 1) Any interface publishing - - Any object via the interfaces it publishes can be published remotely. + - Any object via the interfaces it publishes, can be published remotely. - No transport lock-in : - No forcing of extension of java.rmi.Remote - No forced declarations of "throws java.rmi.RemoteException" @@ -176,7 +176,7 @@ - Other RMI (over IIOP, over HTTP) - JMS -2) BCEL for generated proxy class. +2) BCEL (or other) for generated proxy class - The current impl writes java source then compiles it. We could do this inline with BCEL. This as an heavier, but more design perfect 1.13 +5 -5 jakarta-commons-sandbox/altrmi/tests.xml Index: tests.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/tests.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tests.xml 21 Mar 2002 07:48:30 -0000 1.12 +++ tests.xml 26 Mar 2002 11:24:05 -0000 1.13 @@ -3,7 +3,7 @@ <!-- "Alt (to) RMI" component of the Jakarta Commons Subproject - $Id: tests.xml,v 1.12 2002/03/21 07:48:30 hammant Exp $ + $Id: tests.xml,v 1.13 2002/03/26 11:24:05 hammant Exp $ --> @@ -66,7 +66,7 @@ - <taskdef name="altrmiinterfaces" classname="org.apache.commons.altrmi.generator.ant.AltrmiInterfaceTask"> + <taskdef name="altrmiproxies" classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask"> <classpath refid="compile.classpath" /> </taskdef> @@ -96,14 +96,14 @@ <target name="generate" depends="prepare"> - <altrmiinterfaces genname="Hello" srcgendir="${build.home}/genjava" + <altrmiproxies genname="Hello" srcgendir="${build.home}/genjava" classgendir="${build.home}/classes2" verbose="true" - classesorinterfaces="org.apache.commons.altrmi.test.TestInterface" + interfaces="org.apache.commons.altrmi.test.TestInterface" additionalfacades="org.apache.commons.altrmi.test.TestInterface2"> <classpath> <pathelement location="${build.home}/classes"/> </classpath> - </altrmiinterfaces> + </altrmiproxies> </target> 1.4 +11 -11 jakarta-commons-sandbox/altrmi/tests2.xml Index: tests2.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/tests2.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tests2.xml 21 Mar 2002 07:48:30 -0000 1.3 +++ tests2.xml 26 Mar 2002 11:24:05 -0000 1.4 @@ -3,7 +3,7 @@ <!-- "Alt (to) RMI" component of the Jakarta Commons Subproject - $Id: tests2.xml,v 1.3 2002/03/21 07:48:30 hammant Exp $ + $Id: tests2.xml,v 1.4 2002/03/26 11:24:05 hammant Exp $ --> @@ -78,7 +78,7 @@ - <taskdef name="altrmiinterfaces" classname="org.apache.commons.altrmi.generator.ant.AltrmiInterfaceTask"> + <taskdef name="altrmiproxies" classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask"> <classpath refid="compile.classpath" /> </taskdef> @@ -108,30 +108,30 @@ <target name="generate" depends="prepare"> - <altrmiinterfaces genname="P" srcgendir="${build.home}/genjava" + <altrmiproxies genname="P" srcgendir="${build.home}/genjava" classgendir="${build.home}/classes2" - classesorinterfaces="org.apache.commons.altrmi.test.TestProvider" + interfaces="org.apache.commons.altrmi.test.TestProvider" additionalfacades=""> <classpath> <pathelement location="${build.home}/classes"/> </classpath> - </altrmiinterfaces> - <altrmiinterfaces genname="C" srcgendir="${build.home}/genjava" + </altrmiproxies> + <altrmiproxies genname="C" srcgendir="${build.home}/genjava" classgendir="${build.home}/classes2" - classesorinterfaces="org.apache.commons.altrmi.test.TestConsumer" + interfaces="org.apache.commons.altrmi.test.TestConsumer" additionalfacades=""> <classpath> <pathelement location="${build.home}/classes"/> </classpath> - </altrmiinterfaces> - <altrmiinterfaces genname="Hello" srcgendir="${build.home}/genjava" + </altrmiproxies> + <altrmiproxies genname="Hello" srcgendir="${build.home}/genjava" classgendir="${build.home}/classes2" - classesorinterfaces="org.apache.commons.altrmi.test.TestInterface" + interfaces="org.apache.commons.altrmi.test.TestInterface" additionalfacades="org.apache.commons.altrmi.test.TestInterface2"> <classpath> <pathelement location="${build.home}/classes"/> </classpath> - </altrmiinterfaces> + </altrmiproxies> </target> <target name="procon-serve"> 1.4 +4 -4 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/common/ProxyGenerator.java Index: ProxyGenerator.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/common/ProxyGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ProxyGenerator.java 16 Mar 2002 04:54:34 -0000 1.3 +++ ProxyGenerator.java 26 Mar 2002 11:24:05 -0000 1.4 @@ -15,18 +15,18 @@ * * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public interface ProxyGenerator { /** - * Method setClassOrInterfacesToExpose + * Method setInterfacesToExpose * * - * @param classesOrInterfacesToExpose + * @param interfacesToExpose * */ - void setClassOrInterfacesToExpose(Class[] classesOrInterfacesToExpose); + void setInterfacesToExpose(Class[] interfacesToExpose); /** * Method setAdditionalfacades 1.10 +20 -20 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/generator/ProxyGeneratorImpl.java Index: ProxyGeneratorImpl.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/generator/ProxyGeneratorImpl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ProxyGeneratorImpl.java 22 Mar 2002 22:51:37 -0000 1.9 +++ ProxyGeneratorImpl.java 26 Mar 2002 11:24:05 -0000 1.10 @@ -33,11 +33,11 @@ * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> * @author Mike Miller of www.gac.com - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public class ProxyGeneratorImpl extends AbstractMethodHandler implements ProxyGenerator { - private Class[] mClassesOrInterfacesToExpose; + private Class[] mInterfacesToExpose; private Class[] mAdditionalFacades; protected String mSrcGenDir; protected String mClassGenDir; @@ -47,18 +47,18 @@ private PrintWriter mClassSource; /** - * Method setClassOrInterfacesToExpose + * Method setInterfacesToExpose * * - * @param classesOrInterfacesToExpose + * @param interfacesToExpose * */ - public void setClassOrInterfacesToExpose(Class[] classesOrInterfacesToExpose) { - mClassesOrInterfacesToExpose = classesOrInterfacesToExpose; + public void setInterfacesToExpose(Class[] interfacesToExpose) { + mInterfacesToExpose = interfacesToExpose; } /** - * Method setClassOrInterfacesToExpose + * Method setInterfacesToExpose * * * @@ -127,8 +127,8 @@ public void generateSrc(ClassLoader cL) throws ProxyGenerationException { // The lookupable service class source. - makeSource(cL, "Main", mClassesOrInterfacesToExpose); - makeSource2(cL, "Main", mClassesOrInterfacesToExpose); + makeSource(cL, "Main", mInterfacesToExpose); + makeSource2(cL, "Main", mInterfacesToExpose); if (mAdditionalFacades != null) { for (int i = 0; i < mAdditionalFacades.length; i++) { @@ -198,12 +198,12 @@ * * @param cL * @param name - * @param classOrInterfacesToExpose + * @param interfacesToExpose * * @throws ProxyGenerationException * */ - public void makeSource(ClassLoader cL, String name, Class[] classOrInterfacesToExpose) + public void makeSource(ClassLoader cL, String name, Class[] interfacesToExpose) throws ProxyGenerationException { // methdos could be in more than one interface. @@ -233,8 +233,8 @@ // TODO BaseServedObject altrmiGetBaseServedObject(); - for (int x = 0; x < classOrInterfacesToExpose.length; x++) { - Class clazz = classOrInterfacesToExpose[x]; + for (int x = 0; x < interfacesToExpose.length; x++) { + Class clazz = interfacesToExpose[x]; if (mVerbose) { System.out.println("ProxyGen: Processing interface: " + clazz.getName()); @@ -350,12 +350,12 @@ * * @param cL * @param name - * @param classOrInterfacesToExpose + * @param interfacesToExpose * * @throws ProxyGenerationException * */ - public void makeSource2(ClassLoader cL, String name, Class[] classOrInterfacesToExpose) + public void makeSource2(ClassLoader cL, String name, Class[] interfacesToExpose) throws ProxyGenerationException { String filename = mSrcGenDir + File.separator + "AltrmiGenerated2" + mGenName + "_" @@ -367,7 +367,7 @@ class2Source.print("public final class AltrmiGenerated2" + mGenName + "_" + name); class2Source.print(" extends AltrmiGenerated" + mGenName + "_" + name); class2Source.print(" implements "); - generateInterfaceList(class2Source, classOrInterfacesToExpose); + generateInterfaceList(class2Source, interfacesToExpose); class2Source.println(" { "); class2Source.println( " public AltrmiGenerated2" + mGenName + "_" + name @@ -411,12 +411,12 @@ } } - private void generateInterfaceList(PrintWriter pw, Class[] classOrInterfacesToExpose) { + private void generateInterfaceList(PrintWriter pw, Class[] interfacesToExpose) { - for (int x = 0; x < classOrInterfacesToExpose.length; x++) { - pw.print(classOrInterfacesToExpose[x].getName()); + for (int x = 0; x < interfacesToExpose.length; x++) { + pw.print(interfacesToExpose[x].getName()); - if (x + 1 < classOrInterfacesToExpose.length) { + if (x + 1 < interfacesToExpose.length) { pw.print(", "); } } 1.1 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/generator/ant/AltrmiProxyTask.java Index: AltrmiProxyTask.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * This software is published under the terms of the Apache Software License * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ package org.apache.commons.altrmi.generator.ant; import org.apache.tools.ant.Task; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; import org.apache.tools.ant.util.FileUtils; import org.apache.commons.altrmi.common.ProxyGenerator; import org.apache.commons.altrmi.common.ProxyGenerationException; import java.util.StringTokenizer; import java.util.Vector; import java.io.File; /** * Class AltrmiProxyTask * * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> * @version $Revision: 1.1 $ */ public class AltrmiProxyTask extends Task { protected String[] mInterfacesToExpose; protected String[] mAdditionalFacades; protected String mSrcGenDir; protected String mClassGenDir; protected String mGenName; protected Path mClasspath; protected String mVerbose = "false"; /** * Constructor AltrmiProxyTask * * */ public AltrmiProxyTask() {} /** * Method setInterfaces * * * @param interfacesToExpose * */ public void setInterfaces(String interfacesToExpose) { StringTokenizer st = new StringTokenizer(interfacesToExpose, ","); Vector strings = new Vector(); while (st.hasMoreTokens()) { strings.add(st.nextToken().trim()); } mInterfacesToExpose = new String[strings.size()]; strings.copyInto(mInterfacesToExpose); } /** * Method setAdditionalfacades * * * @param additionalfacades * */ public void setAdditionalfacades(String additionalfacades) { StringTokenizer st = new StringTokenizer(additionalfacades, ","); Vector strings = new Vector(); while (st.hasMoreTokens()) { strings.add(st.nextToken().trim()); } mAdditionalFacades = new String[strings.size()]; strings.copyInto(mAdditionalFacades); } /** * Method setSrcgendir * * * @param srcGenDir * */ public void setSrcgendir(String srcGenDir) { mSrcGenDir = srcGenDir.replace('/', File.separatorChar); mSrcGenDir = mSrcGenDir.replace('\\', File.separatorChar); } /** * Method setClassgendir * * * @param classGenDir * */ public void setClassgendir(String classGenDir) { mClassGenDir = classGenDir.replace('/', File.separatorChar); mClassGenDir = mClassGenDir.replace('\\', File.separatorChar); } /** * Method setGenname * * * @param genName * */ public void setGenname(String genName) { this.mGenName = genName; } /** * Method setClasspath * * * @param classpath * */ public void setClasspath(Path classpath) { if (mClasspath == null) { mClasspath = classpath; } else { mClasspath.append(classpath); } } /** * Method createClasspath * * * @return * */ public Path createClasspath() { if (mClasspath == null) { mClasspath = new Path(project); } return mClasspath.createPath(); } /** * Method setClasspathRef * * * @param r * */ public void setClasspathRef(Reference r) { createClasspath().setRefid(r); } /** * Method setVerbose * * * @param verbose * */ public void setVerbose(String verbose) { mVerbose = verbose; } /** * Method execute * * * @throws BuildException * */ public void execute() throws BuildException { if (mInterfacesToExpose == null) { throw new BuildException("Specify at least one interface to expose"); } if (mSrcGenDir == null) { throw new BuildException("Specify the directory to generate Java source in"); } if (mClassGenDir == null) { throw new BuildException("Specify the directory to generate Java classes in"); } if (mGenName == null) { throw new BuildException("Specify the name to use for lookup"); } ProxyGenerator sg; try { sg = (ProxyGenerator) Class .forName("org.apache.commons.altrmi.generator.ProxyGeneratorImpl").newInstance(); } catch (Exception e) { e.printStackTrace(); throw new RuntimeException("PrimaryGenerator Impl jar not in classpath"); } try { sg.setSrcGenDir(new File(mSrcGenDir).getAbsolutePath()); sg.setClassGenDir(new File(mClassGenDir).getAbsolutePath()); sg.setGenName(mGenName); sg.verbose(Boolean.valueOf(mVerbose).booleanValue()); sg.setClasspath(mClasspath.concatSystemClasspath("ignore").toString()); Class[] interfacesToExpose = new Class[mInterfacesToExpose.length]; for (int i = 0; i < mInterfacesToExpose.length; i++) { String cn = mInterfacesToExpose[i]; interfacesToExpose[i] = Class.forName(cn); } sg.setInterfacesToExpose(interfacesToExpose); if (mAdditionalFacades != null) { Class[] additionalFacades = new Class[mAdditionalFacades.length]; for (int i = 0; i < mAdditionalFacades.length; i++) { String cn = mAdditionalFacades[i]; additionalFacades[i] = Class.forName(cn); } sg.setAdditionalfacades(additionalFacades); } ClassLoader cL = null; if (mClasspath != null) { cL = new AntClassLoader(project, mClasspath); } else { cL = this.getClass().getClassLoader(); } sg.generateSrc(cL); sg.generateClass(cL); } catch (ClassNotFoundException cnfe) { throw new BuildException(cnfe.getMessage()); } catch (ProxyGenerationException sge) { throw new BuildException(sge.getMessage()); } } } 1.4 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/AltrmiProxyGenerator.java Index: AltrmiProxyGenerator.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/AltrmiProxyGenerator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AltrmiProxyGenerator.java 24 Feb 2002 11:04:32 -0000 1.3 +++ AltrmiProxyGenerator.java 26 Mar 2002 11:24:06 -0000 1.4 @@ -15,7 +15,7 @@ * * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version * $Revision: 1.3 $ + * @version * $Revision: 1.4 $ */ public interface AltrmiProxyGenerator { @@ -24,11 +24,11 @@ * * * @param asName - * @param classOrInterfaceToExpose + * @param interfaceToExpose * @param classLoader - classloader containing all needed for proxy generation * */ - void generate(String asName, Class classOrInterfaceToExpose, ClassLoader classLoader) + void generate(String asName, Class interfaceToExpose, ClassLoader classLoader) throws PublicationException; /** 1.7 +3 -3 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/AltrmiPublisher.java Index: AltrmiPublisher.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/AltrmiPublisher.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- AltrmiPublisher.java 22 Mar 2002 22:51:37 -0000 1.6 +++ AltrmiPublisher.java 26 Mar 2002 11:24:06 -0000 1.7 @@ -19,7 +19,7 @@ * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version * $Revision: 1.6 $ + * @version * $Revision: 1.7 $ */ public interface AltrmiPublisher { @@ -29,10 +29,10 @@ * * @param impl * @param asName - * @param classOrInterfaceToExpose + * @param interfaceToExpose * */ - void publish(Object impl, String asName, Class classOrInterfaceToExpose) + void publish(Object impl, String asName, Class interfaceToExpose) throws PublicationException; /** 1.2 +35 -35 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/PublicationDescription.java Index: PublicationDescription.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/PublicationDescription.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PublicationDescription.java 24 Feb 2002 11:04:32 -0000 1.1 +++ PublicationDescription.java 26 Mar 2002 11:24:06 -0000 1.2 @@ -15,22 +15,22 @@ * * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version * $Revision: 1.1 $ + * @version * $Revision: 1.2 $ */ public final class PublicationDescription { - private final Class[] mClassesOrInterfacesToExpose; + private final Class[] mInterfacesToExpose; private final Class[] mAdditionalFacades; /** * Constructor PublicationDescription * * - * @param classOrInterfaceToExpose + * @param interfaceToExpose * */ - public PublicationDescription(Class classOrInterfaceToExpose) { - mClassesOrInterfacesToExpose = new Class[]{ classOrInterfaceToExpose }; + public PublicationDescription(Class interfaceToExpose) { + mInterfacesToExpose = new Class[]{ interfaceToExpose }; mAdditionalFacades = new Class[0]; } @@ -38,12 +38,12 @@ * Constructor PublicationDescription * * - * @param classOrInterfaceToExpose + * @param interfaceToExpose * @param additionalFacade * */ - public PublicationDescription(Class classOrInterfaceToExpose, Class additionalFacade) { - mClassesOrInterfacesToExpose = new Class[]{ classOrInterfaceToExpose }; + public PublicationDescription(Class interfaceToExpose, Class additionalFacade) { + mInterfacesToExpose = new Class[]{ interfaceToExpose }; mAdditionalFacades = new Class[]{ additionalFacade }; } @@ -51,12 +51,12 @@ * Constructor PublicationDescription * * - * @param classOrInterfaceToExpose + * @param interfaceToExpose * @param additionalFacades * */ - public PublicationDescription(Class classOrInterfaceToExpose, Class[] additionalFacades) { - mClassesOrInterfacesToExpose = new Class[]{ classOrInterfaceToExpose }; + public PublicationDescription(Class interfaceToExpose, Class[] additionalFacades) { + mInterfacesToExpose = new Class[]{ interfaceToExpose }; mAdditionalFacades = additionalFacades; } @@ -64,11 +64,11 @@ * Constructor PublicationDescription * * - * @param classesOrInterfacesToExpose + * @param interfacesToExpose * */ - public PublicationDescription(Class[] classesOrInterfacesToExpose) { - mClassesOrInterfacesToExpose = classesOrInterfacesToExpose; + public PublicationDescription(Class[] interfacesToExpose) { + mInterfacesToExpose = interfacesToExpose; mAdditionalFacades = new Class[0]; } @@ -76,25 +76,25 @@ * Constructor PublicationDescription * * - * @param classesOrInterfacesToExpose + * @param interfacesToExpose * @param additionalFacades * */ - public PublicationDescription(Class[] classesOrInterfacesToExpose, + public PublicationDescription(Class[] interfacesToExpose, Class[] additionalFacades) { - mClassesOrInterfacesToExpose = classesOrInterfacesToExpose; + mInterfacesToExpose = interfacesToExpose; mAdditionalFacades = additionalFacades; } /** - * Method getClassesOrInterfacesToExpose + * Method getInterfacesToExpose * * * @return * */ - public Class[] getClassesOrInterfacesToExpose() { - return mClassesOrInterfacesToExpose; + public Class[] getInterfacesToExpose() { + return mInterfacesToExpose; } /** @@ -112,11 +112,11 @@ * Constructor PublicationDescription * * - * @param classOrInterfaceToExpose + * @param interfaceToExpose * */ - public PublicationDescription(String classOrInterfaceToExpose, ClassLoader classLoader) throws PublicationException { - mClassesOrInterfacesToExpose = makeClasses(new String[] {classOrInterfaceToExpose}, classLoader); + public PublicationDescription(String interfaceToExpose, ClassLoader classLoader) throws PublicationException { + mInterfacesToExpose = makeClasses(new String[] {interfaceToExpose}, classLoader); mAdditionalFacades = new Class[0]; } @@ -124,12 +124,12 @@ * Constructor PublicationDescription * * - * @param classOrInterfaceToExpose + * @param interfaceToExpose * @param additionalFacade * */ - public PublicationDescription(String classOrInterfaceToExpose, String additionalFacade, ClassLoader classLoader) throws PublicationException { - mClassesOrInterfacesToExpose = makeClasses(new String[] {classOrInterfaceToExpose}, classLoader); + public PublicationDescription(String interfaceToExpose, String additionalFacade, ClassLoader classLoader) throws PublicationException { + mInterfacesToExpose = makeClasses(new String[] {interfaceToExpose}, classLoader); mAdditionalFacades = makeClasses(new String[] {additionalFacade}, classLoader); } @@ -137,12 +137,12 @@ * Constructor PublicationDescription * * - * @param classOrInterfaceToExpose + * @param interfaceToExpose * @param additionalFacades * */ - public PublicationDescription(String classOrInterfaceToExpose, String[] additionalFacades, ClassLoader classLoader) throws PublicationException { - mClassesOrInterfacesToExpose = makeClasses(new String[] {classOrInterfaceToExpose}, classLoader); + public PublicationDescription(String interfaceToExpose, String[] additionalFacades, ClassLoader classLoader) throws PublicationException { + mInterfacesToExpose = makeClasses(new String[] {interfaceToExpose}, classLoader); mAdditionalFacades = makeClasses(additionalFacades, classLoader); } @@ -150,11 +150,11 @@ * Constructor PublicationDescription * * - * @param classesOrInterfacesToExpose + * @param interfacesToExpose * */ - public PublicationDescription(String[] classesOrInterfacesToExpose, ClassLoader classLoader) throws PublicationException { - mClassesOrInterfacesToExpose = makeClasses(classesOrInterfacesToExpose, classLoader); + public PublicationDescription(String[] interfacesToExpose, ClassLoader classLoader) throws PublicationException { + mInterfacesToExpose = makeClasses(interfacesToExpose, classLoader); mAdditionalFacades = new Class[0]; } @@ -162,13 +162,13 @@ * Constructor PublicationDescription * * - * @param classesOrInterfacesToExpose + * @param interfacesToExpose * @param additionalFacades * */ - public PublicationDescription(String[] classesOrInterfacesToExpose, + public PublicationDescription(String[] interfacesToExpose, String[] additionalFacades, ClassLoader classLoader) throws PublicationException { - mClassesOrInterfacesToExpose = makeClasses(classesOrInterfacesToExpose, classLoader); + mInterfacesToExpose = makeClasses(interfacesToExpose, classLoader); mAdditionalFacades = makeClasses(additionalFacades, classLoader); } 1.23 +4 -4 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/AbstractServer.java Index: AbstractServer.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/AbstractServer.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- AbstractServer.java 22 Mar 2002 22:51:37 -0000 1.22 +++ AbstractServer.java 26 Mar 2002 11:24:06 -0000 1.23 @@ -30,7 +30,7 @@ * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version $Revision: 1.22 $ + * @version $Revision: 1.23 $ */ public abstract class AbstractServer extends AbstractMethodHandler implements AltrmiServer, LogEnabled { @@ -168,12 +168,12 @@ * * @param impl * @param asName - * @param classOrInterfaceToExpose + * @param interfaceToExpose * */ - public void publish(Object impl, String asName, Class classOrInterfaceToExpose) + public void publish(Object impl, String asName, Class interfaceToExpose) throws PublicationException { - mInovcationHandlerAdapter.publish(impl, asName, classOrInterfaceToExpose); + mInovcationHandlerAdapter.publish(impl, asName, interfaceToExpose); } /** 1.4 +11 -11 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/adapters/PublicationAdapter.java Index: PublicationAdapter.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/adapters/PublicationAdapter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- PublicationAdapter.java 22 Mar 2002 22:51:37 -0000 1.3 +++ PublicationAdapter.java 26 Mar 2002 11:24:06 -0000 1.4 @@ -28,7 +28,7 @@ * * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ public class PublicationAdapter extends AbstractMethodHandler implements AltrmiPublisher { @@ -40,14 +40,14 @@ * * @param impl * @param asName - * @param classOrInterfaceToExpose + * @param interfaceToExpose * */ - public void publish(Object impl, String asName, Class classOrInterfaceToExpose) + public void publish(Object impl, String asName, Class interfaceToExpose) throws PublicationException { publish(impl, asName, - new PublicationDescription(new Class[]{ classOrInterfaceToExpose }, + new PublicationDescription(new Class[]{ interfaceToExpose }, new Class[0])); } @@ -63,18 +63,18 @@ public void publish(Object impl, String asName, PublicationDescription publicationDescription) throws PublicationException { - Class[] classesOrInterfacesToExpose = - publicationDescription.getClassesOrInterfacesToExpose(); + Class[] interfacesToExpose = + publicationDescription.getInterfacesToExpose(); Class[] additionalFacades = publicationDescription.getAdditionalFacades(); if (mPublishedObjects.containsKey(asName + "_Main")) { throw new PublicationException("Service '" + asName + "' already published"); } - String[] interfaceNames = new String[classesOrInterfacesToExpose.length]; + String[] interfaceNames = new String[interfacesToExpose.length]; - for (int i = 0; i < classesOrInterfacesToExpose.length; i++) { - interfaceNames[i] = classesOrInterfacesToExpose[i].getName(); + for (int i = 0; i < interfacesToExpose.length; i++) { + interfaceNames[i] = interfacesToExpose[i].getName(); } // add method maps for main lookup-able service. @@ -84,8 +84,8 @@ mainAsih.addImplementationBean(new Long(0), impl); - for (int x = 0; x < classesOrInterfacesToExpose.length; x++) { - Method methods[] = classesOrInterfacesToExpose[x].getMethods(); + for (int x = 0; x < interfacesToExpose.length; x++) { + Method methods[] = interfacesToExpose[x].getMethods(); for (int y = 0; y < methods.length; y++) { Method method = methods[y]; 1.6 +17 -12 jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/DynamicGeneratorClassRetriever.java Index: DynamicGeneratorClassRetriever.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/server/impl/classretrievers/DynamicGeneratorClassRetriever.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DynamicGeneratorClassRetriever.java 8 Mar 2002 13:12:13 -0000 1.5 +++ DynamicGeneratorClassRetriever.java 26 Mar 2002 11:24:06 -0000 1.6 @@ -10,9 +10,14 @@ -import org.apache.commons.altrmi.server.*; import org.apache.commons.altrmi.common.ProxyGenerator; import org.apache.commons.altrmi.common.ProxyGenerationException; +import org.apache.commons.altrmi.server.AltrmiProxyGenerator; +import org.apache.commons.altrmi.server.ClassRetriever; +import org.apache.commons.altrmi.server.PublicationException; +import org.apache.commons.altrmi.server.PublicationDescription; +import org.apache.commons.altrmi.server.ClassRetrievalException; +import org.apache.commons.altrmi.server.ProxyGenerationEnvironmentException; import java.net.URLClassLoader; import java.net.URL; @@ -29,7 +34,7 @@ * * * @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class DynamicGeneratorClassRetriever implements AltrmiProxyGenerator, ClassRetriever { @@ -52,13 +57,13 @@ * * * @param asName - * @param classOrInterfaceToExpose + * @param interfaceToExpose * @param classLoader * */ - public void generate(String asName, Class classOrInterfaceToExpose, ClassLoader classLoader) + public void generate(String asName, Class interfaceToExpose, ClassLoader classLoader) throws PublicationException { - generateProxy(asName, new PublicationDescription(classOrInterfaceToExpose), classLoader, + generateProxy(asName, new PublicationDescription(interfaceToExpose), classLoader, false); } @@ -221,10 +226,10 @@ } ClassLoader tmpGenClassLoader = new URLClassLoader(new URL[]{ mGenJarURL }, classLoader); - Class[] clInfs = new Class[0]; + Class[] interfacesToExpose = new Class[0]; Class[] addInfs = new Class[0]; - clInfs = publicationDescription.getClassesOrInterfacesToExpose(); + interfacesToExpose = publicationDescription.getInterfacesToExpose(); addInfs = publicationDescription.getAdditionalFacades(); ProxyGenerator proxyGenerator; @@ -242,7 +247,7 @@ proxyGenerator.setClassGenDir(mClassGenDir); proxyGenerator.setGenName(asName); proxyGenerator.setClasspath(mAltrmiClasspath); - proxyGenerator.setClassOrInterfacesToExpose(clInfs); + proxyGenerator.setInterfacesToExpose(interfacesToExpose); proxyGenerator.setAdditionalfacades(addInfs); //ClassLoader cL = this.getClass().getClassLoader(); @@ -256,8 +261,8 @@ System.out.println("** Name=" + asName); System.out.println("** Classes/Interfaces to Expose.."); - for (int i = 0; i < clInfs.length; i++) { - String aString = clInfs[i].getName(); + for (int i = 0; i < interfacesToExpose.length; i++) { + String aString = interfacesToExpose[i].getName(); System.out.println("** .." + aString); } @@ -291,8 +296,8 @@ System.out.println("** CLasspath=" + mAltrmiClasspath); System.out.println("** Classes/Interfaces to Expose.."); - for (int i = 0; i < clInfs.length; i++) { - String aString = clInfs[i].getName(); + for (int i = 0; i < interfacesToExpose.length; i++) { + String aString = interfacesToExpose[i].getName(); System.out.println("** .." + aString); }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>