notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1231 - in trunk/main: depot/library/src/main/net/dpml/library/impl metro/builder/src/main/net/dpml/metro/builder station/api/src/main/net/dpml/station/info station/builder/src/main/net/dpml/station/builder transit/console/src/main/net/dpml/transit/console

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1231 - in trunk/main: depot/library/src/main/net/dpml/library/impl metro/builder/src/main/net/dpml/metro/builder station/api/src/main/net/dpml/station/info station/builder/src/main/net/dpml/station/builder transit/console/src/main/net/dpml/transit/console
Date: Mon, 20 Mar 2006 11:12:17 +0100

Author: mcconnell
Date: 2006-03-20 11:12:15 +0100 (Mon, 20 Mar 2006)
New Revision: 1231

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentConstants.java

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentDecoder.java

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyDecoder.java

trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyEncoder.java

trunk/main/station/api/src/main/net/dpml/station/info/ApplicationDescriptor.java

trunk/main/station/builder/src/main/net/dpml/station/builder/RegistryBuilder.java

trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java

trunk/main/transit/console/src/main/net/dpml/transit/console/LayoutDirectiveBuilder.java

trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
Log:
housekeeping

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
2006-03-20 09:50:38 UTC (rev 1230)
+++ trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -26,7 +26,6 @@
import net.dpml.library.Type;

import net.dpml.lang.Decoder;
-import net.dpml.lang.DecodingException;

import net.dpml.part.DecoderFactory;

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -727,7 +727,8 @@
properties = buildProperties( child );
}
}
- DependencyDirective[] deps = (DependencyDirective[])
dependencies.toArray( new DependencyDirective[0] );
+ DependencyDirective[] deps =
+ (DependencyDirective[]) dependencies.toArray( new
DependencyDirective[0] );
return new ResourceDirective( name, version, classifier,
basedir, types, deps, properties );
}
else
@@ -1116,6 +1117,7 @@
* Return the id attribute of the supplied element.
* @param element the DOM element
* @return the id value
+ * @exception DecodingException if an error occurs during element
evaluation
*/
protected String getID( Element element ) throws DecodingException
{

Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentBuilder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -40,6 +40,10 @@
private final ComponentStrategyDecoder m_strategyDecoder;
private final ComponentStrategyEncoder m_strategyEncoder;

+ /**
+ * Creation of a new component builder.
+ * @param factory the decoder factory
+ */
public ComponentBuilder( DecoderFactory factory )
{
m_strategyDecoder = new ComponentStrategyDecoder( factory );
@@ -51,14 +55,13 @@
* @param classloader the base classloader
* @param element the DOM element
* @return the deployment strategy
- * @exception Exception if an error occurs
+ * @exception DecodingException if an error occurs during element
evaluation
*/
public Object decode( ClassLoader classloader, Element element ) throws
DecodingException
{
return m_strategyDecoder.decode( classloader, element );
}

-
/**
* Export a component directive to an output stream as XML.
* @param writer the print writer

Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentConstants.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentConstants.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentConstants.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -26,7 +26,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-class ComponentConstants
+abstract class ComponentConstants
{
static final URI CONTROLLER_URI = createURI( "@CONTROLLER-URI@" );
static final URI BUILDER_URI = createURI( "@BUILDER-URI@" );

Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentDecoder.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentDecoder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentDecoder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -93,7 +93,7 @@
* Construct a component directive using the supplied DOM element.
* @param root the element representing the component directive definition
* @return the component directive
- * @exception Exception if an error occurs during directive creation
+ * @exception DecodingException if an error occurs during directive
creation
*/
public ComponentDirective buildComponent( Element root ) throws
DecodingException
{

Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyDecoder.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyDecoder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyDecoder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -19,7 +19,6 @@
package net.dpml.metro.builder;

import java.net.URI;
-import java.util.Map;

import net.dpml.lang.Decoder;
import net.dpml.lang.DecodingException;
@@ -67,7 +66,7 @@
* @param classloader the base classloader
* @param element the DOM element
* @return the deployment strategy
- * @exception Exception if an error occurs
+ * @exception DecodingException if an error occurs during element
evaluation
*/
public Object decode( ClassLoader classloader, Element element ) throws
DecodingException
{
@@ -79,9 +78,9 @@
* @param classloader the base classloader
* @param element the DOM element
* @return the component part strategy
- * @exception Exception if an error occurs
+ * @exception DecodingException if an error occurs during element
evaluation
*/
- public Type buildType( ClassLoader classloader, Element element ) throws
Exception
+ public Type buildType( ClassLoader classloader, Element element ) throws
DecodingException
{
boolean alias = ElementHelper.getBooleanAttribute( element, "alias",
false );
Strategy strategy = buildStrategy( classloader, element );
@@ -93,7 +92,7 @@
* @param classloader the base classloader
* @param element the DOM element
* @return the deployment strategy
- * @exception Exception if an error occurs
+ * @exception DecodingException if an error occurs during element
evaluation
*/
public Strategy buildStrategy( ClassLoader classloader, Element element
) throws DecodingException
{

Modified:
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyEncoder.java
===================================================================
---
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyEncoder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyEncoder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -20,14 +20,12 @@

import java.io.IOException;
import java.io.Writer;
-import java.util.Map;

import javax.xml.XMLConstants;

import net.dpml.metro.data.ComponentDirective;

import net.dpml.part.Strategy;
-import net.dpml.part.ValueEncoder;

import net.dpml.lang.Encoder;

Modified:
trunk/main/station/api/src/main/net/dpml/station/info/ApplicationDescriptor.java
===================================================================
---
trunk/main/station/api/src/main/net/dpml/station/info/ApplicationDescriptor.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/station/api/src/main/net/dpml/station/info/ApplicationDescriptor.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -20,7 +20,6 @@

import java.util.Properties;
import java.net.URI;
-import java.net.URISyntaxException;

import net.dpml.transit.info.CodeBaseDirective;
import net.dpml.lang.ValueDirective;
@@ -63,7 +62,6 @@
* @param shutdownTimeout shutdown timeout value
* @param properties system properties
* @param config uri to a part configuration
- * @exception URISyntaxException if the codebase URI is invalid
*/
public ApplicationDescriptor(
URI codebase, String title, ValueDirective[] parameters, String base,

Modified:
trunk/main/station/builder/src/main/net/dpml/station/builder/RegistryBuilder.java
===================================================================
---
trunk/main/station/builder/src/main/net/dpml/station/builder/RegistryBuilder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/station/builder/src/main/net/dpml/station/builder/RegistryBuilder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -53,7 +53,8 @@
* Build a registry descriptior from a uri.
* @param uri the uri to the descriptor XML document
* @return the registry descriptor
- * @exception Exception if an error occurs
+ * @exception DecodingException if a decoding error occurs
+ * @exception DecodingException if a IO error occurs
*/
public Object build( URI uri ) throws DecodingException, IOException
{
@@ -67,7 +68,7 @@
* @param classloader the base classloader
* @param element the element representing the root registry
* @return the registry descriptor
- * @exception Exception if an error occurs
+ * @exception DecodingException if a decoding error occurs
*/
public Object decode( ClassLoader classloader, Element element ) throws
DecodingException
{

Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/ContentDirectiveBuilder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -62,15 +62,15 @@
}
}

- String getCodeBase( URI codebase )
+ URI getCodeBase( URI codebase )
{
if( null != codebase )
{
- return codebase.toASCIIString();
+ return codebase;
}
else
{
- return m_directive.getCodeBaseURISpec();
+ return m_directive.getCodeBaseURI();
}
}

Modified:
trunk/main/transit/console/src/main/net/dpml/transit/console/LayoutDirectiveBuilder.java
===================================================================
---
trunk/main/transit/console/src/main/net/dpml/transit/console/LayoutDirectiveBuilder.java
2006-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/LayoutDirectiveBuilder.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -62,15 +62,15 @@
}
}

- String getCodeBase( URI codebase )
+ URI getCodeBase( URI codebase )
{
if( null != codebase )
{
- return codebase.toASCIIString();
+ return codebase;
}
else
{
- return m_directive.getCodeBaseURISpec();
+ return m_directive.getCodeBaseURI();
}
}

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-03-20 09:50:38 UTC (rev 1230)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-03-20 10:12:15 UTC (rev 1231)
@@ -401,7 +401,7 @@

ContentDirective handler =
new ContentDirective(
- key, title, uri.toASCIIString(), new ValueDirective[0] );
+ key, title, uri, new ValueDirective[0] );

ContentDirective[] newHandlers = new ContentDirective[
handlers.length + 1 ];
for( int i=0; i<handlers.length; i++ )
@@ -434,7 +434,7 @@

LayoutDirective handler =
new LayoutDirective(
- key, title, uri.toASCIIString(), new ValueDirective[0] );
+ key, title, uri, new ValueDirective[0] );

LayoutDirective[] newHandlers = new LayoutDirective[
handlers.length + 1 ];
for( int i=0; i<handlers.length; i++ )

r1231 - in trunk/main: depot/library/src/main/net/dpml/library/impl metro/builder/src/main/net/dpml/metro/builder station/api/src/main/net/dpml/station/info station/builder/src/main/net/dpml/station/builder transit/console/src/main/net/dpml/transit/console, mcconnell at BerliOS, 03/20/2006