hammant 2002/08/24 04:39:06
Modified: altrmi build.xml
altrmi/src/java/org/apache/excalibur/altrmi/client
ProxyHelper.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl
DefaultProxyHelper.java
altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming
DefaultAltrmiContext.java
DefaultAltrmiInitialContextFactory.java
altrmi/src/java/org/apache/excalibur/altrmi/common
ClassLoaderObjectInputStream.java
altrmi/src/java/org/apache/excalibur/altrmi/generator
BCELProxyGeneratorImpl.java ProxyGeneratorImpl.java
altrmi/src/java/org/apache/excalibur/altrmi/server
AltrmiAuthenticator.java AltrmiProxyGenerator.java
AltrmiPublisher.java AltrmiServer.java
AltrmiServerConnection.java
AltrmiServerException.java
ClassRetrievalException.java ClassRetriever.java
MethodInvocationHandler.java
ProxyGenerationEnvironmentException.java
PublicationDescription.java
PublicationException.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl
AbstractServer.java
DefaultMethodInvocationHandler.java
altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers
AbstractDynamicGeneratorClassRetriever.java
BcelDynamicGeneratorClassRetriever.java
JavacDynamicGeneratorClassRetriever.java
Log:
More checkstyle compliance
Revision Changes Path
1.33 +3 -1 jakarta-avalon-excalibur/altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 18 Aug 2002 12:59:19 -0000 1.32
+++ build.xml 24 Aug 2002 11:39:05 -0000 1.33
@@ -271,7 +271,7 @@
allowPackage="false"
allowNoAuthor="false"
maxLineLen="100"
- maxMethodLen="100"
+ maxMethodLen="200"
maxConstructorLen="100"
memberPattern="^m_[a-z][a-zA-Z0-9]*$"
staticPattern="^c_[a-z][a-zA-Z0-9]*$"
@@ -287,6 +287,8 @@
<include name="org/apache/excalibur/altrmi/common/*.java"/>
<include
name="org/apache/excalibur/altrmi/generator/*.java"/>
<include
name="org/apache/excalibur/altrmi/server/impl/classretrievers/*.java"/>
+ <include name="org/apache/excalibur/altrmi/server/*.java"/>
+ <include
name="org/apache/excalibur/altrmi/server/rmi/*.java"/>
</fileset>
<formatter type="plain"/>
<formatter type="xml"
toFile="${build.dir}/checkstyle-results.xml"/>
1.5 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/ProxyHelper.java
Index: ProxyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/ProxyHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProxyHelper.java 24 Apr 2002 12:42:56 -0000 1.4
+++ ProxyHelper.java 24 Aug 2002 11:39:05 -0000 1.5
@@ -12,7 +12,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public interface ProxyHelper
1.10 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultProxyHelper.java
Index: DefaultProxyHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/DefaultProxyHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultProxyHelper.java 23 May 2002 21:37:19 -0000 1.9
+++ DefaultProxyHelper.java 24 Aug 2002 11:39:05 -0000 1.10
@@ -33,7 +33,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public final class DefaultProxyHelper implements ProxyHelper
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiContext.java
Index: DefaultAltrmiContext.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultAltrmiContext.java 24 Apr 2002 12:42:57 -0000 1.2
+++ DefaultAltrmiContext.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -22,7 +22,7 @@
* Class DefaultAltrmiContext
*
*
- * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public class DefaultAltrmiContext implements Context
1.3 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiInitialContextFactory.java
Index: DefaultAltrmiInitialContextFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/client/impl/naming/DefaultAltrmiInitialContextFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultAltrmiInitialContextFactory.java 24 Apr 2002 12:42:57 -0000
1.2
+++ DefaultAltrmiInitialContextFactory.java 24 Aug 2002 11:39:05 -0000
1.3
@@ -17,7 +17,7 @@
* Class DefaultAltrmiInitialContextFactory
*
*
- * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public class DefaultAltrmiInitialContextFactory implements
InitialContextFactory
1.4 +1 -0
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassLoaderObjectInputStream.java
Index: ClassLoaderObjectInputStream.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/common/ClassLoaderObjectInputStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassLoaderObjectInputStream.java 23 May 2002 21:37:19 -0000 1.3
+++ ClassLoaderObjectInputStream.java 24 Aug 2002 11:39:05 -0000 1.4
@@ -66,6 +66,7 @@
}
catch( ClassNotFoundException cnfe )
{
+ // this may be OK, see below.
}
if( null != clazz )
1.6 +124 -108
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/BCELProxyGeneratorImpl.java
Index: BCELProxyGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/BCELProxyGeneratorImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BCELProxyGeneratorImpl.java 15 Jul 2002 21:52:19 -0000 1.5
+++ BCELProxyGeneratorImpl.java 24 Aug 2002 11:39:05 -0000 1.6
@@ -512,112 +512,8 @@
* argClasses[0]=v0Class.class
*/
//Used for adjustment of double/long datatype:
- Type previousType = null;
- int loadIndex = 0;
- for (int i = 0; i < numberOfArguments; i++)
- {
- // assigning the obj ref's
- il.append(m_factory.createLoad(Type.OBJECT, variableIndex - 1));
- il.append(new PUSH(m_constantsPool, i));
- String className = paramTypes[i].getName();
- //adjust for any previous wider datatype (double/long)
- if (previousType != null
- && (previousType == Type.DOUBLE || previousType ==
Type.LONG))
- {
- ++loadIndex;
- }
- if (paramTypes[i].isPrimitive())
- {
-
il.append(m_factory.createNew(getJavaWrapperClass(className)));
- il.append(InstructionConstants.DUP);
-
il.append(m_factory.createLoad(getBCELPrimitiveType(className), ++loadIndex));
- il.append(
- m_factory.createInvoke(
- getJavaWrapperClass(className),
- "<init>",
- Type.VOID,
- new Type[] { getBCELPrimitiveType(className)},
- Constants.INVOKESPECIAL));
- il.append(InstructionConstants.AASTORE);
- }
- else
- {
-
- //create the static fields for enabling .class calls
- String encodedFieldName;
- if (paramTypes[i].isArray())
- {
- int index = className.lastIndexOf('[');
- if (className.charAt(index + 1) == 'L')
- {
- encodedFieldName =
- "array$" + className.substring(1 + index,
- className.length() - 1).replace('.',
'$');
- }
- else
- {
- encodedFieldName =
- "array$" + className.substring(1 + index,
className.length());
- }
- }
- else
- {
- encodedFieldName = "class$" + className.replace('.',
'$');
- }
-
- addField(encodedFieldName);
- // ******** TODO assign the obj reference
- il.append(m_factory.createLoad(Type.OBJECT, variableIndex -
1));
- il.append(new PUSH(m_constantsPool, i));
- il.append(m_factory.createLoad(Type.OBJECT, ++loadIndex));
- il.append(InstructionConstants.AASTORE);
-
- // *********TODO assign the class ref's
- il.append(m_factory.createLoad(Type.OBJECT, variableIndex));
- il.append(new PUSH(m_constantsPool, i));
- il.append(
- m_factory.createFieldAccess(
- generatedClassName,
- encodedFieldName,
- new ObjectType("java.lang.Class"),
- Constants.GETSTATIC));
- BranchInstruction ifnull =
- m_factory.createBranchInstruction(Constants.IFNULL,
null);
- il.append(ifnull);
- il.append(
- m_factory.createFieldAccess(
- generatedClassName,
- encodedFieldName,
- new ObjectType("java.lang.Class"),
- Constants.GETSTATIC));
- BranchInstruction goHeadToStoreRef =
- m_factory.createBranchInstruction(Constants.GOTO, null);
- il.append(goHeadToStoreRef);
- InstructionHandle ifnullStartHere =
- il.append(new PUSH(m_constantsPool, className));
-
- ifnull.setTarget(ifnullStartHere);
-
- il.append(
- m_factory.createInvoke(
- generatedClassName,
- "class$",
- new ObjectType("java.lang.Class"),
- new Type[] { Type.STRING },
- Constants.INVOKESTATIC));
- il.append(InstructionConstants.DUP);
- il.append(
- m_factory.createFieldAccess(
- generatedClassName,
- encodedFieldName,
- new ObjectType("java.lang.Class"),
- Constants.PUTSTATIC));
- InstructionHandle storeClassRef =
il.append(InstructionConstants.AASTORE);
- goHeadToStoreRef.setTarget(storeClassRef);
-
- }
- previousType = getBCELPrimitiveType(className);
- }
+ createInterfaceMethodArgs(numberOfArguments, il, variableIndex,
+ paramTypes, generatedClassName);
/* Within the stub put the
* Call processObjectRequest on the instance ProxyHelper held within
the stub
@@ -889,6 +785,126 @@
}
/**
+ * Create interface method's args.
+ *
+ * @param numberOfArguments the number of arguments.
+ * @param il an instruction list
+ * @param variableIndex a varible index.
+ * @param paramTypes parameter types
+ * @param generatedClassName the generated class name.
+ */
+ private void createInterfaceMethodArgs(int numberOfArguments,
InstructionList il, int variableIndex,
+ Class[] paramTypes, String
generatedClassName)
+ {
+ Type previousType = null;
+ int loadIndex = 0;
+ for (int i = 0; i < numberOfArguments; i++)
+ {
+ // assigning the obj ref's
+ il.append(m_factory.createLoad(Type.OBJECT, variableIndex - 1));
+ il.append(new PUSH(m_constantsPool, i));
+ String className = paramTypes[i].getName();
+ //adjust for any previous wider datatype (double/long)
+ if (previousType != null
+ && (previousType == Type.DOUBLE || previousType ==
Type.LONG))
+ {
+ ++loadIndex;
+ }
+ if (paramTypes[i].isPrimitive())
+ {
+
il.append(m_factory.createNew(getJavaWrapperClass(className)));
+ il.append(InstructionConstants.DUP);
+
il.append(m_factory.createLoad(getBCELPrimitiveType(className), ++loadIndex));
+ il.append(
+ m_factory.createInvoke(
+ getJavaWrapperClass(className),
+ "<init>",
+ Type.VOID,
+ new Type[] { getBCELPrimitiveType(className)},
+ Constants.INVOKESPECIAL));
+ il.append(InstructionConstants.AASTORE);
+ }
+ else
+ {
+
+ //create the static fields for enabling .class calls
+ String encodedFieldName;
+ if (paramTypes[i].isArray())
+ {
+ int index = className.lastIndexOf('[');
+ if (className.charAt(index + 1) == 'L')
+ {
+ encodedFieldName =
+ "array$" + className.substring(1 + index,
+ className.length() - 1).replace('.',
'$');
+ }
+ else
+ {
+ encodedFieldName =
+ "array$" + className.substring(1 + index,
className.length());
+ }
+ }
+ else
+ {
+ encodedFieldName = "class$" + className.replace('.',
'$');
+ }
+
+ addField(encodedFieldName);
+ // ******** TODO assign the obj reference
+ il.append(m_factory.createLoad(Type.OBJECT, variableIndex -
1));
+ il.append(new PUSH(m_constantsPool, i));
+ il.append(m_factory.createLoad(Type.OBJECT, ++loadIndex));
+ il.append(InstructionConstants.AASTORE);
+
+ // *********TODO assign the class ref's
+ il.append(m_factory.createLoad(Type.OBJECT, variableIndex));
+ il.append(new PUSH(m_constantsPool, i));
+ il.append(
+ m_factory.createFieldAccess(
+ generatedClassName,
+ encodedFieldName,
+ new ObjectType("java.lang.Class"),
+ Constants.GETSTATIC));
+ BranchInstruction ifnull =
+ m_factory.createBranchInstruction(Constants.IFNULL,
null);
+ il.append(ifnull);
+ il.append(
+ m_factory.createFieldAccess(
+ generatedClassName,
+ encodedFieldName,
+ new ObjectType("java.lang.Class"),
+ Constants.GETSTATIC));
+ BranchInstruction goHeadToStoreRef =
+ m_factory.createBranchInstruction(Constants.GOTO, null);
+ il.append(goHeadToStoreRef);
+ InstructionHandle ifnullStartHere =
+ il.append(new PUSH(m_constantsPool, className));
+
+ ifnull.setTarget(ifnullStartHere);
+
+ il.append(
+ m_factory.createInvoke(
+ generatedClassName,
+ "class$",
+ new ObjectType("java.lang.Class"),
+ new Type[] { Type.STRING },
+ Constants.INVOKESTATIC));
+ il.append(InstructionConstants.DUP);
+ il.append(
+ m_factory.createFieldAccess(
+ generatedClassName,
+ encodedFieldName,
+ new ObjectType("java.lang.Class"),
+ Constants.PUTSTATIC));
+ InstructionHandle storeClassRef =
il.append(InstructionConstants.AASTORE);
+ goHeadToStoreRef.setTarget(storeClassRef);
+
+ }
+ previousType = getBCELPrimitiveType(className);
+ }
+ }
+
+ /**
* Method getFreeIndexToStart.
* Returns the index to start allocating the subsequent stack
variables
* @param classes the classes
@@ -1208,7 +1224,7 @@
}
catch (IOException e)
{
-
+ // this is OK, as null will be passed back.
}
return clazz;
1.12 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/ProxyGeneratorImpl.java
Index: ProxyGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/generator/ProxyGeneratorImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProxyGeneratorImpl.java 15 Jul 2002 21:52:19 -0000 1.11
+++ ProxyGeneratorImpl.java 24 Aug 2002 11:39:05 -0000 1.12
@@ -290,8 +290,8 @@
m_classSource.println( " } else { " );
m_classSource.println( " t.printStackTrace(); " );
m_classSource.println(
- " throw new org.apache.excalibur.altrmi.common."+
- "AltrmiInvocationException(\"Should never get here: \"
+t.getMessage());");
+ " throw new org.apache.excalibur.altrmi.common."
+ + "AltrmiInvocationException(\"Should never get here: \"
+t.getMessage());");
m_classSource.println( " }" );
m_classSource.println( " }" );
m_classSource.println( " }" );
1.3 +7 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiAuthenticator.java
Index: AltrmiAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiAuthenticator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiAuthenticator.java 24 Apr 2002 12:43:00 -0000 1.2
+++ AltrmiAuthenticator.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -21,24 +21,24 @@
{
/**
- * Method checkAuthority
+ * Check the authority of a particular 'user' to a service
*
*
- * @param auth
- * @param publishedService
+ * @param auth the authenicatin that needs to be checked.
+ * @param publishedService the name of the published service.
*
*
- * @throws AltrmiAuthenticationException
+ * @throws AltrmiAuthenticationException if autheication fails.
*
*/
void checkAuthority( AltrmiAuthentication auth, String publishedService )
throws AltrmiAuthenticationException;
/**
- * Method getTextToSign
+ * Get the text to sign for PKI style autheticators
*
*
- * @return
+ * @return the signed text.
*
*/
String getTextToSign();
1.3 +16 -11
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiProxyGenerator.java
Index: AltrmiProxyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiProxyGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiProxyGenerator.java 24 Apr 2002 12:43:00 -0000 1.2
+++ AltrmiProxyGenerator.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -18,24 +18,26 @@
{
/**
- * Method generate
+ * Generate a proxy.
*
*
- * @param asName
- * @param interfaceToExpose
+ * @param asName the name of the generated proxy. As used in lookup.
+ * @param interfaceToExpose the princial lookupable interface
* @param classLoader - classloader containing all needed for proxy
generation
+ * @throws PublicationException if there is a problem publishing
*
*/
void generate( String asName, Class interfaceToExpose, ClassLoader
classLoader )
throws PublicationException;
/**
- * Method generate
+ * Generate a proxy.
*
*
- * @param asName
- * @param publicationDescription
+ * @param asName the name of the generated proxy. As used in lookup.
+ * @param publicationDescription a descriptor detailing complex cases.
* @param classLoader - classloader containing all needed for proxy
generation
+ * @throws PublicationException if there is a problem publishing
*
*/
void generate(
@@ -43,12 +45,14 @@
throws PublicationException;
/**
- * Method deferredGenerate
+ * Generate a proxy. Deferred till a later moment for performance
reasons (most of
+ * use with javac generator)
*
*
- * @param asName
- * @param publicationDescription
+ * @param asName the name of the generated proxy. As used in lookup.
+ * @param publicationDescription a descriptor detailing complex cases.
* @param classLoader - classloader containing all needed for proxy
generation
+ * @throws PublicationException if there is a problem publishing
*
*/
void deferredGenerate(
@@ -56,8 +60,9 @@
throws PublicationException;
/**
- * Method generateDeferred
+ * Generate the deferred proxies.
*
+ * @param classLoader the class loader.
*/
void generateDeferred( ClassLoader classLoader );
}
1.3 +31 -25
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiPublisher.java
Index: AltrmiPublisher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiPublisher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiPublisher.java 24 Apr 2002 12:43:00 -0000 1.2
+++ AltrmiPublisher.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -14,76 +14,82 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ *
* @version * $Revision$
*/
public interface AltrmiPublisher
{
/**
- * Method publish
+ * Publish a object for subsequent lookup.
*
*
- * @param impl
- * @param asName
- * @param interfaceToExpose
+ * @param impl the object implementing the principle interface.
+ * @param asName the lookup name of the published object
+ * @param interfaceToExpose the principal interface being published
+ * @throws PublicationException if there is a problem publishing
*
*/
void publish( Object impl, String asName, Class interfaceToExpose )
throws PublicationException;
/**
- * Method publish
+ * Publish a object for subsequent lookup.
*
*
- * @param impl
- * @param asName
- * @param publicationDescription
+ * @param impl the object implementing the principle interface.
+ * @param asName the lookup name of the published object
+ * @param publicationDescription describing complex publishing cases.
+ * @throws PublicationException if there is a problem publishing
*
*/
void publish( Object impl, String asName, PublicationDescription
publicationDescription )
throws PublicationException;
/**
- * Method unPublish
+ * UnPublish a previously published object.
*
*
- * @param impl
- * @param asName
+ * @param impl the object implementing the principle interface.
+ * @param asName the lookup name of the published object
+ * @throws PublicationException if there is a problem publishing
*
*/
void unPublish( Object impl, String asName ) throws PublicationException;
/**
- * Method replacePublished
+ * Replace Published object with another.
*
*
- * @param oldImpl
- * @param asName
- * @param withImpl
+ * @param oldImpl the old object implementing the principle interface.
+ * @param asName the lookup name of the published object
+ * @param withImpl the new object implementing the principle interface.
+ * @throws PublicationException if there is a problem publishing
*
*/
void replacePublished( Object oldImpl, String asName, Object withImpl )
throws PublicationException;
/**
- * Method getMethodInvocationHandler
+ * Get the MethodInvocationHandler for this transport. Used in special
adaptors.
*
*
- * @param mr
- * @param objectName
+ * @param methodRequest used as a hint for getting the right handler.
+ * @param objectName the object name relating to the method request.
*
- * @return
+ * @return a suitable MethodInvocationHandler
*
*/
- MethodInvocationHandler getMethodInvocationHandler( MethodRequest mr,
String objectName );
+ MethodInvocationHandler getMethodInvocationHandler( MethodRequest
methodRequest,
+ String objectName );
/**
- * Method getMethodInvocationHandler
+ * Get the MethodInvocationHandler for a published lookup name. Used in
special adaptors.
*
*
- * @param publishedName
+ * @param publishedName the published lookup name.
*
- * @return
+ * @return a suitable MethodInvocationHandler
*
*/
MethodInvocationHandler getMethodInvocationHandler( String publishedName
);
1.3 +11 -9
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiServer.java
Index: AltrmiServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiServer.java 24 Apr 2002 12:43:00 -0000 1.2
+++ AltrmiServer.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -20,44 +20,46 @@
{
/**
- * Method setClassRetriever
+ * Set a ClassRetriever for the server. Overides default.
*
*
- * @param classRetriever
+ * @param classRetriever we want to use.
*
*
*/
void setClassRetriever( ClassRetriever classRetriever );
/**
- * Method setAuthenticator
+ * Set an Authenticator to be used in invocations.
*
*
- * @param altrmiAuthenticator
+ * @param altrmiAuthenticator we want to use.
*
*/
void setAuthenticator( AltrmiAuthenticator altrmiAuthenticator );
/**
- * Method suspend
+ * Suspend publishing
*
*/
void suspend();
/**
- * Method resume
+ * Resume publishing
*
*/
void resume();
/**
- * Method start
+ * Start publishing
+ *
+ * @throws AltrmiServerException if the server cannot start.
*
*/
void start() throws AltrmiServerException;
/**
- * Method stop
+ * Stop publishing
*
*/
void stop();
1.3 +3 -3
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiServerConnection.java
Index: AltrmiServerConnection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiServerConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiServerConnection.java 24 Apr 2002 12:43:00 -0000 1.2
+++ AltrmiServerConnection.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -8,7 +8,7 @@
package org.apache.excalibur.altrmi.server;
/**
- * Interface AltrmiServerConnection
+ * An AltrmiServerConnection is connection in progress from a client to a
server.
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
@@ -18,7 +18,7 @@
{
/**
- * Method endConnection
+ * End the connection.
*
*
*/
1.3 +6 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiServerException.java
Index: AltrmiServerException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/AltrmiServerException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AltrmiServerException.java 24 Apr 2002 12:43:00 -0000 1.2
+++ AltrmiServerException.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -18,14 +18,15 @@
{
/**
- * Constructor AltrmiServerException
+ * Construct an AltrmiServerException with a message
*
*
- * @param s
+ * @param message the message
*
*/
- public AltrmiServerException( String s )
+ public AltrmiServerException( String message )
{
- super( s );
+ super( message );
}
+
}
1.3 +5 -7
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ClassRetrievalException.java
Index: ClassRetrievalException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ClassRetrievalException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassRetrievalException.java 24 Apr 2002 12:43:00 -0000 1.2
+++ ClassRetrievalException.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -18,15 +18,13 @@
{
/**
- * Constructor ClassRetrievalException
+ * Construct a ClassRetrievalException with a message
*
- *
- *
- * @param reason
+ * @param message the message
*
*/
- public ClassRetrievalException( String reason )
+ public ClassRetrievalException( String message )
{
- super( reason );
+ super( message );
}
}
1.3 +12 -10
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ClassRetriever.java
Index: ClassRetriever.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ClassRetriever.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ClassRetriever.java 24 Apr 2002 12:43:00 -0000 1.2
+++ ClassRetriever.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -8,7 +8,9 @@
package org.apache.excalibur.altrmi.server;
/**
- * Interface ClassRetriever
+ * A ClassRetriever is a thing that allows the serverside AltRMI deployer to
choose
+ * how class defs for proxies are retrieved. They may not want them in the
normal
+ * classpath.
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
@@ -18,27 +20,27 @@
{
/**
- * Method getBeanBytes
+ * Get a Bean's bytes (from its classdefinition)
*
*
- * @param publishedName
+ * @param publishedName the name the bean is published as.
*
- * @return
+ * @return a byte array for the bean's class representation.
*
- * @throws ClassRetrievalException
+ * @throws ClassRetrievalException if the classdef cannot be found.
*
*/
byte[] getBeanBytes( String publishedName ) throws
ClassRetrievalException;
/**
- * Method getInterfaceImplementationBytes
+ * Get an interface implementation's bytes (from its classdefinition)
*
*
- * @param publishedName
+ * @param publishedName the name the impl is published as.
*
- * @return
+ * @return a byte array for the impl's class representation.
*
- * @throws ClassRetrievalException
+ * @throws ClassRetrievalException if the classdef cannot be found.
*
*/
byte[] getInterfaceImplementationBytes( String publishedName ) throws
ClassRetrievalException;
1.4 +16 -15
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/MethodInvocationHandler.java
Index: MethodInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/MethodInvocationHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MethodInvocationHandler.java 24 Apr 2002 12:43:00 -0000 1.3
+++ MethodInvocationHandler.java 24 Aug 2002 11:39:05 -0000 1.4
@@ -21,50 +21,51 @@
{
/**
- * Method handleMethodInvocation
+ * Handle a method invocation.
*
*
- * @param request
+ * @param request the method request.
*
- * @return
+ * @return the reply for the request.
*
*/
AltrmiReply handleMethodInvocation( MethodRequest request );
/**
- * Method addImplementationBean
+ * Add an implementation bean
*
*
- * @param referenceID
- * @param beanImpl
+ * @param referenceID the ref id for the bean.
+ * @param beanImpl the bean.
*
*/
void addImplementationBean( Long referenceID, Object beanImpl );
/**
- * Method replaceImplementationBean
+ * Replace an implementation bean
*
*
- * @param implBean
- * @param withImplBean
+ * @param implBean the implementation bean
+ * @param withImplBean the new implementation bean
*
*/
void replaceImplementationBean( Object implBean, Object withImplBean );
/**
- * Method getOrMakeReferenceIDForBean
+ * Get or make a reference ID for a bean.
*
- *
- * @param implBean
+ * @return the reference ID
+ * @param implBean the implementation bean
*
*/
Long getOrMakeReferenceIDForBean( Object implBean );
/**
- * Method getMostDerivedType
+ * Get the most derived type for a bean
*
*
- * @param beanImpl
+ * @return the most derived class type.
+ * @param beanImpl the implementation bean
*
*/
Class getMostDerivedType( Object beanImpl );
1.3 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ProxyGenerationEnvironmentException.java
Index: ProxyGenerationEnvironmentException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/ProxyGenerationEnvironmentException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProxyGenerationEnvironmentException.java 24 Apr 2002 12:43:00 -0000
1.2
+++ ProxyGenerationEnvironmentException.java 24 Aug 2002 11:39:05 -0000
1.3
@@ -18,14 +18,14 @@
{
/**
- * Constructor ProxyGenerationEnvironmentException
+ * Construct a ProxyGenerationEnvironmentException with a message
*
*
- * @param s
+ * @param message the message
*
*/
- public ProxyGenerationEnvironmentException( String s )
+ public ProxyGenerationEnvironmentException( String message )
{
- super( s );
+ super( message );
}
}
1.4 +104 -83
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/PublicationDescription.java
Index: PublicationDescription.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/PublicationDescription.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PublicationDescription.java 24 Apr 2002 12:43:00 -0000 1.3
+++ PublicationDescription.java 24 Aug 2002 11:39:05 -0000 1.4
@@ -17,180 +17,174 @@
public final class PublicationDescription
{
- private final Class[] mInterfacesToExpose;
- private final Class[] mAdditionalFacades;
+ /**
+ * An array of interfaces to expose.
+ */
+ private final Class[] m_interfacesToExpose;
+ /**
+ * An array of additional facades.
+ */
+ private final Class[] m_additionalFacades;
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfaceToExpose
+ * @param interfaceToExpose the principal interface implemented by the
lookupable bean.
*
*/
public PublicationDescription( Class interfaceToExpose )
{
- mInterfacesToExpose = new Class[]{interfaceToExpose};
- mAdditionalFacades = new Class[ 0 ];
+ m_interfacesToExpose = new Class[]{interfaceToExpose};
+ m_additionalFacades = new Class[ 0 ];
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfaceToExpose
- * @param additionalFacade
+ * @param interfaceToExpose the principal interface implemented by the
lookupable bean.
+ * @param additionalFacade assitional facade implemented by other beans
that
+ * would otherwise be serialized and treated as pass-by-value objects.
*
*/
public PublicationDescription( Class interfaceToExpose, Class
additionalFacade )
{
- mInterfacesToExpose = new Class[]{interfaceToExpose};
- mAdditionalFacades = new Class[]{additionalFacade};
+ m_interfacesToExpose = new Class[]{interfaceToExpose};
+ m_additionalFacades = new Class[]{additionalFacade};
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfaceToExpose
- * @param additionalFacades
+ * @param interfaceToExpose the principal interface implemented by the
lookupable bean.
+ * @param additionalFacades assitional facades implemented by other
beans that
+ * would otherwise be serialized and treated as pass-by-value objects.
+
*
*/
public PublicationDescription( Class interfaceToExpose, Class[]
additionalFacades )
{
- mInterfacesToExpose = new Class[]{interfaceToExpose};
- mAdditionalFacades = additionalFacades;
+ m_interfacesToExpose = new Class[]{interfaceToExpose};
+ m_additionalFacades = additionalFacades;
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfacesToExpose
+ * @param interfacesToExpose the principal interfaces implemented by the
lookupable bean.
*
*/
public PublicationDescription( Class[] interfacesToExpose )
{
- mInterfacesToExpose = interfacesToExpose;
- mAdditionalFacades = new Class[ 0 ];
+ m_interfacesToExpose = interfacesToExpose;
+ m_additionalFacades = new Class[ 0 ];
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfacesToExpose
- * @param additionalFacades
+ * @param interfacesToExpose the principal interfaces implemented by the
lookupable bean.
+ * @param additionalFacades assitional facades implemented by other
beans that
+ * would otherwise be serialized and treated as pass-by-value objects.
*
*/
public PublicationDescription( Class[] interfacesToExpose, Class[]
additionalFacades )
{
- mInterfacesToExpose = interfacesToExpose;
- mAdditionalFacades = additionalFacades;
- }
-
- /**
- * Method getInterfacesToExpose
- *
- *
- * @return
- *
- */
- public Class[] getInterfacesToExpose()
- {
- return mInterfacesToExpose;
+ m_interfacesToExpose = interfacesToExpose;
+ m_additionalFacades = additionalFacades;
}
/**
- * Method getAdditionalFacades
+ * Construct a publication description.
*
*
- * @return
- *
- */
- public Class[] getAdditionalFacades()
- {
- return mAdditionalFacades;
- }
-
- /**
- * Constructor PublicationDescription
- *
+ * @param interfaceToExpose the principal interface implemented by the
lookupable bean.
+ * @param classLoader the classloader containing the classdefs (special
cases)
+ * @throws PublicationException if there is a problem publishing
*
- * @param interfaceToExpose
- * @param classLoader
*
*/
public PublicationDescription( String interfaceToExpose, ClassLoader
classLoader )
throws PublicationException
{
- mInterfacesToExpose = makeClasses( new String[]{interfaceToExpose},
classLoader );
- mAdditionalFacades = new Class[ 0 ];
+ m_interfacesToExpose = makeClasses( new String[]{interfaceToExpose},
classLoader );
+ m_additionalFacades = new Class[ 0 ];
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfaceToExpose
- * @param additionalFacade
- * @param classLoader
+ * @param interfaceToExpose the principal interface implemented by the
lookupable bean.
+ * @param additionalFacade assitional facade implemented by other beans
that
+ * would otherwise be serialized and treated as pass-by-value objects.
+ * @param classLoader the classloader containing the classdefs (special
cases)
+ * @throws PublicationException if there is a problem publishing
*
*/
public PublicationDescription(
String interfaceToExpose, String additionalFacade, ClassLoader
classLoader )
throws PublicationException
{
- mInterfacesToExpose = makeClasses( new String[]{interfaceToExpose},
classLoader );
- mAdditionalFacades = makeClasses( new String[]{additionalFacade},
classLoader );
+ m_interfacesToExpose = makeClasses( new String[]{interfaceToExpose},
classLoader );
+ m_additionalFacades = makeClasses( new String[]{additionalFacade},
classLoader );
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfaceToExpose
- * @param additionalFacades
- * @param classLoader
- *
+ * @param interfaceToExpose the principal interface implemented by the
lookupable bean.
+ * @param additionalFacades assitional facades implemented by other
beans that
+ * would otherwise be serialized and treated as pass-by-value objects.
+ * @param classLoader the classloader containing the classdefs (special
cases)
+ * @throws PublicationException if there is a problem publishing
*/
public PublicationDescription(
String interfaceToExpose, String[] additionalFacades, ClassLoader
classLoader )
throws PublicationException
{
- mInterfacesToExpose = makeClasses( new String[]{interfaceToExpose},
classLoader );
- mAdditionalFacades = makeClasses( additionalFacades, classLoader );
+ m_interfacesToExpose = makeClasses( new String[]{interfaceToExpose},
classLoader );
+ m_additionalFacades = makeClasses( additionalFacades, classLoader );
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfacesToExpose
- * @param classLoader
+ * @param interfacesToExpose the principal interfaces implemented by the
lookupable bean.
+ * @param classLoader the classloader containing the classdefs (special
cases)
+ * @throws PublicationException if there is a problem publishing
*
*/
public PublicationDescription( String[] interfacesToExpose, ClassLoader
classLoader )
throws PublicationException
{
- mInterfacesToExpose = makeClasses( interfacesToExpose, classLoader );
- mAdditionalFacades = new Class[ 0 ];
+ m_interfacesToExpose = makeClasses( interfacesToExpose, classLoader
);
+ m_additionalFacades = new Class[ 0 ];
}
/**
- * Constructor PublicationDescription
+ * Construct a publication description.
*
*
- * @param interfacesToExpose
- * @param additionalFacades
- * @param classLoader
+ * @param interfacesToExpose the principal interfaces implemented by the
lookupable bean.
+ * @param additionalFacades assitional facades implemented by other
beans that
+ * would otherwise be serialized and treated as pass-by-value objects.
+ * @param classLoader the classloader containing the classdefs (special
cases)
+ * @throws PublicationException if there is a problem publishing
*
*/
public PublicationDescription(
String[] interfacesToExpose, String[] additionalFacades, ClassLoader
classLoader )
throws PublicationException
{
- mInterfacesToExpose = makeClasses( interfacesToExpose, classLoader );
- mAdditionalFacades = makeClasses( additionalFacades, classLoader );
+ m_interfacesToExpose = makeClasses( interfacesToExpose, classLoader
);
+ m_additionalFacades = makeClasses( additionalFacades, classLoader );
}
private static Class[] makeClasses( String[] classNames, ClassLoader
classLoader )
@@ -220,22 +214,49 @@
}
/**
- * Method getMostDerivedType
+ * Get the princiapal interfaces to expose.
*
*
- * @param beanImpl
+ * @return an array of those interfaces.
*
- * @return
+ */
+ public Class[] getInterfacesToExpose()
+ {
+ return m_interfacesToExpose;
+ }
+
+ /**
+ * Get the additional facades.
+ *
+ *
+ * @return an array of those facades.
+ *
+ */
+ public Class[] getAdditionalFacades()
+ {
+ return m_additionalFacades;
+ }
+
+
+ /**
+ * Get the most derived type for a bean.
+ *
+ *
+ * @param beanImpl the implementation
+ *
+ * @return an interface that is the most derived type.
*
*/
public Class getMostDerivedType( Object beanImpl )
{
+ //TODO relies of an order leadin to most derived type being last?
+
Class facadeRetVal = null;
- for( int i = 0; i < mAdditionalFacades.length; i++ )
+ for( int i = 0; i < m_additionalFacades.length; i++ )
{
- Class facade = mAdditionalFacades[ i ];
+ Class facade = m_additionalFacades[ i ];
if( facade.isAssignableFrom( beanImpl.getClass() ) )
{
1.3 +5 -5
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/PublicationException.java
Index: PublicationException.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/PublicationException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PublicationException.java 24 Apr 2002 12:43:00 -0000 1.2
+++ PublicationException.java 24 Aug 2002 11:39:05 -0000 1.3
@@ -18,14 +18,14 @@
{
/**
- * Constructor PublicationException
+ * Construct a PublicationException with a message
*
*
- * @param s
+ * @param message the message
*
*/
- public PublicationException( String s )
+ public PublicationException( String message )
{
- super( s );
+ super( message );
}
}
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServer.java
Index: AbstractServer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/AbstractServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractServer.java 19 Aug 2002 03:06:07 -0000 1.5
+++ AbstractServer.java 24 Aug 2002 11:39:06 -0000 1.6
@@ -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>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public abstract class AbstractServer extends AbstractMethodHandler
1.6 +2 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/DefaultMethodInvocationHandler.java
Index: DefaultMethodInvocationHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/DefaultMethodInvocationHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultMethodInvocationHandler.java 14 Jul 2002 18:49:26 -0000
1.5
+++ DefaultMethodInvocationHandler.java 24 Aug 2002 11:39:06 -0000
1.6
@@ -29,7 +29,7 @@
*
*
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
- * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
+ * @author Vinay Chandrasekharan <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
public class DefaultMethodInvocationHandler implements
MethodInvocationHandler
1.4 +11 -8
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/AbstractDynamicGeneratorClassRetriever.java
Index: AbstractDynamicGeneratorClassRetriever.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/AbstractDynamicGeneratorClassRetriever.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractDynamicGeneratorClassRetriever.java 25 Jul 2002 23:12:01
-0000 1.3
+++ AbstractDynamicGeneratorClassRetriever.java 24 Aug 2002 11:39:06
-0000 1.4
@@ -11,9 +11,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.net.URL;
import org.apache.excalibur.altrmi.common.ProxyGenerator;
-import org.apache.excalibur.altrmi.common.AbstractMethodHandler;
import org.apache.excalibur.altrmi.server.AltrmiProxyGenerator;
import org.apache.excalibur.altrmi.server.ClassRetrievalException;
import org.apache.excalibur.altrmi.server.ClassRetriever;
@@ -28,24 +26,29 @@
* @author Paul Hammant <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @version $Revision$
*/
-public class AbstractDynamicGeneratorClassRetriever implements
AltrmiProxyGenerator, ClassRetriever
+public class AbstractDynamicGeneratorClassRetriever
+ implements AltrmiProxyGenerator, ClassRetriever
{
private String m_altrmiClasspath;
private String m_classGenDir;
private String m_srcGenDir;
- private Class m_generatorClass ;
+ private Class m_generatorClass;
/**
*
* @param classLoader the classloader in which the proxy generater will
be found.
* @param generatorClassName the name of teh proxy gen class
*/
- public AbstractDynamicGeneratorClassRetriever(ClassLoader classLoader,
String generatorClassName)
+ public AbstractDynamicGeneratorClassRetriever(ClassLoader classLoader,
+ String generatorClassName)
{
- try {
+ try
+ {
m_generatorClass = classLoader.loadClass(generatorClassName);
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e)
+ {
throw new NoClassDefFoundError(generatorClassName);
}
}
1.4 +3 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/BcelDynamicGeneratorClassRetriever.java
Index: BcelDynamicGeneratorClassRetriever.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/BcelDynamicGeneratorClassRetriever.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BcelDynamicGeneratorClassRetriever.java 25 Jul 2002 23:12:01 -0000
1.3
+++ BcelDynamicGeneratorClassRetriever.java 24 Aug 2002 11:39:06 -0000
1.4
@@ -34,6 +34,7 @@
public BcelDynamicGeneratorClassRetriever()
{
- super(BcelDynamicGeneratorClassRetriever.class.getClassLoader(),
"org.apache.excalibur.altrmi.generator.BCELProxyGeneratorImpl");
+ super(BcelDynamicGeneratorClassRetriever.class.getClassLoader(),
+
"org.apache.excalibur.altrmi.generator.BCELProxyGeneratorImpl");
}
}
1.4 +3 -2
jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/JavacDynamicGeneratorClassRetriever.java
Index: JavacDynamicGeneratorClassRetriever.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/altrmi/src/java/org/apache/excalibur/altrmi/server/impl/classretrievers/JavacDynamicGeneratorClassRetriever.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavacDynamicGeneratorClassRetriever.java 25 Jul 2002 23:12:01 -0000
1.3
+++ JavacDynamicGeneratorClassRetriever.java 24 Aug 2002 11:39:06 -0000
1.4
@@ -34,6 +34,7 @@
public JavacDynamicGeneratorClassRetriever()
{
- super(JavacDynamicGeneratorClassRetriever.class.getClassLoader(),
"org.apache.excalibur.altrmi.generator.ProxyGeneratorImpl");
+ super(JavacDynamicGeneratorClassRetriever.class.getClassLoader(),
+ "org.apache.excalibur.altrmi.generator.ProxyGeneratorImpl");
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
