notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1306 - in trunk/main: . depot/core/src/main/net/dpml/depot depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl metro/component/src/main/net/dpml/component metro/model/src/main/net/dpml/metro/info metro/runtime/src/main/net/dpml/metro/runtime metro/state/api/src/main/net/dpml/state station/api/src/main/net/dpml/station station/server/src/main/net/dpml/station/server transit/console/src/main/net/dpml/transit/console transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/part transit/core/src/main/net/dpml/transit util/cli/src/main/net/dpml/cli/util
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1306 - in trunk/main: . depot/core/src/main/net/dpml/depot depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl metro/component/src/main/net/dpml/component metro/model/src/main/net/dpml/metro/info metro/runtime/src/main/net/dpml/metro/runtime metro/state/api/src/main/net/dpml/state station/api/src/main/net/dpml/station station/server/src/main/net/dpml/station/server transit/console/src/main/net/dpml/transit/console transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/part transit/core/src/main/net/dpml/transit util/cli/src/main/net/dpml/cli/util
- Date: Tue, 4 Apr 2006 19:24:37 +0200
Author: mcconnell
Date: 2006-04-04 19:24:15 +0200 (Tue, 04 Apr 2006)
New Revision: 1306
Modified:
trunk/main/build.xml
trunk/main/depot/core/src/main/net/dpml/depot/Main.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
trunk/main/depot/library/src/main/net/dpml/library/impl/InvalidTypeNameException.java
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
trunk/main/depot/library/src/main/net/dpml/library/info/ImportDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/IncludeDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/Scope.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
trunk/main/metro/component/src/main/net/dpml/component/ActivationPolicy.java
trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
trunk/main/metro/model/src/main/net/dpml/metro/info/ThreadSafePolicy.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ConfigurationInvocationHandler.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ContextInvocationHandler.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ParametersInvocationHandler.java
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
trunk/main/metro/state/api/src/main/net/dpml/state/Trigger.java
trunk/main/station/api/src/main/net/dpml/station/ProcessState.java
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
trunk/main/transit/core/src/main/net/dpml/lang/Category.java
trunk/main/transit/core/src/main/net/dpml/part/DecoderFactory.java
trunk/main/transit/core/src/main/net/dpml/part/Part.java
trunk/main/transit/core/src/main/net/dpml/part/Plugin.java
trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCodeBaseModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
trunk/main/transit/core/src/main/net/dpml/transit/Repository.java
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
trunk/main/transit/core/src/main/net/dpml/transit/StandardLayoutModel.java
trunk/main/util/cli/src/main/net/dpml/cli/util/Comparators.java
Log:
javadoc clean-up
Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/build.xml 2006-04-04 17:24:15 UTC (rev 1306)
@@ -236,7 +236,7 @@
</target>
<target name="javadoc" depends="prepare">
- <x:javadoc title="DPML Component Management Platform" >
+ <x:javadoc title="DPML Component Management Platform" access="private">
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<link href="http://api.dpml.net/javax/servlet/2.5"/>
<link href="http://api.dpml.net/jetty/20060213"/>
Modified: trunk/main/depot/core/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-04-04
16:28:03 UTC (rev 1305)
+++ trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-04-04
17:24:15 UTC (rev 1306)
@@ -537,8 +537,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private Command( String label )
{
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -62,9 +62,9 @@
/**
* Constructor used by the library to create a virtual root module os
shared
* resource references.
+ * @param logger the assigned logging channel
* @param library the library
* @param directive the library directive from which common properties
are established
- * @param resources the array of top-level modules
*/
DefaultModule( Logger logger, DefaultLibrary library, AbstractDirective
directive )
{
@@ -74,6 +74,13 @@
m_directive = null;
}
+ /**
+ * Creation of a new nested module.
+ * @param logger the assigned logging channel
+ * @param library the library
+ * @param module the parent module
+ * @param directive the library directive from which common properties
are established
+ */
DefaultModule( Logger logger, DefaultLibrary library, DefaultModule
module, ModuleDirective directive )
throws DuplicateKeyException
{
@@ -89,6 +96,11 @@
}
}
+ /**
+ * Add a resource to the module.
+ * @param directive the resource directive to add to the module
+ * @throws DuplicateKeyException if a resource name is already bound
+ */
DefaultResource addResource( ResourceDirective directive ) throws
DuplicateKeyException
{
if( null == directive )
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/InvalidTypeNameException.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/InvalidTypeNameException.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/InvalidTypeNameException.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -29,7 +29,7 @@
{
/**
* Creation of a new InvalidTypeNameException.
- * @param name the exception message
+ * @param message the exception message
*/
InvalidTypeNameException( String message )
{
@@ -38,7 +38,7 @@
/**
* Creation of a new InvalidTypeNameException.
- * @param name the exception message
+ * @param message the exception message
* @param cause the causal exception
*/
InvalidTypeNameException( String message, Throwable cause )
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -273,7 +273,7 @@
* @param base the base directory
* @param element the module element
* @param offset the imported file directory offset
- * @param Exception if an error occurs
+ * @throws Exception if an error occurs
*/
private ResourceDirective buildResourceDirectiveFromElement(
File base, Element element, String offset ) throws Exception
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ImportDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ImportDirective.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ImportDirective.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -121,7 +121,7 @@
/**
* Compute the hash value.
- * @return the hascode value
+ * @return the hashcode value
*/
public int hashCode()
{
@@ -151,8 +151,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private Mode( String label )
{
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/IncludeDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/IncludeDirective.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/IncludeDirective.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -184,8 +184,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private Mode( String label )
{
Modified: trunk/main/depot/library/src/main/net/dpml/library/info/Scope.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/info/Scope.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/depot/library/src/main/net/dpml/library/info/Scope.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -63,7 +63,6 @@
* Internal constructor.
* @param label the enumeration label.
* @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private Scope( String label, int index )
{
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -81,7 +81,6 @@
*
* @param logger assigned logging channel
* @param library the library
- * @param part the part used to establish this class
* @param verbose verbose execution flag
*/
public StandardBuilder( Logger logger, Library library, boolean verbose )
Modified:
trunk/main/metro/component/src/main/net/dpml/component/ActivationPolicy.java
===================================================================
---
trunk/main/metro/component/src/main/net/dpml/component/ActivationPolicy.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/component/src/main/net/dpml/component/ActivationPolicy.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -92,8 +92,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private ActivationPolicy( String label )
{
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/CollectionPolicy.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -75,8 +75,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private CollectionPolicy( String label )
{
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/LifestylePolicy.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -64,8 +64,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private LifestylePolicy( String label )
{
Modified: trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/Priority.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -71,7 +71,6 @@
* Internal constructor.
* @param label the enumeration label.
* @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private Priority( String label, int index )
{
Modified:
trunk/main/metro/model/src/main/net/dpml/metro/info/ThreadSafePolicy.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/ThreadSafePolicy.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/ThreadSafePolicy.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -70,8 +70,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private ThreadSafePolicy( String label )
{
@@ -81,7 +79,7 @@
/**
* Parse the supplied name.
* @param value the value to parse
- * @return the collection policy
+ * @return the policy value
*/
public static ThreadSafePolicy parse( String value )
{
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -108,18 +108,11 @@
}
/**
- * Create a new remotely manageable component model.
- * @param directive the component definition
- * @return the managable component model
+ * Creation of a new component model using a supplied composition
datatstructure
+ * from which the classloader and deplyment strategy can be resolved.
+ * @param composition a composition datastructure
+ * @exception ControlException if an error occuts during model creation
*/
- //public ComponentModel createComponentModel(
- // Classpath classpath, ComponentDirective directive ) throws
ControlException
- //{
- // ClassLoader anchor = Logger.class.getClassLoader();
- // String partition = m_controller.getPartition() +
Model.PARTITION_SEPARATOR;
- // return createComponentModel( anchor, classpath, partition,
directive );
- //}
-
public ComponentModel createComponentModel( DefaultComposition
composition ) throws ControlException
{
String partition = m_controller.getPartition() +
Model.PARTITION_SEPARATOR;
@@ -148,7 +141,8 @@
/**
* Create a new remotely manageable component model.
- * @param classloader the parent classloader
+ * @param anchor the parent classloader
+ * @param classpath the classpath definition
* @param partition the enclosing partition
* @param directive the component definition
* @return the managable component model
@@ -193,6 +187,7 @@
* @param parent the parent handler
* @param anchor the anchor classloader
* @param context the managed context
+ * @param flag TRUE if the supplied model is managed by the handler
* @return the runtime handler
*/
DefaultComponentHandler createDefaultComponentHandler(
@@ -338,8 +333,8 @@
/**
* Load the component type for the supplied class.
- * @param the component class
- * @return the type defintion
+ * @param subject the component class
+ * @return the type definition
* @exception ControlException if an error occurs during type decoding
*/
Type loadType( Class subject ) throws ControlException
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -77,6 +77,13 @@
private static final String COMPONENT_NAMESPACE_URI =
"@COMPONENT-NAMESPACE-URI@";
+ /**
+ * Static URI of this controller.
+ */
+ public static final URI CONTROLLER_URI = createStaticURI(
"@PART-HANDLER-URI@" );
+
+ static final URI ROOT_URI = createStaticURI( "metro:/" );
+
//--------------------------------------------------------------------
// immutable state
//--------------------------------------------------------------------
@@ -183,7 +190,7 @@
/**
* Handle notification of the creation of a new classloader.
- * @param type the type of classloader (api, spi or impl)
+ * @param category the classloader category (public, protected or private)
* @param classloader the new classloader
*/
public void classloaderConstructed( Category category, ClassLoader
classloader )
@@ -400,125 +407,6 @@
return m_logger;
}
- /**
- * Load a directive from serialized form.
- *
- * @param uri the directive uri
- * @return the directive
- * @exception ControlException if an error is raised related to direction
construction
- * @exception IOException if an I/O error occurs while reading the
directive
- */
- public Directive loadDirective( URI uri ) throws ControlException,
IOException
- {
- ClassLoader current = Thread.currentThread().getContextClassLoader();
- Part part = Part.load( uri );
- throw new UnsupportedOperationException( "loadDirective" );
-
- /*
- try
- {
- Strategy strategy = part.getStrategy();
- Object data = strategy.getDeploymentData();
- if( data instanceof Directive )
- {
- return (Directive) data;
- }
- else
- {
- final String error =
- "Part datatype ["
- + data.getClass().getName()
- + "] referenced in the part ["
- + uri
- + "] is not recognized.";
- throw new ControllerException( error );
- }
- }
- catch( ControllerException e )
- {
- throw e;
- }
- catch( Exception e )
- {
- final String error =
- "Unexpected error while loading directive: "
- + uri;
- throw new ControllerException( error, e );
- }
- finally
- {
- Thread.currentThread().setContextClassLoader( current );
- }
- */
- }
-
- /**
- * Load a controller given a uri.
- * @param uri the forign controller uri
- * @return the part controller
- * @exception ControllerNotFoundException if the controller could not be
found
- * @exception DelegationException if an error occured in the foreign
controller
- */
- /*
- public Controller getPrimaryController( URI uri )
- throws ControllerNotFoundException, DelegationException
- {
- if( !getURI().equals( uri ) )
- {
- return resolveController( uri );
- }
- else
- {
- return this;
- }
- }
-
- private Controller resolveController( URI uri ) throws
ControllerNotFoundException
- {
- if( getURI().equals( uri ) )
- {
- return this;
- }
-
- synchronized( m_handlers )
- {
- Controller controller = (Controller) m_handlers.get( uri );
- if( null != controller )
- {
- return controller;
- }
- else
- {
- controller = loadForeignController( uri );
- m_handlers.put( uri, controller );
- return controller;
- }
- }
- }
-
- private Controller loadForeignController( URI uri ) throws
ControllerNotFoundException
- {
- ClassLoader classloader = Controller.class.getClassLoader();
- try
- {
- return (Controller) m_loader.getPlugin(
- classloader, uri,
- new Object[]{m_context} );
- }
- catch( IOException e )
- {
- throw new ControllerNotFoundException( CONTROLLER_URI, uri, e );
- }
- catch( InvocationTargetException e )
- {
- final String error =
- "Controller instantiation failure."
- + "URI: " + uri;
- throw new ControllerRuntimeException( error );
- }
- }
- */
-
String getPartition()
{
return m_partition;
@@ -531,13 +419,6 @@
m_dispatch.dispose();
}
- /**
- * Static URI of this controller.
- */
- public static final URI CONTROLLER_URI = createStaticURI(
"@PART-HANDLER-URI@" );
-
- static final URI ROOT_URI = createStaticURI( "metro:/" );
-
private static URI createStaticURI( String path )
{
try
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ConfigurationInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ConfigurationInvocationHandler.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ConfigurationInvocationHandler.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -45,7 +45,7 @@
/**
* Create a proxy invocation handler.
*
- * @param instance the instance
+ * @param config the instance
*/
public ConfigurationInvocationHandler( Configuration config )
{
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ContextInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ContextInvocationHandler.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ContextInvocationHandler.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -56,7 +56,7 @@
/**
* Create a context invocation handler.
*
- * @param handler the component handler
+ * @param provider the provider
*/
ContextInvocationHandler( DefaultProvider provider )
{
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -75,11 +75,12 @@
/**
* Creation of a new <tt>DefaultContextModel</tt>.
- * @param model the component model
+ * @param parent the parent model
+ * @param logger the assigned logging channel
* @param classloader the classloader
* @param type the component type
* @param directive the context directive
- * @exception ContextException if an error occurs in context model
construction
+ * @exception ModelException if an error occurs in context model
construction
* @exception RemoteException if a remote I/O error occurs
*/
DefaultContextModel(
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -54,8 +54,8 @@
//
------------------------------------------------------------------------
/**
- * Return the service class.
- * @param the class
+ * Get the service class.
+ * @return the service class
*/
public Class getServiceClass()
{
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ParametersInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ParametersInvocationHandler.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ParametersInvocationHandler.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -45,7 +45,7 @@
/**
* Create a proxy invocation handler.
*
- * @param instance the instance
+ * @param params the parameters instance
*/
public ParametersInvocationHandler( Parameters params )
{
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -54,7 +54,7 @@
/**
* Create a parts invocation handler.
*
- * @param handler the component handler
+ * @param manager the parts manager
*/
PartsInvocationHandler( PartsManager manager )
{
Modified: trunk/main/metro/state/api/src/main/net/dpml/state/Trigger.java
===================================================================
--- trunk/main/metro/state/api/src/main/net/dpml/state/Trigger.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/metro/state/api/src/main/net/dpml/state/Trigger.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -96,8 +96,6 @@
/**
* Internal constructor.
* @param label the enumeration label.
- * @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private TriggerEvent( String label )
{
Modified: trunk/main/station/api/src/main/net/dpml/station/ProcessState.java
===================================================================
--- trunk/main/station/api/src/main/net/dpml/station/ProcessState.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/station/api/src/main/net/dpml/station/ProcessState.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -73,7 +73,6 @@
* Internal constructor.
* @param label the enumeration label.
* @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private ProcessState( String label, int index )
{
Modified:
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/station/server/src/main/net/dpml/station/server/RemoteApplicationRegistry.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -398,7 +398,7 @@
/**
* Creation of a new ProfileAddedEvent.
* @param source the source registry
- * @param profile the profile that was added
+ * @param descriptor the application descriptor that was added
*/
public ApplicationDescriptorAddedEvent(
ApplicationRegistry source, ApplicationDescriptor descriptor )
@@ -415,7 +415,7 @@
/**
* Creation of a new ProfileRemovedEvent.
* @param source the source registry
- * @param profile the profile that was removed
+ * @param descriptor the application descriptor that was removed
*/
public ApplicationDescriptorRemovedEvent( ApplicationRegistry
source, ApplicationDescriptor descriptor )
{
Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -99,7 +99,7 @@
* Creation of a new Transit CLI handler.
*
* @param logger the assigned logging channel
- * @param args command line arguments
+ * @param line the command line
* @exception Exception if an error occurs during plugin establishment
*/
private TransitConsoleHandler( final Logger logger, final CommandLine
line ) throws Exception
Modified: trunk/main/transit/core/src/main/net/dpml/lang/Category.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Category.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Category.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -78,7 +78,6 @@
* Internal constructor.
* @param label the enumeration label.
* @param index the enumeration index.
- * @param map the set of constructed enumerations.
*/
private Category( String label, int index )
{
Modified: trunk/main/transit/core/src/main/net/dpml/part/DecoderFactory.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/DecoderFactory.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/part/DecoderFactory.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -99,9 +99,9 @@
/**
* Resolve the element helper uri from a supplied element.
*
- * @param element the DOM element
+ * @param namespace the DOM element namespace
* @return the builder uri
- * @exception Exception if an eror occurs
+ * @exception Exception if an error occurs
*/
public URI getDecoderURI( String namespace ) throws Exception
{
@@ -152,9 +152,9 @@
/**
* Delegating implementation of the decode operation.
- * @param classloader the base classloader
* @param element the subject element
* @return the resulting object
+ * @exception IOException if an IO error occurs
*/
public Object decode( Element element ) throws IOException
{
Modified: trunk/main/transit/core/src/main/net/dpml/part/Part.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/Part.java 2006-04-04
16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/part/Part.java 2006-04-04
17:24:15 UTC (rev 1306)
@@ -70,8 +70,8 @@
* Creation of a new part datastructure.
* @param logger the logging channel
* @param info the info descriptor
- * @param strategy the part deployment strategy
* @param classpath the part classpath definition
+ * @exception IOException if an I/O error occurs
*/
public Part( Logger logger, Info info, Classpath classpath ) throws
IOException
{
@@ -249,8 +249,8 @@
/**
* Handle notification of the creation of a new classloader.
- * @param type the type of classloader (api, spi or impl)
- * @param classloader the new classloader
+ * @param category the classloader category
+ * @param classloader the new classloader to report
*/
public void classloaderConstructed( Category category, ClassLoader
classloader )
{
Modified: trunk/main/transit/core/src/main/net/dpml/part/Plugin.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/Plugin.java 2006-04-04
16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/part/Plugin.java 2006-04-04
17:24:15 UTC (rev 1306)
@@ -45,8 +45,10 @@
/**
* Creation of an new plugin datatype.
+ * @param logger the assigned logging channel
+ * @param info the part info descriptor
+ * @param classpath the classpath descriptor
* @param classname the target class
- * @param params an array of default value arguments
*/
public Plugin(
Logger logger, Info info, Classpath classpath, String classname )
@@ -57,6 +59,9 @@
/**
* Creation of an new plugin datatype.
+ * @param logger the assigned logging channel
+ * @param info the part info descriptor
+ * @param classpath the classpath descriptor
* @param classname the target class
* @param params an array of default value arguments
*/
Modified:
trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -45,9 +45,10 @@
* Internal utility class to build a classloader. If the supplied url
* sequence is zero length the parent classloader is returned directly.
*
- * @param type the type of classloader (api, spi, impl)
+ * @param uri the uri identifying the classloader source part
+ * @param category the category that this classloader is handling
* @param parent the parent classloader
- * @param urls the urls to assign as classloader content
+ * @param uris the uris to assign as classloader content
* @return the classloader
*/
public static ClassLoader buildClassLoader( URI uri, Category category,
ClassLoader parent, URI[] uris )
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheModel.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -87,9 +87,7 @@
*
* @param logger the assigned logging channel
* @param directive the cache configuration directive
- * @param registry a registry of layout models
- * @param content a registry of content models
- * @exception RemoteException if a remote exception occurs
+ * @exception Exception if an error occurs
*/
public DefaultCacheModel( Logger logger, CacheDirective directive )
throws Exception
@@ -358,7 +356,8 @@
/**
* Add a new host model to the cache model.
- * @param model the host model to be added
+ * @param manager the host model to be added
+ * @param notify if TRUE issue a modification event
* @exception DuplicateKeyException a host model with a matching id
already exists
* @exception RemoteException if a remote exception occurs
*/
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCodeBaseModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCodeBaseModel.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCodeBaseModel.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -60,7 +60,7 @@
/**
* Construction of a new codebase model using a supplied codebase storage
unit.
* @param logger the assigned logging channel
- * @param home the codebase storage unit
+ * @param directive the codebase storage directive
* @exception RemoteException if a remote exception occurs
*/
public DefaultCodeBaseModel( Logger logger, CodeBaseDirective directive )
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentModel.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -52,7 +52,7 @@
/**
* Construction of a new content model using a supplied storage unit.
* @param logger the assigned logging channel
- * @param home the content model persistent storage home
+ * @param directive the content directive
* @exception RemoteException if a remote exception occurs
*/
public DefaultContentModel( Logger logger, ContentDirective directive )
throws RemoteException
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistryModel.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -61,7 +61,7 @@
/**
* Creation of a new content registry model.
* @param logger the supplied logging channel
- * @param home the content registry storage home
+ * @param handlers the content directives
* @exception DuplicateKeyException if the supplied home contains
* duplicate content model identities
* @exception RemoteException if a remote exception occurs
Modified: trunk/main/transit/core/src/main/net/dpml/transit/Repository.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/Repository.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/transit/core/src/main/net/dpml/transit/Repository.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -49,13 +49,11 @@
/**
* Get a part classloader relative to a supplied uri.
*
- * @param parent the parent classloader
* @param uri the part uri
* @return the plugin classloader
* @exception IOException if plugin loading exception occurs
*/
- ClassLoader getPluginClassLoader( URI uri )
- throws IOException;
+ ClassLoader getPluginClassLoader( URI uri ) throws IOException;
/**
* Get a plugin class relative to a supplied uri.
@@ -64,19 +62,16 @@
* @return the part class
* @exception IOException if plugin loading exception occurs
*/
- Class getPluginClass( URI uri )
- throws IOException;
+ Class getPluginClass( URI uri ) throws IOException;
/**
* Creates an object from a uri reference.
*
- * @param parent the parent classloader
* @param uri the reference to the application
* @param args instantiation arguments
* @return the plugin instance
* @exception IOException if plugin loading exception occurs
* @exception InvocationTargetException if the plugin constructor
invocation error occurs
*/
- Object getPlugin( URI uri, Object[] args )
- throws IOException, InvocationTargetException;
+ Object getPlugin( URI uri, Object[] args ) throws IOException,
InvocationTargetException;
}
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/transit/core/src/main/net/dpml/transit/SecuredTransitContext.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -172,12 +172,12 @@
//------------------------------------------------------------------
// constructors
//------------------------------------------------------------------
- /**
- * Creation of a new secured transit context.
- * @param model the transit configuration model
- * @param handler the cache handler
- * @param registry the content handler registry
- */
+ /**
+ * Creation of a new secured transit context.
+ * @param model the transit configuration model
+ * @param logger the assigned logging channel
+ * @exception IOException if an I/O error occurs
+ */
private SecuredTransitContext( TransitModel model, Logger logger )
throws IOException
{
m_model = model;
@@ -332,7 +332,7 @@
{
/**
* Listener creation.
- * @exeption RemoteException if a remote error occurs
+ * @exception RemoteException if a remote error occurs
*/
public ProxyController() throws RemoteException
{
@@ -365,7 +365,7 @@
{
/**
* Listener creation.
- * @exeption RemoteException if a remote error occurs
+ * @exception RemoteException if a remote error occurs
*/
public DisposalController() throws RemoteException
{
@@ -449,7 +449,7 @@
* with a preferences node named "excludes". Each attribute name is
appended to
* a single string where names are separated by the "|" character.
*
- * @param prefs the 'proxy' prefs node containing a child node named
'excludes'
+ * @param names an array of named excludes
* @return a string containing a sequence of excluded hosts (possibly
null)
*/
private static String toExcludesPath( String[] names )
Modified:
trunk/main/transit/core/src/main/net/dpml/transit/StandardLayoutModel.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/StandardLayoutModel.java
2006-04-04 16:28:03 UTC (rev 1305)
+++
trunk/main/transit/core/src/main/net/dpml/transit/StandardLayoutModel.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -55,7 +55,9 @@
/**
* Creation of a new layout model using a supplied layout configuration.
* @param logger the assigned logging channel
- * @param directive the layout configuration
+ * @param id the layout identifier
+ * @param title the layout title
+ * @param classname the layout classname
* @exception RemoteException if a remote exception occurs
*/
public StandardLayoutModel(
Modified: trunk/main/util/cli/src/main/net/dpml/cli/util/Comparators.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/util/Comparators.java
2006-04-04 16:28:03 UTC (rev 1305)
+++ trunk/main/util/cli/src/main/net/dpml/cli/util/Comparators.java
2006-04-04 17:24:15 UTC (rev 1306)
@@ -445,14 +445,14 @@
/**
* Compare two values.
- * @param left the first value
- * @param right the second value
+ * @param primary the first value
+ * @param secondary the second value
* @return the result
*/
- public int compare( final Object oleft, final Object oright )
+ public int compare( final Object primary, final Object secondary )
{
- final Option left = (Option) oleft;
- final Option right = (Option) oright;
+ final Option left = (Option) primary;
+ final Option right = (Option) secondary;
final boolean l = left.getTriggers().contains( m_name );
final boolean r = right.getTriggers().contains( m_name );
@@ -498,14 +498,14 @@
{
/**
* Compare two values.
- * @param left the first value
- * @param right the second value
+ * @param primary the first value
+ * @param secondary the second value
* @return the result
*/
- public int compare( final Object oleft, final Object oright )
+ public int compare( final Object primary, final Object secondary )
{
- final Option left = (Option) oleft;
- final Option right = (Option) oright;
+ final Option left = (Option) primary;
+ final Option right = (Option) secondary;
return left.getPreferredName().compareTo(
right.getPreferredName() );
}
}
@@ -539,14 +539,14 @@
{
/**
* Compare two values.
- * @param left the first value
- * @param right the second value
+ * @param primary the first value
+ * @param secondary the second value
* @return the result
*/
- public int compare( final Object oleft, final Object oright )
+ public int compare( final Object primary, final Object secondary )
{
- final Option left = (Option) oleft;
- final Option right = (Option) oright;
+ final Option left = (Option) primary;
+ final Option right = (Option) secondary;
final boolean l = left.isRequired();
final boolean r = right.isRequired();
- r1306 - in trunk/main: . depot/core/src/main/net/dpml/depot depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/impl metro/component/src/main/net/dpml/component metro/model/src/main/net/dpml/metro/info metro/runtime/src/main/net/dpml/metro/runtime metro/state/api/src/main/net/dpml/state station/api/src/main/net/dpml/station station/server/src/main/net/dpml/station/server transit/console/src/main/net/dpml/transit/console transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/part transit/core/src/main/net/dpml/transit util/cli/src/main/net/dpml/cli/util, mcconnell at BerliOS, 04/04/2006
Archive powered by MHonArc 2.6.24.