Chronological Thread  

< Chronological >       < Thread >

---

Author: mcconnell
Date: 2006-04-04 15:26:28 +0200 (Tue, 04 Apr 2006)
New Revision: 1304

Added:
trunk/main/metro/component/src/main/net/dpml/component/Composition.java
trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java
trunk/main/metro/runtime/etc/
trunk/main/metro/runtime/etc/test/
trunk/main/metro/runtime/etc/test/components/
trunk/main/metro/runtime/etc/test/components/array.xml
trunk/main/metro/runtime/etc/test/components/lookup.xml
trunk/main/metro/runtime/etc/test/components/minimal-component.xml
trunk/main/metro/runtime/etc/test/parts/
trunk/main/metro/runtime/etc/test/parts/test.xml
trunk/main/metro/runtime/etc/test/types/
trunk/main/metro/runtime/etc/test/types/example-1.xml
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/

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

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

trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java

trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java

trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/old/
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/package.html

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
trunk/main/metro/runtime/src/test/
trunk/main/metro/runtime/src/test/net/
trunk/main/metro/runtime/src/test/net/dpml/
trunk/main/metro/runtime/src/test/net/dpml/metro/
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/

trunk/main/metro/runtime/src/test/net/dpml/metro/builder/LookupTestCase.java

trunk/main/metro/runtime/src/test/net/dpml/metro/builder/MinimalTestCase.java
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/PartsTestCase.java
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/TypesTestCase.java
trunk/main/transit/core/src/main/net/dpml/lang/DefaultLogger.java
trunk/main/transit/core/src/main/net/dpml/part/Builder.java
trunk/main/transit/core/src/main/net/dpml/part/Decoder.java
trunk/main/transit/core/src/main/net/dpml/part/DecodingException.java
trunk/main/transit/core/src/main/net/dpml/part/Encoder.java
trunk/main/transit/core/src/main/net/dpml/part/PartError.java
trunk/main/transit/core/src/main/net/dpml/part/PartHandlerException.java
trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java
trunk/main/transit/core/src/main/net/dpml/part/SystemClassLoader.java
Removed:
trunk/main/metro/builder/
trunk/main/transit/core/etc/main/net/dpml/lang/
trunk/main/transit/core/src/main/net/dpml/lang/Decoder.java
trunk/main/transit/core/src/main/net/dpml/lang/DecodingException.java
trunk/main/transit/core/src/main/net/dpml/lang/Encoder.java
trunk/main/transit/core/src/main/net/dpml/part/PartDirective.java
trunk/main/transit/core/src/main/net/dpml/part/PartEncoder.java
trunk/main/transit/core/src/main/net/dpml/part/PartHandler.java
trunk/main/transit/core/src/main/net/dpml/part/PartHandlerFactory.java
trunk/main/transit/core/src/main/net/dpml/part/PartStrategyDecoder.java
trunk/main/transit/core/src/main/net/dpml/part/PartStrategyEncoder.java
trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
trunk/main/transit/core/src/main/net/dpml/part/Strategy.java

trunk/main/transit/core/src/main/net/dpml/part/UnresolvableHandlerException.java
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
trunk/main/transit/core/src/main/net/dpml/transit/SystemClassLoader.java
Modified:
trunk/main/central/src/docs/depot/library/projects.xml
trunk/main/central/src/docs/transit/parts/classpath/index.xml
trunk/main/central/src/docs/transit/parts/index.xml
trunk/main/depot/build/etc/bin/build.lap
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
trunk/main/depot/core/build.xml
trunk/main/depot/core/etc/bin/depot.lap
trunk/main/depot/core/src/main/net/dpml/depot/DepotRMIClassLoaderSpi.java
trunk/main/depot/core/src/main/net/dpml/depot/Main.java
trunk/main/depot/library/src/main/net/dpml/library/Type.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java

trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java

trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java

trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java

trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
trunk/main/metro/component/src/main/net/dpml/component/Controller.java
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java

trunk/main/metro/content/src/main/net/dpml/metro/content/PartContentHandler.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
trunk/main/metro/module.xml
trunk/main/metro/runtime/build.xml

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
trunk/main/metro/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
trunk/main/metro/tools/build.xml

trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
trunk/main/planet/http/module.xml
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java

trunk/main/station/builder/src/main/net/dpml/station/builder/RegistryBuilder.java
trunk/main/station/console/etc/bin/station.lap
trunk/main/station/exec/etc/bin/metro.lap

trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
trunk/main/station/server/etc/bin/scm/conf/wrapper.conf
trunk/main/transit/console/etc/bin/transit.lap

trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
trunk/main/transit/core/src/main/net/dpml/part/DecoderFactory.java
trunk/main/transit/core/src/main/net/dpml/part/Info.java
trunk/main/transit/core/src/main/net/dpml/part/Part.java
trunk/main/transit/core/src/main/net/dpml/part/PartDecoder.java
trunk/main/transit/core/src/main/net/dpml/part/Plugin.java
trunk/main/transit/core/src/main/net/dpml/part/Resource.java

trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java

trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
trunk/main/transit/core/src/main/net/dpml/transit/Repository.java
trunk/main/transit/core/src/main/net/dpml/transit/RepositoryException.java
trunk/main/transit/core/src/main/net/dpml/transit/StandardLoader.java
trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java

trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
trunk/main/transit/core/src/test/net/dpml/part/PartTestCase.java
trunk/main/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java

trunk/main/transit/tools/src/main/net/dpml/transit/tools/TransitComponentHelper.java
Log:
Normalize part loading such that component parts are handled in the same way
as transit plugins.

Modified: trunk/main/central/src/docs/depot/library/projects.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/projects.xml 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/central/src/docs/depot/library/projects.xml 2006-04-04
13:26:28 UTC (rev 1304)
@@ -126,7 +126,7 @@
<include key="dpml-metro-component" tag="protected"/>
<include key="dpml-metro-model" tag="protected"/>
<include key="dpml-state-impl"/>
- <include key="dpml-metro-builder"/>
+ <include key="dpml-metro-runtime"/>
</dependencies>
<dependencies scope="test">
<include ref="ant/ant-junit"/>

Modified: trunk/main/central/src/docs/transit/parts/classpath/index.xml
===================================================================
--- trunk/main/central/src/docs/transit/parts/classpath/index.xml
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/central/src/docs/transit/parts/classpath/index.xml
2006-04-04 13:26:28 UTC (rev 1304)
@@ -87,8 +87,8 @@
<uri>artifact:jar:dpml/util/dpml-job-impl#SNAPSHOT</uri>
<uri>artifact:jar:dpml/metro/dpml-state-impl#SNAPSHOT</uri>
<uri>artifact:jar:dpml/depot/dpml-library#SNAPSHOT</uri>
- <uri>artifact:jar:dpml/metro/dpml-metro-builder#SNAPSHOT</uri>
<uri>artifact:jar:dpml/metro/dpml-metro-runtime#SNAPSHOT</uri>
+ <uri>artifact:jar:dpml/metro/dpml-metro-runtime#SNAPSHOT</uri>
</private>
</classpath>]]>
</source>

Modified: trunk/main/central/src/docs/transit/parts/index.xml
===================================================================
--- trunk/main/central/src/docs/transit/parts/index.xml 2006-04-01 11:11:58
UTC (rev 1303)
+++ trunk/main/central/src/docs/transit/parts/index.xml 2006-04-04 13:26:28
UTC (rev 1304)
@@ -106,8 +106,8 @@
<uri>artifact:jar:dpml/util/dpml-job-impl#SNAPSHOT</uri>
<uri>artifact:jar:dpml/metro/dpml-state-impl#SNAPSHOT</uri>
<uri>artifact:jar:dpml/depot/dpml-library#SNAPSHOT</uri>
- <uri>artifact:jar:dpml/metro/dpml-metro-builder#SNAPSHOT</uri>
<uri>artifact:jar:dpml/metro/dpml-metro-runtime#SNAPSHOT</uri>
+ <uri>artifact:jar:dpml/metro/dpml-metro-runtime#SNAPSHOT</uri>
</private>
</classpath>


Modified: trunk/main/depot/build/etc/bin/build.lap
===================================================================
--- trunk/main/depot/build/etc/bin/build.lap 2006-04-01 11:11:58 UTC (rev
1303)
+++ trunk/main/depot/build/etc/bin/build.lap 2006-04-04 13:26:28 UTC (rev
1304)
@@ -3,7 +3,7 @@
#

-Ddpml.transit.include.tools=true
--Djava.system.class.loader=net.dpml.transit.SystemClassLoader
+-Djava.system.class.loader=net.dpml.part.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\security.policy
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Ddpml.depot.application=dpml.builder

Modified:
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
===================================================================
---
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -24,8 +24,14 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.Hashtable;

import net.dpml.lang.Logger;
+
+import net.dpml.part.Part;
+import net.dpml.part.Plugin;
+
import net.dpml.transit.Transit;

import net.dpml.library.Module;
@@ -34,7 +40,6 @@
import net.dpml.library.Type;
import net.dpml.library.info.ResourceDirective.Classifier;
import net.dpml.library.info.Scope;
-
import net.dpml.library.impl.DefaultLibrary;

import net.dpml.cli.Option;
@@ -65,6 +70,7 @@

private final Logger m_logger;
private final DefaultLibrary m_library;
+ private final Map m_map = new Hashtable();

private boolean m_verbose;

@@ -86,6 +92,8 @@
m_logger = logger;
m_library = new DefaultLibrary( logger );

+ Thread.currentThread().setContextClassLoader(
Builder.class.getClassLoader() );
+
Parser parser = new Parser();
parser.setGroup( COMMAND_GROUP );

@@ -151,24 +159,28 @@
}
}

- private Builder createBuilder( URI uri ) throws Exception
+ private Part createPart( URI uri ) throws Exception
{
try
{
- Object[] params = new Object[]{m_logger, m_library, new Boolean(
m_verbose )};
- ClassLoader classloader = Builder.class.getClassLoader();
- Class builderClass =
Transit.getInstance().getRepository().getPluginClass( classloader, uri );
- return (Builder)
Transit.getInstance().getRepository().instantiate( builderClass, params );
+ Thread.currentThread().setContextClassLoader(
Builder.class.getClassLoader() );
+ return Part.load( uri );
}
catch( Exception e )
{
final String error =
- "Unexpected error occured while attempting to load a plugin
builder.\nURI: "
+ "Unexpected error occured while attempting to load
builder.\nURI: "
+ uri;
throw new BuilderError( error, e );
}
}
-
+
+ private Builder createBuilder( Part part ) throws Exception
+ {
+ Object[] params = new Object[]{m_logger, m_library, new Boolean(
m_verbose )};
+ return (Builder) part.instantiate( params );
+ }
+
/**
* Resolve the project selection taking into account any overriding -s
* selection option, the -c switch, or in the absence of a selction, the
@@ -265,8 +277,10 @@
private boolean process( CommandLine line, Resource[] resources ) throws
Exception
{
URI uri = (URI) line.getValue( BUILDER_URI_OPTION, ANT_BUILDER_URI );
- Builder builder = createBuilder( uri );

+ Part part = createPart( uri );
+ Builder builder = createBuilder( part );
+
if( resources.length > 1 )
{
StringBuffer buffer =

Modified: trunk/main/depot/core/build.xml
===================================================================
--- trunk/main/depot/core/build.xml 2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/depot/core/build.xml 2006-04-04 13:26:28 UTC (rev 1304)
@@ -13,7 +13,7 @@
<filter token="DEPOT-PATH" value="${depot.short.filename}"/>
<filter token="TRANSIT-PATH" value="${transit.short.filename}"/>
<filter token="DEPOT-MAIN-CLASS" value="net.dpml.depot.Main" />
- <filter token="DEPOT-CLASSLOADER-CLASS"
value="net.dpml.transit.SystemClassLoader" />
+ <filter token="DEPOT-CLASSLOADER-CLASS"
value="net.dpml.part.SystemClassLoader" />
<x:filter token="DEPOT-CONSOLE-URI" feature="uri" type="jar"/>
<x:filter token="TRANSIT-CORE-URI" ref="dpml/transit/dpml-transit-main"
feature="uri" type="jar"/>
<x:filter token="TRANSIT-CONSOLE-URI"
ref="dpml/transit/dpml-transit-console" feature="uri" type="part"
alias="true"/>

Modified: trunk/main/depot/core/etc/bin/depot.lap
===================================================================
--- trunk/main/depot/core/etc/bin/depot.lap 2006-04-01 11:11:58 UTC (rev
1303)
+++ trunk/main/depot/core/etc/bin/depot.lap 2006-04-04 13:26:28 UTC (rev
1304)
@@ -20,11 +20,11 @@
#

-Djava.protocol.handler.pkgs=net.dpml.transit
--Djava.system.class.loader=net.dpml.transit.SystemClassLoader
+-Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@
-Djava.security.policy=${env.DPML_HOME}\share\bin\security.policy
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Djava.rmi.server.randomIDs=true
-janel.main.class=net.dpml.depot.Main
+janel.main.class=@DEPOT-MAIN-CLASS@
janel.min.java.version=1.4.0
janel.classpath.jars.dir=${env.DPML_HOME}\share\lib
janel.sysprop.process.id=true

Modified:
trunk/main/depot/core/src/main/net/dpml/depot/DepotRMIClassLoaderSpi.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/DepotRMIClassLoaderSpi.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/depot/core/src/main/net/dpml/depot/DepotRMIClassLoaderSpi.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -29,7 +29,7 @@
import java.util.IdentityHashMap;
import java.util.Map;

-import net.dpml.transit.StandardClassLoader;
+import net.dpml.part.StandardClassLoader;

/**
* The DepotRMIClassLoaderSpi handles the loading of classes that are based
on

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-01
11:11:58 UTC (rev 1303)
+++ trunk/main/depot/core/src/main/net/dpml/depot/Main.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -220,6 +220,9 @@
logger.debug( "system: " + command );
logger.debug( "uri: " + path );
logger.debug( "args: [" + toString( args ) + "]" );
+ logger.debug( "system classloader: ["
+ + System.identityHashCode( ClassLoader.getSystemClassLoader()
)
+ + "]" );
}
Logger log = resolveLogger( logger, command );
try
@@ -230,7 +233,6 @@
Repository repository = transit.getRepository();
m_plugin =
repository.getPlugin(
- ClassLoader.getSystemClassLoader(),
uri,
new Object[]
{

Modified: trunk/main/depot/library/src/main/net/dpml/library/Type.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Type.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/depot/library/src/main/net/dpml/library/Type.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -18,6 +18,8 @@

package net.dpml.library;

+import org.w3c.dom.Element;
+
/**
* Declaration of a type production.
*
@@ -42,6 +44,8 @@
* Return the type production datatype.
* @return the datatytpe
*/
- Object getData();
+ //Object getData();
+ Element getElement();

+
}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -54,7 +54,6 @@

private final LibraryDirective m_directive;
private final DefaultModule m_module;
- //private final DefaultModule m_imports;
private final File m_root;
private final Logger m_logger;
private final Hashtable m_anonymous = new Hashtable();
@@ -93,7 +92,7 @@
m_logger = logger;
m_directive = (LibraryDirective) super.getAbstractDirective();
m_root = source.getParentFile().getCanonicalFile();
- m_module = new DefaultModule( this, m_directive );
+ m_module = new DefaultModule( m_logger, this, m_directive );

getLogger().debug( "loaded root module: " + m_root );
System.setProperty( "dpml.library.basedir", m_root.toString() );
@@ -132,11 +131,9 @@
}
}

- //m_imports = new DefaultModule( this, m_directive );
for( int i=0; i<importModuleDirectives.length; i++ )
{
ModuleDirective importModuleDirective =
importModuleDirectives[i];
- //m_imports.addResource( importModuleDirective );
m_module.addResource( importModuleDirective );
}

@@ -425,7 +422,7 @@
}
try
{
- DefaultModule root = new DefaultModule( this, m_directive );
+ DefaultModule root = new DefaultModule( m_logger, this,
m_directive );
root.addResource( enclosing );
DefaultResource resource = root.getDefaultResource( group + "/"
+ name );
m_anonymous.put( urn, resource );

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -42,6 +42,7 @@

import net.dpml.lang.Category;
import net.dpml.lang.DuplicateKeyException;
+import net.dpml.lang.Logger;

/**
* A Module is a collection of resources. It serves to establish a
@@ -65,18 +66,18 @@
* @param directive the library directive from which common properties
are established
* @param resources the array of top-level modules
*/
- DefaultModule( DefaultLibrary library, AbstractDirective directive )
+ DefaultModule( Logger logger, DefaultLibrary library, AbstractDirective
directive )
{
- super( library, directive );
+ super( logger, library, directive );

m_root = true;
m_directive = null;
}

- DefaultModule( DefaultLibrary library, DefaultModule module,
ModuleDirective directive )
+ DefaultModule( Logger logger, DefaultLibrary library, DefaultModule
module, ModuleDirective directive )
throws DuplicateKeyException
{
- super( library, module, directive );
+ super( logger, library, module, directive );

m_root = false;
m_directive = directive;
@@ -178,17 +179,18 @@
}
else
{
+ Logger logger = getLogger();
DefaultLibrary library = getDefaultLibrary();
if( directive instanceof ModuleDirective )
{
ModuleDirective d = (ModuleDirective) directive;
- DefaultModule module = new DefaultModule( library, this,
d );
+ DefaultModule module = new DefaultModule( logger,
library, this, d );
m_map.put( key, module );
return module;
}
else
{
- DefaultResource resource = new DefaultResource( library,
this, directive );
+ DefaultResource resource = new DefaultResource( logger,
library, this, directive );
m_map.put( key, resource );
return resource;
}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -30,6 +30,7 @@
import java.util.Properties;

import net.dpml.lang.Category;
+import net.dpml.lang.Logger;

import net.dpml.library.Type;
import net.dpml.library.Resource;
@@ -71,8 +72,10 @@
private final String[] m_typeNames;
private final String m_path;
private final File m_basedir;
+ private final Logger m_logger;
+ private final String m_version;

- DefaultResource( DefaultLibrary library, AbstractDirective directive )
+ DefaultResource( Logger logger, DefaultLibrary library,
AbstractDirective directive )
{
super( null, directive );

@@ -83,9 +86,11 @@
m_typeNames = new String[0];
m_path = "";
m_basedir = null;
+ m_logger = logger;
+ m_version = resolveVersion();
}

- DefaultResource( DefaultLibrary library, DefaultModule module,
ResourceDirective directive )
+ DefaultResource( Logger logger, DefaultLibrary library, DefaultModule
module, ResourceDirective directive )
{
super( module, directive );
if( null == directive )
@@ -96,6 +101,8 @@
m_library = library;
m_directive = directive;
m_parent = module;
+ m_logger = logger;
+ m_version = resolveVersion();

if( module.isRoot() )
{
@@ -164,7 +171,7 @@
for( int i=0; i<directives.length; i++ )
{
TypeDirective directive = directives[i];
- types[i] = new DefaultType( this, directive );
+ types[i] = new DefaultType( m_logger, this, directive );
}
return types;
}
@@ -195,6 +202,15 @@
*/
public String getVersion()
{
+ return m_version;
+ }
+
+ /**
+ * Return the resource version.
+ * @return the version
+ */
+ private String resolveVersion()
+ {
if( null == m_directive )
{
return getStandardVersion();
@@ -1154,4 +1170,9 @@
return m_parent.getResourcePath();
}
}
+
+ protected Logger getLogger()
+ {
+ return m_logger;
+ }
}

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-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -25,9 +25,9 @@
import net.dpml.library.info.TypeDirective;
import net.dpml.library.Type;

-import net.dpml.lang.Decoder;
-
+import net.dpml.part.Decoder;
import net.dpml.part.DecoderFactory;
+import net.dpml.lang.Logger;

import org.w3c.dom.Element;
import org.w3c.dom.TypeInfo;
@@ -42,18 +42,20 @@
{
private final DefaultResource m_resource;
private final TypeDirective m_directive;
+ private final Logger m_logger;

/**
* Creation of a new DefaultType.
* @param resource the enclosing resource
* @param directive the type production directive
*/
- DefaultType( DefaultResource resource, TypeDirective directive )
+ DefaultType( Logger logger, DefaultResource resource, TypeDirective
directive )
{
super( resource, directive );

m_resource = resource;
m_directive = directive;
+ m_logger = logger;
}

/**
@@ -74,10 +76,16 @@
return m_directive.getAlias();
}

+ public Element getElement()
+ {
+ return m_directive.getElement();
+ }
+
/**
* Get the type specific datastructure.
* @return the datastructure
*/
+ /*
public Object getData()
{
Element element = m_directive.getElement();
@@ -104,9 +112,10 @@
throw new IllegalStateException( error );
}
}
- DecoderFactory factory = new DecoderFactory( map );
+ Logger logger = getLogger();
+ DecoderFactory factory = new DecoderFactory( logger, map );
Decoder decoder = factory.loadDecoder( element );
- return decoder.decode( getClass().getClassLoader(), element );
+ return decoder.decode( element );
}
catch( Throwable e )
{
@@ -115,5 +124,10 @@
throw new RuntimeException( error, e );
}
}
+ */

+ Logger getLogger()
+ {
+ return m_logger;
+ }
}

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -42,7 +42,7 @@
import net.dpml.transit.util.ElementHelper;

import net.dpml.lang.Category;
-import net.dpml.lang.DecodingException;
+import net.dpml.part.DecodingException;

import net.dpml.part.DOM3DocumentBuilder;

@@ -746,7 +746,7 @@
ClassLoader classloader = TypeBuilder.class.getClassLoader();
Repository repository = Transit.getInstance().getRepository();
Object[] args = new Object[0];
- Object handler = repository.getPlugin( classloader, uri, args );
+ Object handler = repository.getPlugin( uri, args );
if( handler instanceof TypeBuilder )
{
return (TypeBuilder) handler;

Modified:
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -22,6 +22,8 @@
import net.dpml.library.Resource;
import net.dpml.library.Type;

+import org.w3c.dom.Element;
+
/**
* Test DefaultLibrary implementation.
*
@@ -162,7 +164,7 @@
* Return the type datastructure.
* @return the data
*/
- public Object getData()
+ public Element getElement()
{
return null;
}

Modified:
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -61,14 +61,15 @@
* Test assigned build signature version.
* @exception Exception if a test error occurs
*/
- public void testBuildSignatureVersion() throws Exception
- {
- System.setProperty( "build.signature", "project.timestamp" );
- Resource resource = getLibrary().getResource(
"dpml/metro/dpml-composition-runtime" );
- String version = resource.getVersion();
- assertEquals( "version", "YYYYMMDD.HHMMSS".length(),
version.length() );
- System.getProperties().remove( "build.signature" );
- }
+ //public void testBuildSignatureVersion() throws Exception
+ //{
+ // System.setProperty( "build.signature", "project.timestamp" );
+ // Resource resource = getLibrary().getResource(
"dpml/metro/dpml-composition-runtime" );
+ // String version = resource.getVersion();
+ // System.out.println( "# VERSION: " + version );
+ // assertEquals( "version", "YYYYMMDD.HHMMSS".length(),
version.length() );
+ // System.getProperties().remove( "build.signature" );
+ //}

/**
* Test resource version.

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -81,6 +81,7 @@
*
* @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 )
@@ -98,7 +99,7 @@
"An internal error occured while attempting to construct the
workbench.";
throw new BuildException( error, e );
}
- Thread.currentThread().setContextClassLoader(
getClass().getClassLoader() );
+ Thread.currentThread().setContextClassLoader(
Builder.class.getClassLoader() );
}

//
------------------------------------------------------------------------

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -29,6 +29,9 @@
import net.dpml.library.impl.DefaultLibrary;

import net.dpml.lang.Logger;
+
+import net.dpml.part.StandardClassLoader;
+
import net.dpml.transit.monitor.LoggingAdapter;

import org.apache.tools.ant.BuildException;

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -34,6 +34,9 @@
import net.dpml.transit.Transit;
import net.dpml.transit.Repository;

+import net.dpml.part.Part;
+import net.dpml.part.Plugin;
+
/**
* Execute the install phase.
*
@@ -103,7 +106,7 @@
ClassLoader classloader = getClass().getClassLoader();
Class clazz = classloader.loadClass( classname );
Object[] args = new Object[]{processor};
- listeners[i] = (BuildListener) repository.instantiate(
clazz, args );
+ listeners[i] = (BuildListener) Plugin.instantiate(
clazz, args );
}
catch( Throwable e )
{
@@ -116,22 +119,25 @@
}
else
{
+ ClassLoader context =
Thread.currentThread().getContextClassLoader();
try
{
+ ClassLoader classloader = getClass().getClassLoader();
+ Thread.currentThread().setContextClassLoader(
classloader );
String classname = processor.getClassname();
Object[] params = new Object[]{processor};
- ClassLoader classloader = getClass().getClassLoader();
+
if( null == classname )
{
listeners[i] =
- (BuildListener)
Transit.getInstance().getRepository().getPlugin(
- classloader, uri, params );
+ (BuildListener)
Transit.getInstance().getRepository().getPlugin( uri, params );
}
else
{
- ClassLoader loader =
repository.getPluginClassLoader( classloader, uri );
+ Part part = repository.getPart( uri );
+ ClassLoader loader = part.getClassLoader();
Class c = loader.loadClass( classname );
- listeners[i] = (BuildListener)
repository.instantiate( c, params );
+ listeners[i] = (BuildListener) Plugin.instantiate(
c, params );
}
}
catch( ClassCastException e )
@@ -152,6 +158,10 @@
+ "\nName: " + name;
throw new ProcessorInstantiationException( error, e );
}
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( context );
+ }
}
}
return listeners;

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -26,13 +26,13 @@
import java.util.ArrayList;
import java.util.List;

+import net.dpml.lang.Logger;
import net.dpml.lang.Classpath;
import net.dpml.lang.Category;

import net.dpml.part.Info;
import net.dpml.part.Part;
-import net.dpml.part.PartEncoder;
-import net.dpml.part.Strategy;
+import net.dpml.part.PartDecoder;

import net.dpml.library.Type;
import net.dpml.library.Resource;
@@ -43,6 +43,11 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;

+import net.dpml.transit.Artifact;
+import net.dpml.transit.monitor.LoggingAdapter;
+
+import org.w3c.dom.Element;
+
/**
* Execute all plugins relative to the current build phase.
*
@@ -75,18 +80,7 @@

private File m_output;

- private Strategy m_strategy;
-
/**
- * Set the build strategy.
- * @param strategy the build strategy
- */
- public void setStrategy( Strategy strategy )
- {
- m_strategy = strategy;
- }
-
- /**
* Set the test build policy. The default is to include
* the project artifact in the classpath of a created part, however - in
a
* test scenario we don't want to do this. Setting test to true will
result
@@ -115,34 +109,11 @@
public void execute()
{
Resource resource = getResource();
- Strategy strategy = getStrategy( resource );
- Part part = buildPart( resource, strategy );
+ Part part = build( resource );
writePart( part );
}

/**
- * Construct a part using the supplied resource and strategy.
- * @param resource the resource
- * @param strategy the strategy
- * @return the part
- */
- public Part buildPart( Resource resource, Strategy strategy )
- {
- try
- {
- Info info = getInfo( resource );
- Classpath classpath = getClasspath( resource );
- return new Part( info, strategy, classpath );
- }
- catch( Exception e )
- {
- final String error =
- "Part construction error.";
- throw new BuildException( error, e );
- }
- }
-
- /**
* Externalize the part as a deliverable.
* @param part the part to be externalized as XML
*/
@@ -151,22 +122,16 @@
File file = getOutputFile();
try
{
- Object data = part.getStrategy().getDeploymentData();
- ClassLoader classloader = data.getClass().getClassLoader();
- ClassLoader loader =
Thread.currentThread().getContextClassLoader();
file.createNewFile();
final OutputStream output = new FileOutputStream( file );
try
{
- Thread.currentThread().setContextClassLoader( classloader );
- PartEncoder encoder = new PartEncoder();
- encoder.encodePart( part, output, "" );
+ part.encode( output );
checksum( file );
asc( file );
}
finally
{
- Thread.currentThread().setContextClassLoader( loader );
try
{
output.close();
@@ -207,19 +172,33 @@
* Build the plugin definition.
* @exception exception if a build related error occurs
*/
- private Part build( Resource resource ) throws Exception
+ protected Part build( Resource resource )
{
- Info info = getInfo( resource );
- Strategy strategy = getStrategy( resource );
- Classpath classpath = getClasspath( resource );
- return new Part( info, strategy, classpath );
+ try
+ {
+ Info info = getInfo( resource );
+ Classpath classpath = getClasspath( resource );
+ Type type = resource.getType( TYPE );
+ Element element = type.getElement();
+ PartDecoder decoder = PartDecoder.getInstance();
+ return decoder.build( info, classpath, element );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Internal error while attempting to build an external part
defintion."
+ + "\nResource: " + resource;
+ throw new BuildException( error, e, getLocation() );
+ }
}

- private Info getInfo( Resource resource )
+ protected Info getInfo( Resource resource )
{
+ Artifact artifact = resource.getArtifact( TYPE );
+ URI uri = artifact.toURI();
String title = getTitle( resource );
String description = getDescription( resource );
- return new Info( title, description );
+ return new Info( uri, title, description );
}

private String getTitle( Resource resource )
@@ -233,47 +212,6 @@
}

/**
- * Construct the strategy given the supplied resource.
- * @param resource the resource
- * @return the strategy
- */
- protected Strategy getStrategy( Resource resource )
- {
- if( null == m_strategy )
- {
- Type type = resource.getType( TYPE );
- Object data = type.getData();
- if( null != data )
- {
- if( data instanceof Strategy )
- {
- return (Strategy) data;
- }
- else
- {
- final String error =
- "Datatype associated as the 'part' datastructure is
not an instance of "
- + Strategy.class.getName() + "."
- + "\nClass " + type.getClass().getName();
- throw new BuildException( error, getLocation() );
- }
- }
- else
- {
- final String error =
- "No data associated with part declaration."
- + "\nResource: " + resource
- + "\nType: " + TYPE;
- throw new BuildException( error, getLocation() );
- }
- }
- else
- {
- return m_strategy;
- }
- }
-
- /**
* Construct the classpath for the supplied resource.
* @param resource the resource
* @return the classpath

Added: trunk/main/metro/component/src/main/net/dpml/component/Composition.java
===================================================================
--- trunk/main/metro/component/src/main/net/dpml/component/Composition.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/component/src/main/net/dpml/component/Composition.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.component;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URI;
+
+import net.dpml.lang.Classpath;
+import net.dpml.lang.Logger;
+
+import net.dpml.part.Info;
+import net.dpml.part.Part;
+
+/**
+ * Component composition.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public abstract class Composition extends Part
+{
+ private Directive m_directive;
+ private Controller m_controller;
+ private Model m_model;
+
+ public Composition( Logger logger, Info info, Classpath classpath,
Controller controller, Directive directive )
+ throws IOException
+ {
+ super( logger, info, classpath );
+
+ m_directive = directive;
+ m_controller = controller;
+ }
+
+ public Directive getDirective()
+ {
+ return m_directive;
+ }
+
+ public Model getModel()
+ {
+ if( null == m_model )
+ {
+ try
+ {
+ m_model = m_controller.createModel( this );
+ }
+ catch( Throwable e )
+ {
+ URI uri = m_controller.getURI();
+ final String error =
+ "Unexpected error while attempting to create a component
model."
+ + "\nDirective: " + m_directive;
+ throw new ControlRuntimeException( uri, error, e );
+ }
+ }
+ return m_model;
+ }
+
+ public Component newComponent()
+ {
+ Model model = getModel();
+ try
+ {
+ return m_controller.createComponent( model );
+ }
+ catch( Throwable e )
+ {
+ URI uri = m_controller.getURI();
+ final String error =
+ "Unexpected error while attempting to create a component."
+ + "\nDirective: " + m_directive;
+ throw new ControlRuntimeException( uri, error, e );
+ }
+ }
+
+ /**
+ * Instantiate a value.
+ * @param args supplimentary arguments
+ * @return the resolved instance
+ * @exception Exception if a deployment error occurs
+ */
+ public Object instantiate( Object[] args ) throws Exception
+ {
+ Component component = newComponent();
+ return component.getProvider().getValue( true );
+ }
+}

Modified:
trunk/main/metro/component/src/main/net/dpml/component/Controller.java
===================================================================
--- trunk/main/metro/component/src/main/net/dpml/component/Controller.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/component/src/main/net/dpml/component/Controller.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -49,7 +49,7 @@
* @exception ControlException if a direction construction error ocurrs
* @exception IOException if an I/O error occurs
*/
- Directive loadDirective( URI uri ) throws ControlException, IOException;
+ //Directive loadDirective( URI uri ) throws ControlException,
IOException;

/**
* Create and return a new management context using the supplied
directive uri.
@@ -62,6 +62,16 @@
Model createModel( URI uri ) throws ControlException, IOException;

/**
+ * Create and return a new management context using the supplied
directive uri.
+ *
+ * @param composition a composition directive
+ * @return the management model
+ * @exception ControlException if an error occurs
+ * @exception IOException if an I/O error occurs
+ */
+ Model createModel( Composition composition ) throws ControlException,
IOException;
+
+ /**
* Create and return a remote reference to a component handler.
* @param uri a uri identifying a deployment directive
* @return the component handler
@@ -76,4 +86,6 @@
* @exception Exception if a component construction error occurs
*/
Component createComponent( Model model ) throws Exception;
+
+
}

Modified:
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
===================================================================
---
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -141,12 +141,13 @@
Runtime.getRuntime().addShutdownHook( new ContextShutdownHook(
control ) );
}

+ ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
try
{
+ Thread.currentThread().setContextClassLoader(
InitialContext.class.getClassLoader() );
URI uri = getControllerURI();
- ClassLoader classloader = InitialContext.class.getClassLoader();
Repository repository = Transit.getInstance().getRepository();
- Class c = repository.getPluginClass( classloader, uri );
+ Class c = repository.getPluginClass( uri );
Constructor constructor = c.getConstructor( new
Class[]{ControllerContext.class} );
Controller controller = (Controller) constructor.newInstance(
new Object[]{control} );
return controller;
@@ -157,6 +158,10 @@
"Internal error while attempting to establish the standard
controller.";
throw new RuntimeException( error, e );
}
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( classloader );
+ }
}


//----------------------------------------------------------------------------

Modified:
trunk/main/metro/content/src/main/net/dpml/metro/content/PartContentHandler.java
===================================================================
---
trunk/main/metro/content/src/main/net/dpml/metro/content/PartContentHandler.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/content/src/main/net/dpml/metro/content/PartContentHandler.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -72,12 +72,8 @@
for( int i=0; i<classes.length; i++ )
{
Class c = classes[i];
- if( Directive.class.isAssignableFrom( c ) )
+ if( Model.class.isAssignableFrom( c ) )
{
- return CONTROLLER.loadDirective( uri );
- }
- else if( Model.class.isAssignableFrom( c ) )
- {
return CONTROLLER.createModel( uri );
}
else if( Component.class.isAssignableFrom( c ) )

Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentContext.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -47,7 +47,7 @@
* @return the component handler
* @exception Exception if an error occurs during component loading or
establishment
*/
- ComponentHandler createComponentHandler(
- ClassLoader anchor, URI uri ) throws Exception;
+ //ComponentHandler createComponentHandler(
+ // ClassLoader anchor, URI uri ) throws Exception;
}


Modified: trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/model/src/main/net/dpml/metro/ComponentHandler.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -30,7 +30,6 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-//public interface ComponentHandler extends ComponentOperations,
ComponentContext
public interface ComponentHandler extends Component, ComponentContext
{
/**

Added: trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2005 Stephen J. McConnell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.data;
+
+import java.io.IOException;
+import java.net.URI;
+
+import net.dpml.lang.Logger;
+import net.dpml.lang.Classpath;
+import net.dpml.lang.Value;
+
+import net.dpml.part.Info;
+import net.dpml.part.Plugin;
+
+/**
+ * A component based plugin.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class Composite extends Plugin
+{
+ private final ComponentDirective m_directive;
+
+ public Composite(
+ Logger logger, Info info, Classpath classpath, ComponentDirective
directive )
+ throws IOException
+ {
+ super( logger, info, classpath, directive.getClassname(), new
Value[0] );
+
+ m_directive = directive;
+ }
+
+ public ComponentDirective getComponentDirective()
+ {
+ return m_directive;
+ }
+}
+

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/module.xml 2006-04-04 13:26:28 UTC (rev 1304)
@@ -71,21 +71,6 @@
<include ref="dpml/util/dpml-configuration-impl"/>
</dependencies>
</project>
-
- <project name="dpml-metro-builder" basedir="builder">
- <types>
- <type id="jar"/>
- <part:plugin alias="true"
class="net.dpml.metro.builder.ComponentBuilder"/>
- </types>
- <dependencies>
- <include key="dpml-metro-model"/>
- <include ref="dpml/depot/dpml-library"/>
- <include key="dpml-state-impl"/>
- </dependencies>
- <dependencies scope="test">
- <include ref="ant/ant-junit"/>
- </dependencies>
- </project>

<project name="dpml-metro-runtime" basedir="runtime">
<types>
@@ -102,7 +87,6 @@
<include ref="dpml/util/dpml-configuration-impl"/>
<include ref="dpml/util/dpml-job-impl"/>
<include key="dpml-state-impl"/>
- <include key="dpml-metro-builder"/>
</dependencies>
<dependencies scope="test">
<include ref="ant/ant-junit"/>
@@ -119,7 +103,7 @@
<include ref="dpml/depot/dpml-tools-builder"/>
<include ref="dpml/transit/dpml-transit-tools"/>
<include key="dpml-metro-runtime"/>
- <include key="dpml-metro-builder"/>
+ <include key="dpml-metro-runtime"/>
</dependencies>
</project>


Modified: trunk/main/metro/runtime/build.xml
===================================================================
--- trunk/main/metro/runtime/build.xml 2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/runtime/build.xml 2006-04-04 13:26:28 UTC (rev 1304)
@@ -26,8 +26,11 @@

<target name="init" depends="standard.init">
<x:filter type="part" feature="uri" token="PART-HANDLER-URI" />
+ <x:filter type="xsd" feature="uri" token="STATE-XSD-URI"
ref="dpml/lang/dpml-state"/>
+ <x:filter type="xsd" feature="uri" token="PART-XSD-URI"
ref="dpml/lang/dpml-part"/>
+ <x:filter type="xsd" feature="uri" token="TYPE-XSD-URI"
ref="dpml/lang/dpml-type"/>
+ <x:filter type="xsd" feature="uri" token="COMPONENT-XSD-URI"
ref="dpml/lang/dpml-component"/>
<x:filter type="xsd" feature="uri" token="COMPONENT-NAMESPACE-URI"
ref="dpml/lang/dpml-component"/>
- <x:filter type="part" feature="uri" token="COMPONENT-BUILDER-URI"
ref="dpml/metro/dpml-metro-builder"/>
</target>

<target name="build" depends="standard.build">
@@ -42,6 +45,12 @@
</rmic>
</target>

+ <target name="install" depends="standard.install">
+ <x:property feature="uri" type="part" name="builder.uri"/>
+ <mkdir dir="${dpml.cache}/dpml/lang/parts"/>
+ <echo file="${dpml.cache}/dpml/lang/parts/dpml-component.part.link"
message="${builder.uri}"/>
+ </target>
+
</project>



Added: trunk/main/metro/runtime/etc/test/components/array.xml
===================================================================
--- trunk/main/metro/runtime/etc/test/components/array.xml 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/metro/runtime/etc/test/components/array.xml 2006-04-04
13:26:28 UTC (rev 1304)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<component xmlns="@COMPONENT-XSD-URI@"
+ type="net.dpml.test.array.ArrayTestComponent"
+ name="array"
+ lifestyle="thread"
+ collection="system"
+ activation="system">
+ <context>
+ <entry key="values" class="[Ljava.lang.String;">
+ <param class="Hello"/>
+ <param class="World"/>
+ </entry>
+ </context>
+</component>
+

Added: trunk/main/metro/runtime/etc/test/components/lookup.xml
===================================================================
--- trunk/main/metro/runtime/etc/test/components/lookup.xml 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/metro/runtime/etc/test/components/lookup.xml 2006-04-04
13:26:28 UTC (rev 1304)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<component xmlns="@COMPONENT-XSD-URI@"
+ type="net.dpml.test.array.ArrayTestComponent">
+ <context>
+ <entry key="test" lookup="acme.Widget"/>
+ </context>
+</component>
+

Added: trunk/main/metro/runtime/etc/test/components/minimal-component.xml
===================================================================
--- trunk/main/metro/runtime/etc/test/components/minimal-component.xml
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/runtime/etc/test/components/minimal-component.xml
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<component xmlns="@COMPONENT-XSD-URI@" name="widget" type="acme.Widget"/>

Added: trunk/main/metro/runtime/etc/test/parts/test.xml
===================================================================
--- trunk/main/metro/runtime/etc/test/parts/test.xml 2006-04-01 11:11:58
UTC (rev 1303)
+++ trunk/main/metro/runtime/etc/test/parts/test.xml 2006-04-04 13:26:28
UTC (rev 1304)
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<part xmlns="@PART-XSD-URI@">
+ <info title="Component Part"/>
+
+ <component xmlns="@COMPONENT-XSD-URI@"
+ type="net.dpml.test.array.ArrayTestComponent"
+ name="test">
+ <context>
+ <entry key="test" lookup="acme.Widget"/>
+ </context>
+ </component>
+
+ <classpath/>
+
+</part>
+

Added: trunk/main/metro/runtime/etc/test/types/example-1.xml
===================================================================
--- trunk/main/metro/runtime/etc/test/types/example-1.xml 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/metro/runtime/etc/test/types/example-1.xml 2006-04-04
13:26:28 UTC (rev 1304)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<type xmlns="artifact:xsd:dpml/lang/dpml-type#1.0"
+ xmlns:state="artifact:xsd:dpml/lang/dpml-state#1.0">
+
+ <info name="test"
+ class="net.dpml.test.part.ExampleComponent"
+ version="0.0.0"
+ lifestyle="thread"
+ collection="system"
+ threadsafe="unknown"/>
+
+ <services>
+ <service class="net.dpml.test.part.ColorManager" version="1.0.0"/>
+ </services>
+
+ <context>
+ <entry key="color" class="java.awt.Color" optional="false"/>
+ </context>
+
+ <!-- ISSUE need to add support for declarations such as <state:state ...>
-->
+ <state xmlns="artifact:xsd:dpml/lang/dpml-state#1.0"/>
+
+ <parts/>
+
+</type>

Added:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentConstants.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentConstants.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentConstants.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.net.URI;
+
+/**
+ * Component constants.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+abstract class ComponentConstants
+{
+ static final URI CONTROLLER_URI = createURI( "@PART-HANDLER-URI@" );
+
+ ComponentConstants()
+ {
+ }
+
+ private static URI createURI( String spec )
+ {
+ try
+ {
+ return new URI( spec );
+ }
+ catch( Throwable e )
+ {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ /**
+ * Return a string representation of the object.
+ * @return the string value
+ */
+ public String toString()
+ {
+ return super.toString();
+ }
+}

Added:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,335 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.IOException;
+import java.net.URI;
+
+import net.dpml.lang.Value;
+import net.dpml.part.DecodingException;
+
+import net.dpml.component.ActivationPolicy;
+
+import net.dpml.metro.data.ContextDirective;
+import net.dpml.metro.data.CategoryDirective;
+import net.dpml.metro.data.CategoriesDirective;
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.data.ValueDirective;
+import net.dpml.metro.data.LookupDirective;
+import net.dpml.metro.info.LifestylePolicy;
+import net.dpml.metro.info.CollectionPolicy;
+import net.dpml.metro.info.PartReference;
+import net.dpml.metro.info.Priority;
+
+import net.dpml.part.DOM3DocumentBuilder;
+import net.dpml.part.ValueDecoder;
+
+import net.dpml.transit.util.ElementHelper;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Construct a state graph.
+ */
+public class ComponentDecoder
+{
+ private static final String STATE_SCHEMA_URN = "@STATE-XSD-URI@";
+
+ private static final String SCHEMA_URN = "@COMPONENT-XSD-URI@";
+
+ private static final DOM3DocumentBuilder DOCUMENT_BUILDER = new
DOM3DocumentBuilder();
+
+ private static final ComponentTypeDecoder TYPE_DECODER = new
ComponentTypeDecoder();
+
+ private static final ValueDecoder VALUE_DECODER = new ValueDecoder();
+
+ /**
+ * Construct a component directive using the supplied uri.
+ * @param uri the part uri
+ * @return the component directive
+ * @exception IOException if an error occurs during directive creation
+ */
+ public ComponentDirective loadComponentDirective( URI uri ) throws
IOException
+ {
+ if( null == uri )
+ {
+ throw new NullPointerException( "uri" );
+ }
+ try
+ {
+ final Document document = DOCUMENT_BUILDER.parse( uri );
+ final Element root = document.getDocumentElement();
+ return buildComponent( root );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "An error while attempting to load a component directive."
+ + "\nURI: " + uri;
+ IOException exception = new IOException( error );
+ exception.initCause( e );
+ throw exception;
+ }
+ }
+
+ /**
+ * Construct a component directive using the supplied DOM element.
+ * @param root the element representing the component directive definition
+ * @return the component directive
+ * @exception DecodingException if an error occurs during directive
creation
+ */
+ public ComponentDirective buildComponent( Element root ) throws
DecodingException
+ {
+ if( null == root )
+ {
+ throw new NullPointerException( "root" );
+ }
+
+ return createComponentDirective( root );
+ }
+
+ private ComponentDirective createComponentDirective( Element element )
throws DecodingException
+ {
+ String classname = buildComponentClassname( element );
+ String name = buildComponentName( element );
+ ActivationPolicy activation = buildActivationPolicy( element );
+ CollectionPolicy collection = buildCollectionPolicy( element );
+ LifestylePolicy lifestyle = buildLifestylePolicy( element );
+ CategoriesDirective categories = getNestedCategoriesDirective(
element );
+ ContextDirective context = getNestedContextDirective( element );
+ PartReference[] parts = getNestedParts( element );
+
+ return new ComponentDirective(
+ name, activation, collection, lifestyle, classname,
+ categories, context, null, null, parts );
+ }
+
+ private String buildComponentClassname( Element element ) throws
DecodingException
+ {
+ String classname = ElementHelper.getAttribute( element, "type" );
+ if( null == classname )
+ {
+ final String error =
+ "Missing component 'class' attribute.";
+ throw new DecodingException( element, error );
+ }
+ else
+ {
+ return classname;
+ }
+ }
+
+ private ActivationPolicy buildActivationPolicy( Element element ) throws
DecodingException
+ {
+ String defaultValue = ActivationPolicy.SYSTEM.getName();
+ String policy = ElementHelper.getAttribute( element, "activation",
defaultValue );
+ return ActivationPolicy.parse( policy );
+ }
+
+ private LifestylePolicy buildLifestylePolicy( Element element ) throws
DecodingException
+ {
+ String policy = ElementHelper.getAttribute( element, "lifestyle",
null );
+ if( null != policy )
+ {
+ return LifestylePolicy.parse( policy );
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ private CollectionPolicy buildCollectionPolicy( Element element ) throws
DecodingException
+ {
+ String defaultValue = CollectionPolicy.SYSTEM.getName();
+ String policy = ElementHelper.getAttribute( element, "collection",
defaultValue );
+ return CollectionPolicy.parse( policy );
+ }
+
+ private String buildComponentName( Element element )
+ {
+ return ElementHelper.getAttribute( element, "name" );
+ }
+
+ private CategoriesDirective getNestedCategoriesDirective( Element root )
+ {
+ Element element = ElementHelper.getChild( root, "categories" );
+ if( null == element )
+ {
+ return null;
+ }
+ else
+ {
+ return createCategoriesDirective( element );
+ }
+ }
+
+ private CategoriesDirective createCategoriesDirective( Element element )
+ {
+ if( null == element )
+ {
+ return null;
+ }
+ else
+ {
+ String name = ElementHelper.getAttribute( element, "name" );
+ Priority priority = createPriority( element );
+ String target = ElementHelper.getAttribute( element, "target" );
+ CategoryDirective[] categories = createCategoryDirectiveArray(
element );
+ return new CategoriesDirective( name, priority, target,
categories );
+ }
+ }
+
+ private CategoryDirective createCategoryDirective( Element element )
+ {
+ String name = ElementHelper.getAttribute( element, "name" );
+ Priority priority = createPriority( element );
+ String target = ElementHelper.getAttribute( element, "target" );
+ return new CategoryDirective( name, priority, target );
+ }
+
+ private CategoryDirective[] createCategoryDirectiveArray( Element
element )
+ {
+ Element[] children = ElementHelper.getChildren( element );
+ CategoryDirective[] categories = new CategoryDirective[
children.length ];
+ for( int i=0; i<categories.length; i++ )
+ {
+ Element elem = children[i];
+ if( "category".equals( elem.getTagName() ) )
+ {
+ categories[i] = createCategoryDirective( elem );
+ }
+ else
+ {
+ categories[i] = createCategoriesDirective( elem );
+ }
+ }
+ return categories;
+ }
+
+ private Priority createPriority( Element element )
+ {
+ String priority = ElementHelper.getAttribute( element, "priority" );
+ if( null == priority )
+ {
+ return null;
+ }
+ else
+ {
+ return Priority.parse( priority );
+ }
+ }
+
+ private ContextDirective getNestedContextDirective( Element root )
+ {
+ Element context = ElementHelper.getChild( root, "context" );
+ if( null == context )
+ {
+ return null;
+ }
+ else
+ {
+ return createContextDirective( context );
+ }
+ }
+
+ private ContextDirective createContextDirective( Element element )
+ {
+ String classname = ElementHelper.getAttribute( element, "class" );
+ Element[] children = ElementHelper.getChildren( element );
+ PartReference[] entries = new PartReference[ children.length ];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element elem = children[i];
+ entries[i] = createContextEntryPartReference( elem );
+ }
+ return new ContextDirective( classname, entries );
+ }
+
+ private PartReference createContextEntryPartReference( Element element )
+ {
+ String key = ElementHelper.getAttribute( element, "key" );
+ String spec = ElementHelper.getAttribute( element, "lookup" );
+ if( null != spec )
+ {
+ LookupDirective directive = new LookupDirective( spec );
+ return new PartReference( key, directive );
+ }
+ else
+ {
+ ValueDirective directive = buildValueDirective( element );
+ return new PartReference( key, directive );
+ }
+ }
+
+ /**
+ * Build a value directive using a supplied DOM element.
+ * @param element the DOM element
+ * @return the value directive
+ */
+ protected ValueDirective buildValueDirective( Element element )
+ {
+ String classname = ElementHelper.getAttribute( element, "class" );
+ String method = ElementHelper.getAttribute( element, "method" );
+ Element[] elements = ElementHelper.getChildren( element, "param" );
+ if( elements.length > 0 )
+ {
+ Value[] values = VALUE_DECODER.decodeValues( elements );
+ return new ValueDirective( classname, method, values );
+ }
+ else
+ {
+ String value = ElementHelper.getAttribute( element, "value" );
+ return new ValueDirective( classname, method, value );
+ }
+ }
+
+ private PartReference[] getNestedParts( Element root ) throws
DecodingException
+ {
+ Element parts = ElementHelper.getChild( root, "parts" );
+ if( null == parts )
+ {
+ return null;
+ }
+ else
+ {
+ return createParts( parts );
+ }
+ }
+
+ private PartReference[] createParts( Element element ) throws
DecodingException
+ {
+ Element[] children = ElementHelper.getChildren( element );
+ PartReference[] parts = new PartReference[ children.length ];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element elem = children[i];
+ parts[i] = createPartReference( elem );
+ }
+ return parts;
+ }
+
+ private PartReference createPartReference( Element element ) throws
DecodingException
+ {
+ String key = ElementHelper.getAttribute( element, "key" );
+ ComponentDirective directive = createComponentDirective( element );
+ return new PartReference( key, directive );
+ }
+}

Added:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,475 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import javax.xml.XMLConstants;
+
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.Directive;
+
+import net.dpml.lang.Value;
+import net.dpml.part.Encoder;
+
+import net.dpml.part.ValueEncoder;
+
+import net.dpml.metro.data.ContextDirective;
+import net.dpml.metro.data.CategoryDirective;
+import net.dpml.metro.data.CategoriesDirective;
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.data.LookupDirective;
+import net.dpml.metro.data.ValueDirective;
+import net.dpml.metro.info.LifestylePolicy;
+import net.dpml.metro.info.CollectionPolicy;
+import net.dpml.metro.info.PartReference;
+import net.dpml.metro.info.Priority;
+
+/**
+ * Component part handler.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class ComponentEncoder extends ComponentConstants implements Encoder
+{
+ private static final String XML_HEADER = "<?xml version=\"1.0\"?>";
+ private static final String TYPE_SCHEMA_URN = "@TYPE-XSD-URI@";
+ private static final String STATE_SCHEMA_URN = "@STATE-XSD-URI@";
+ private static final String PART_SCHEMA_URN = "@PART-XSD-URI@";
+ private static final String COMPONENT_SCHEMA_URN = "@COMPONENT-XSD-URI@";
+ private static final String PARTIAL_COMPONENT_HEADER =
+ "<component xmlns=\""
+ + COMPONENT_SCHEMA_URN
+ + "\""
+ + "\n xmlns:xsi=\""
+ + XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI
+ + "\"\n xmlns:part=\""
+ + PART_SCHEMA_URN
+ + "\"\n xmlns:type=\""
+ + TYPE_SCHEMA_URN
+ + "\"\n xmlns:component=\""
+ + COMPONENT_SCHEMA_URN
+ + "\"";
+
+ private static final ValueEncoder VALUE_ENCODER = new ValueEncoder();
+
+ /**
+ * Export a component directive to an output stream as XML.
+ * @param directive the component directive
+ * @param output the output stream
+ * @exception IOException if an IO error occurs
+ */
+ public void export( ComponentDirective directive, OutputStream output )
throws IOException
+ {
+ final Writer writer = new OutputStreamWriter( output );
+
+ writer.write( XML_HEADER );
+ writer.write( "\n\n" );
+ writer.write( PARTIAL_COMPONENT_HEADER );
+ writeAttributes( writer, directive, "" );
+ writeBody( writer, directive, " " );
+ writer.write( "\n" );
+ writer.write( "</component>" );
+ writer.write( "\n" );
+ writer.flush();
+ output.close();
+ }
+
+ /**
+ * Export a component directive to an output stream as XML.
+ * @param writer the print writer
+ * @param object the object to encode
+ * @param pad character offset
+ * @exception IOException if an IO error occurs
+ */
+ public void encode( Writer writer, Object object, String pad ) throws
IOException
+ {
+ if( object instanceof ComponentDirective )
+ {
+ writeTaggedComponent( writer, (ComponentDirective) object, null,
pad );
+ }
+ else
+ {
+ final String error =
+ "Encoding subject is not recognized."
+ + "\nClass: " + object.getClass().getName();
+ throw new IllegalArgumentException( error );
+ }
+ }
+
+ /**
+ * Export a component directive to an output stream as XML.
+ * @param writer the print writer
+ * @param directive the component directive
+ * @param pad character offset
+ * @exception IOException if an IO error occurs
+ */
+ public void writeComponent(
+ Writer writer, ComponentDirective directive, String pad ) throws
IOException
+ {
+ writeTaggedComponent( writer, directive, null, pad );
+ }
+
+ /**
+ * Export a tagged component directive to an output stream as XML.
+ * @param writer the print writer
+ * @param directive the component directive
+ * @param key the key identifying the component
+ * @param pad character offset
+ * @exception IOException if an IO error occurs
+ */
+ public void writeTaggedComponent(
+ Writer writer, ComponentDirective directive, String key, String pad )
throws IOException
+ {
+ writer.write( "\n" + pad + "<component xmlns=\"" +
COMPONENT_SCHEMA_URN + "\"" );
+ if( null != key )
+ {
+ writer.write( " key=\"" + key + "\"" );
+ }
+ writer.write( "\n" + pad + " " );
+ writeAttributes( writer, directive, pad + " " );
+ writeBody( writer, directive, pad + " " );
+ writer.write( "\n" + pad + "</component>" );
+ }
+
+ void writeAttributes(
+ Writer writer, ComponentDirective directive, String pad ) throws
IOException
+ {
+ String classname = directive.getClassname();
+ writer.write( " type=\"" + classname + "\"" );
+ String name = directive.getName();
+ if( null != name )
+ {
+ writer.write( "\n" + pad + " name=\"" + name + "\"" );
+ }
+ LifestylePolicy lifestyle = directive.getLifestylePolicy();
+ if( null != lifestyle )
+ {
+ writer.write( "\n" + pad + " lifestyle=\"" + lifestyle.getName()
+ "\"" );
+ }
+ CollectionPolicy collection = directive.getCollectionPolicy();
+ if( null != collection )
+ {
+ writer.write( "\n" + pad + " collection=\"" +
collection.getName() + "\"" );
+ }
+ ActivationPolicy activation = directive.getActivationPolicy();
+ if( null != activation )
+ {
+ writer.write( "\n" + pad + " activation=\"" +
activation.getName() + "\"" );
+ }
+ writer.write( ">" );
+ }
+
+ void writeBody(
+ Writer writer, ComponentDirective directive, String pad ) throws
IOException
+ {
+ CategoriesDirective categories = directive.getCategoriesDirective();
+ ContextDirective context = directive.getContextDirective();
+ PartReference[] parts = directive.getPartReferences();
+ writeCategoriesDirective( writer, categories, pad );
+ writeContextDirective( writer, context, pad );
+ writeParts( writer, parts, pad );
+ }
+
+ private void writeCategoriesDirective(
+ Writer writer, CategoriesDirective categories, String pad ) throws
IOException
+ {
+ String name = categories.getName();
+ Priority priority = categories.getPriority();
+ String target = categories.getTarget();
+ CategoryDirective[] subCategories = categories.getCategories();
+
+ if( isaNullValue( name ) && isaNullPriority( priority ) &&
isaNullValue( target )
+ && ( subCategories.length == 0 ) )
+ {
+ return;
+ }
+
+ writer.write( "\n" + pad + "<categories" );
+ if( !isaNullValue( name ) )
+ {
+ writer.write( " name=\"" + name + "\"" );
+ }
+ if( !isaNullPriority( priority ) )
+ {
+ writer.write( " priority=\"" + priority.getName() + "\"" );
+ }
+ if( !isaNullValue( target ) )
+ {
+ writer.write( " target=\"" + target + "\"" );
+ }
+ if( subCategories.length == 0 )
+ {
+ writer.write( "/>" );
+ }
+ else
+ {
+ writer.write( ">" );
+ for( int i=0; i<subCategories.length; i++ )
+ {
+ CategoryDirective directive = subCategories[i];
+ if( directive instanceof CategoriesDirective )
+ {
+ CategoriesDirective c = (CategoriesDirective) directive;
+ writeCategoriesDirective( writer, c, pad + " " );
+ }
+ else
+ {
+ writeCategoryDirective( writer, directive, pad + " " );
+ }
+ }
+ writer.write( "\n" + pad + "</categories>" );
+ }
+ }
+
+ private boolean isaNullPriority( Priority priority )
+ {
+ if( null == priority )
+ {
+ return true;
+ }
+ else
+ {
+ return Priority.DEBUG.equals( priority );
+ }
+ }
+
+ private boolean isaNullValue( String value )
+ {
+ if( null == value )
+ {
+ return true;
+ }
+ else
+ {
+ return "".equals( value );
+ }
+ }
+
+ private void writeCategoryDirective(
+ Writer writer, CategoryDirective category, String pad ) throws
IOException
+ {
+ String name = category.getName();
+ Priority priority = category.getPriority();
+ String target = category.getTarget();
+
+ writer.write( "\n" + pad + "<category" );
+ if( null != name )
+ {
+ writer.write( " name=\"" + name + "\"" );
+ }
+ if( null != priority )
+ {
+ writer.write( " priority=\"" + priority.getName() + "\"" );
+ }
+ if( null != target )
+ {
+ writer.write( " target=\"" + target + "\"" );
+ }
+ writer.write( "/>" );
+ }
+
+ private void writeContextDirective(
+ Writer writer, ContextDirective context, String pad ) throws
IOException
+ {
+ String classname = context.getClassname();
+ PartReference[] parts = context.getDirectives();
+
+ if( ( null == classname ) && ( parts.length == 0 ) )
+ {
+ return;
+ }
+
+ writer.write( "\n" + pad + "<context" );
+ if( null != classname )
+ {
+ writer.write( " class=\"" + classname + "\"" );
+ }
+ if( parts.length == 0 )
+ {
+ writer.write( "/>" );
+ }
+ else
+ {
+ writer.write( ">" );
+ writeContextEntries( writer, parts, pad + " " );
+ writer.write( "\n" + pad + "</context>" );
+ }
+ }
+
+ /**
+ * Write a collection of part references.
+ * @param writer the writer
+ * @param parts the part refernece array
+ * @param pad the offset
+ * @exception IOException if an IO error occurs
+ */
+ protected void writeParts(
+ Writer writer, PartReference[] parts, String pad ) throws IOException
+ {
+ if( parts.length == 0 )
+ {
+ return;
+ }
+ else
+ {
+ writer.write( "\n" + pad + "<parts>" );
+ writePartReferences( writer, parts, pad + " " );
+ writer.write( "\n" + pad + "</parts>" );
+ }
+ }
+
+ private void writePartReferences(
+ Writer writer, PartReference[] parts, String pad ) throws IOException
+ {
+ for( int i=0; i<parts.length; i++ )
+ {
+ PartReference ref = parts[i];
+ writePartReference( writer, ref, pad );
+ }
+ }
+
+ private void writeContextEntries(
+ Writer writer, PartReference[] parts, String pad ) throws IOException
+ {
+ for( int i=0; i<parts.length; i++ )
+ {
+ PartReference ref = parts[i];
+ writeContextEntry( writer, ref, pad );
+ }
+ }
+
+ private void writeContextEntry(
+ Writer writer, PartReference part, String pad ) throws IOException
+ {
+ String key = part.getKey();
+ if( null == key )
+ {
+ throw new IllegalStateException( "key" );
+ }
+ Directive directive = part.getDirective();
+ if( null == directive )
+ {
+ throw new IllegalStateException( "directive" );
+ }
+ if( directive instanceof ValueDirective )
+ {
+ ValueDirective value = (ValueDirective) directive;
+ writeEntry( writer, key, value, pad );
+ }
+ else if( directive instanceof LookupDirective )
+ {
+ LookupDirective value = (LookupDirective) directive;
+ writeLookupEntry( writer, key, value, pad );
+ }
+ else
+ {
+ String classname = directive.getClass().getName();
+ final String message = "WARNING: UNRECOGNIZED ENTRY: "+
classname;
+ System.out.println( "# " + message );
+ System.out.println( "# key: " + key );
+ System.out.println( "# class: " + classname );
+ writer.write( "\n" + pad + "<!-- " + message + " -->" );
+ writer.write( "\n" + pad + "<!-- " );
+ writer.write( "\n" + pad + "key: " + key );
+ writer.write( "\n" + pad + "class: " +
directive.getClass().getName() );
+ writer.write( "\n" + pad + "-->" );
+ }
+ }
+
+ private void writeLookupEntry(
+ Writer writer, String key, LookupDirective directive, String pad )
throws IOException
+ {
+ String classname = directive.getServiceClassname();
+ writer.write( "\n" + pad + "<entry key=\"" + key + "\" lookup=\"" +
classname + "\"/>" );
+ }
+
+ private void writePartReference(
+ Writer writer, PartReference part, String pad ) throws IOException
+ {
+ String key = part.getKey();
+ if( null == key )
+ {
+ throw new IllegalStateException( "key" );
+ }
+
+ Directive directive = part.getDirective();
+ if( null == directive )
+ {
+ throw new IllegalStateException( "directive" );
+ }
+ if( directive instanceof ComponentDirective )
+ {
+ ComponentDirective component = (ComponentDirective) directive;
+ writeTaggedComponent( writer, component, key, pad );
+ }
+ else
+ {
+ String classname = directive.getClass().getName();
+ final String error =
+ "Part reference class not recognized."
+ + "\nClass: " + classname;
+ throw new IllegalArgumentException( error );
+ }
+ }
+
+ /**
+ * Write a context entry.
+ * @param writer the writer
+ * @param key the entry key
+ * @param value the value directive
+ * @param pad the offset
+ * @exception IOException if an IO error occurs
+ */
+ protected void writeEntry( Writer writer, String key, ValueDirective
value, String pad ) throws IOException
+ {
+ String target = value.getTargetExpression();
+ String method = value.getMethodName();
+
+ writer.write( "\n" + pad + "<entry key=\"" + key + "\"" );
+ if( null != target )
+ {
+ writer.write( " class=\"" + target + "\"" );
+ }
+ if( null != method )
+ {
+ writer.write( " method=\"" + method + "\"" );
+ }
+ Value[] values = value.getValues();
+ if( values.length > 0 )
+ {
+ writer.write( ">" );
+ VALUE_ENCODER.encodeValues( writer, values, pad + " " );
+ writer.write( "\n" + pad + "</entry>" );
+ }
+ else
+ {
+ String v = value.getBaseValue();
+ if( null != v )
+ {
+ writer.write( " value=\"" + v + "\"" );
+ }
+ writer.write( "/>" );
+ }
+ }
+}

Added:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,322 @@
+/*
+ * Copyright 2004 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Properties;
+
+import net.dpml.lang.Version;
+import net.dpml.part.DecodingException;
+
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.info.Type;
+import net.dpml.metro.info.InfoDescriptor;
+import net.dpml.metro.info.ContextDescriptor;
+import net.dpml.metro.info.CategoryDescriptor;
+import net.dpml.metro.info.ServiceDescriptor;
+import net.dpml.metro.info.EntryDescriptor;
+import net.dpml.metro.info.PartReference;
+import net.dpml.metro.info.CollectionPolicy;
+import net.dpml.metro.info.LifestylePolicy;
+import net.dpml.metro.info.ThreadSafePolicy;
+import net.dpml.metro.info.Priority;
+
+import net.dpml.part.DOM3DocumentBuilder;
+
+import net.dpml.state.State;
+import net.dpml.state.impl.StateDecoder;
+import net.dpml.state.impl.DefaultState;
+
+import net.dpml.transit.util.ElementHelper;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Document;
+
+
+/**
+ * Component type decoder.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class ComponentTypeDecoder
+{
+ private static final StateDecoder STATE_DECODER = new StateDecoder();
+
+ private static final DOM3DocumentBuilder DOCUMENT_BUILDER = new
DOM3DocumentBuilder();
+
+ private static final ComponentDecoder COMPONENT_DECODER = new
ComponentDecoder();
+
+ /**
+ * Load a type.
+ * @param subject the component implementation class
+ * @return the component type descriptor
+ * @exception IOException if an error occurs reading the type definition
+ */
+ public Type loadType( Class subject ) throws IOException
+ {
+ String classname = subject.getName();
+ String path = classname.replace( '.', '/' );
+ String target = path + ".type";
+ ClassLoader classloader = subject.getClassLoader();
+ URL url = classloader.getResource( target );
+ if( null == url )
+ {
+ return Type.createType( subject );
+ }
+ else
+ {
+ try
+ {
+ URI uri = new URI( url.toString() );
+ return loadType( uri );
+ }
+ catch( URISyntaxException e )
+ {
+ final String error =
+ "Bad uri value."
+ + "\nURI: " + url;
+ IOException exception = new IOException( error );
+ exception.initCause( e );
+ throw exception;
+ }
+ }
+ }
+
+ /**
+ * Load a type.
+ * @param uri the component type source uri
+ * @return the component type descriptor
+ * @exception IOException if an error occurs reading the type definition
+ */
+ public Type loadType( URI uri ) throws IOException
+ {
+ try
+ {
+ final Document document = DOCUMENT_BUILDER.parse( uri );
+ final Element root = document.getDocumentElement();
+ return buildType( root );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "An error while attempting to load a type."
+ + "\nType URI: " + uri;
+ IOException exception = new IOException( error );
+ exception.initCause( e );
+ throw exception;
+ }
+ }
+
+ private Type buildType( Element root ) throws Exception
+ {
+ InfoDescriptor info = buildNestedInfoDescriptor( root );
+ ServiceDescriptor[] services = buildNestedServices( root );
+ ContextDescriptor context = buildNestedContext( root );
+ CategoryDescriptor[] categories = buildNestedCategories( root );
+ State state = buildNestedState( root );
+ PartReference[] parts = buildNestedParts( root );
+ return new Type( info, categories, context, services, parts, state );
+ }
+
+ private InfoDescriptor buildNestedInfoDescriptor( Element root ) throws
DecodingException
+ {
+ Element info = ElementHelper.getChild( root, "info" );
+ if( null == info )
+ {
+ final String error =
+ "Definition of <type> is missing the required <info> element.";
+ throw new DecodingException( root, error );
+ }
+
+ String name = ElementHelper.getAttribute( info, "name" );
+ String classname = ElementHelper.getAttribute( info, "class" );
+ String version = ElementHelper.getAttribute( info, "version" );
+ String collection = ElementHelper.getAttribute( info, "collection",
"system" );
+ String lifestyle = ElementHelper.getAttribute( info, "lifestyle",
null );
+ String threadsafe = ElementHelper.getAttribute( info, "threadsafe",
"unknown" );
+ Properties properties = buildNestedProperties( info );
+
+ return new InfoDescriptor(
+ name,
+ classname,
+ Version.parse( version ),
+ buildLifestylePolicy( lifestyle ),
+ CollectionPolicy.parse( collection ),
+ ThreadSafePolicy.parse( threadsafe ),
+ properties );
+ }
+
+ private LifestylePolicy buildLifestylePolicy( String lifestyle )
+ {
+ if( null == lifestyle )
+ {
+ return null;
+ }
+ else
+ {
+ return LifestylePolicy.parse( lifestyle );
+ }
+ }
+
+ private ServiceDescriptor[] buildNestedServices( Element root )
+ {
+ Element element = ElementHelper.getChild( root, "services" );
+ if( null == element )
+ {
+ return new ServiceDescriptor[0];
+ }
+ else
+ {
+ Element[] children = ElementHelper.getChildren( element,
"service" );
+ ServiceDescriptor[] services = new ServiceDescriptor[
children.length ];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element child = children[i];
+ String classname = ElementHelper.getAttribute( child,
"class" );
+ String version = ElementHelper.getAttribute( child,
"version", "1.0.0" );
+ services[i] = new ServiceDescriptor( classname,
Version.parse( version ) );
+ }
+ return services;
+ }
+ }
+
+ private ContextDescriptor buildNestedContext( Element root )
+ {
+ Element context = ElementHelper.getChild( root, "context" );
+ if( null == context )
+ {
+ return new ContextDescriptor( new EntryDescriptor[0] );
+ }
+ else
+ {
+ Element[] children = ElementHelper.getChildren( context, "entry"
);
+ EntryDescriptor[] entries = new EntryDescriptor[ children.length
];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element child = children[i];
+ String key = ElementHelper.getAttribute( child, "key" );
+ String classname = ElementHelper.getAttribute( child,
"class" );
+ boolean optional = ElementHelper.getBooleanAttribute( child,
"optional", false );
+ boolean isVolatile = ElementHelper.getBooleanAttribute(
child, "volatile", false );
+ entries[i] = new EntryDescriptor( key, classname, optional,
isVolatile );
+ }
+ return new ContextDescriptor( entries );
+ }
+ }
+
+ private CategoryDescriptor[] buildNestedCategories( Element root )
+ {
+ Element element = ElementHelper.getChild( root, "categories" );
+ if( null == element )
+ {
+ return new CategoryDescriptor[0];
+ }
+ else
+ {
+ Element[] children = ElementHelper.getChildren( element,
"category" );
+ CategoryDescriptor[] categories = new CategoryDescriptor[
children.length ];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element elem = children[i];
+ String name = ElementHelper.getAttribute( elem, "name" );
+ String priority = ElementHelper.getAttribute( elem,
"priority" );
+ Properties properties = buildNestedProperties( elem );
+ categories[i] = new CategoryDescriptor( name,
Priority.parse( priority ), properties );
+ }
+ return categories;
+ }
+ }
+
+ private State buildNestedState( Element root )
+ {
+ // ISSUE: selection does not support namespace resolution
+ // and will fail with something like <acme:state>
+
+ Element element = ElementHelper.getChild( root, "state" );
+ if( null == element )
+ {
+ return new DefaultState();
+ }
+ else
+ {
+ return STATE_DECODER.buildStateGraph( element );
+ }
+ }
+
+ private PartReference[] buildNestedParts( Element root ) throws Exception
+ {
+ Element element = ElementHelper.getChild( root, "parts" );
+ if( null == element )
+ {
+ return new PartReference[0];
+ }
+ else
+ {
+ Element[] children = ElementHelper.getChildren( element );
+ if( children.length == 0 )
+ {
+ return new PartReference[0];
+ }
+ else
+ {
+ PartReference[] refs = new PartReference[ children.length ];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element child = children[i];
+ refs[i] = buildPartReference( child );
+ }
+ return refs;
+ }
+ }
+ }
+
+ private PartReference buildPartReference( Element element ) throws
Exception
+ {
+ String key = ElementHelper.getAttribute( element, "key" );
+ ComponentDirective definition = COMPONENT_DECODER.buildComponent(
element );
+ return new PartReference( key, definition );
+ }
+
+ private Properties buildNestedProperties( Element element )
+ {
+ Element[] entries = ElementHelper.getChildren( element, "property" );
+ if( entries.length == 0 )
+ {
+ return null;
+ }
+ else
+ {
+ Properties properties = new Properties();
+ for( int i=0; i<entries.length; i++ )
+ {
+ Element elem = entries[i];
+ String name = ElementHelper.getAttribute( elem, "name" );
+ String value = ElementHelper.getAttribute( elem, "value" );
+ properties.setProperty( name, value );
+ }
+ return properties;
+ }
+ }
+
+}
+

Added:
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2004 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import javax.xml.XMLConstants;
+
+import net.dpml.metro.info.Type;
+import net.dpml.metro.info.InfoDescriptor;
+import net.dpml.metro.info.ContextDescriptor;
+import net.dpml.metro.info.CategoryDescriptor;
+import net.dpml.metro.info.ServiceDescriptor;
+import net.dpml.metro.info.EntryDescriptor;
+import net.dpml.metro.info.PartReference;
+import net.dpml.metro.info.Descriptor;
+
+import net.dpml.state.State;
+import net.dpml.state.impl.StateEncoder;
+
+/**
+ * Type builder.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class ComponentTypeEncoder
+{
+ private static final String XML_HEADER =
+ "<?xml version=\"1.0\"?>";
+
+ private static final String PART_SCHEMA_URN = "@PART-XSD-URI@";
+ private static final String COMPONENT_SCHEMA_URN = "@COMPONENT-XSD-URI@";
+ private static final String TYPE_SCHEMA_URN = "@TYPE-XSD-URI@";
+
+ private static final StateEncoder STATE_GRAPH_ENCODER = new
StateEncoder();
+
+ static final ComponentEncoder COMPONENT_ENCODER = new ComponentEncoder();
+
+ private static final String HEADER =
+ "<type xmlns=\""
+ + TYPE_SCHEMA_URN
+ + "\""
+ + "\n xmlns:xsi=\""
+ + XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI
+ + "\"\n xmlns:part=\""
+ + PART_SCHEMA_URN
+ + "\"\n xmlns:type=\""
+ + TYPE_SCHEMA_URN
+ + "\"\n xmlns:component=\""
+ + COMPONENT_SCHEMA_URN
+ + "\">";
+
+ private static final String FOOTER = "</type>";
+
+ /**
+ * Write the supplied type to an output stream.
+ * @param type the type descriptor
+ * @param output the output stream
+ * @exception IOException if an IO error occurs
+ */
+ public void export( Type type, OutputStream output ) throws IOException
+ {
+ final Writer writer = new OutputStreamWriter( output );
+ writer.write( XML_HEADER );
+ writer.write( "\n\n" );
+ writer.write( HEADER );
+ writer.write( "\n" );
+ writeBody( writer, type, " " );
+ writer.write( "\n" );
+ writer.write( FOOTER );
+ writer.write( "\n" );
+ writer.flush();
+ output.close();
+ }
+
+ private void writeBody( Writer writer, Type type, String pad ) throws
IOException
+ {
+ writeTypeInfo( writer, type.getInfo(), pad );
+ writeTypeServices( writer, type.getServiceDescriptors(), pad );
+ writeTypeContext( writer, type.getContextDescriptor(), pad );
+ writeTypeCategories( writer, type.getCategoryDescriptors(), pad );
+ writeTypeState( writer, type.getStateGraph(), pad );
+ writeTypeParts( writer, type.getPartReferences(), pad );
+ }
+
+ private void writeTypeInfo( Writer writer, InfoDescriptor info, String
pad ) throws IOException
+ {
+ writer.write( "\n" + pad + "<info" );
+ writer.write( " name=\"" + info.getName() );
+ writer.write( "\"\n" + pad + " class=\"" + info.getClassname() );
+ writer.write( "\"\n" + pad + " version=\"" + info.getVersion() );
+ writer.write( "\"\n" + pad + " lifestyle=\"" +
info.getLifestylePolicy().getName().toLowerCase() );
+ writer.write( "\"\n" + pad + " collection=\"" +
info.getCollectionPolicy().getName().toLowerCase() );
+ writer.write( "\"\n" + pad + " threadsafe=\"" +
info.getThreadSafePolicy().getName().toLowerCase() );
+ writer.write( "\"" );
+ if( info.getAttributeNames().length > 0 )
+ {
+ writer.write( ">" );
+ writeAttributes( writer, info, pad + " " );
+ writer.write( "\n" + pad + "</info>" );
+ }
+ else
+ {
+ writer.write( "/>" );
+ }
+ }
+
+ private void writeTypeServices( Writer writer, ServiceDescriptor[]
services, String pad ) throws IOException
+ {
+ if( services.length == 0 )
+ {
+ return;
+ }
+ else
+ {
+ writer.write( "\n" + pad + "<services>" );
+ for( int i=0; i<services.length; i++ )
+ {
+ ServiceDescriptor service = services[i];
+ writer.write( "\n" + pad + " <service" );
+ writer.write( " class=\"" + service.getClassname() );
+ writer.write( "\" version=\"" + service.getVersion() );
+ writer.write( "\"/>" );
+ }
+ writer.write( "\n" + pad + "</services>" );
+ }
+ }
+
+ private void writeTypeContext( Writer writer, ContextDescriptor context,
String pad ) throws IOException
+ {
+ EntryDescriptor[] entries = context.getEntryDescriptors();
+ if( entries.length > 0 )
+ {
+ writer.write( "\n" + pad + "<context>" );
+ for( int i=0; i<entries.length; i++ )
+ {
+ EntryDescriptor entry = entries[i];
+ writer.write( "\n" + pad + " <entry" );
+ writer.write( " key=\"" + entry.getKey() );
+ writer.write( "\" class=\"" + entry.getClassname() );
+ if( entry.isOptional() )
+ {
+ writer.write( "\" optional=\"true\"" );
+ }
+ else
+ {
+ writer.write( "\" optional=\"false\"" );
+ }
+ if( entry.isVolatile() )
+ {
+ writer.write( "\" volatile=\"true\"" );
+ }
+ writer.write( "/>" );
+ }
+ writer.write( "\n" + pad + "</context>" );
+ }
+ else
+ {
+ return;
+ }
+ }
+
+ private void writeTypeCategories(
+ Writer writer, CategoryDescriptor[] categories, String pad ) throws
IOException
+ {
+ if( categories.length > 0 )
+ {
+ writer.write( "\n" + pad + "<categories>" );
+ for( int i=0; i<categories.length; i++ )
+ {
+ CategoryDescriptor category = categories[i];
+ writer.write( "\n" + pad + " <category" );
+ writer.write( " name=\"" + category.getName() );
+ writer.write(
+ "\" priority=\""
+ + category.getDefaultPriority().getName().toLowerCase() );
+ writer.write( "\"" );
+
+ if( category.getAttributeNames().length > 0 )
+ {
+ writer.write( ">" );
+ writeAttributes( writer, category, pad + " " );
+ writer.write( "\n" + pad + " </category>" );
+ }
+ else
+ {
+ writer.write( "/>" );
+ }
+ }
+ writer.write( "\n" + pad + "</categories>" );
+ }
+ else
+ {
+ return;
+ }
+ }
+
+ private void writeTypeState( Writer writer, State state, String pad )
throws IOException
+ {
+ STATE_GRAPH_ENCODER.writeState( writer, state, pad );
+ writer.write( "\n" );
+ }
+
+ private void writeTypeParts( Writer writer, PartReference[] parts,
String pad ) throws IOException
+ {
+ COMPONENT_ENCODER.writeParts( writer, parts, pad );
+ }
+
+ private void writeAttributes( Writer writer, Descriptor descriptor,
String pad ) throws IOException
+ {
+ String[] names = descriptor.getAttributeNames();
+ for( int i=0; i<names.length; i++ )
+ {
+ String name = names[i];
+ String value = descriptor.getAttribute( name, "" );
+ writer.write( "\n" + pad + "<property" );
+ writer.write( " name=\"" + name );
+ writer.write( "\" value=\"" + value );
+ writer.write( "\"/>" );
+ }
+ }
+}
+

Added: trunk/main/metro/runtime/src/main/net/dpml/metro/builder/package.html
===================================================================
--- trunk/main/metro/runtime/src/main/net/dpml/metro/builder/package.html
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/runtime/src/main/net/dpml/metro/builder/package.html
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,9 @@
+
+<body>
+
+<p>
+Utilities supporting component definition creation and externalization
to/from XML.
+</p>
+
+</body>
+

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -39,9 +39,9 @@
import net.dpml.lang.Classpath;
import net.dpml.lang.UnknownKeyException;
import net.dpml.lang.Value;
+import net.dpml.lang.Logger;
+import net.dpml.lang.DefaultLogger;

-import net.dpml.logging.Logger;
-
import net.dpml.metro.info.Type;
import net.dpml.metro.info.EntryDescriptor;
import net.dpml.metro.info.ServiceDescriptor;
@@ -54,6 +54,8 @@

import net.dpml.parameters.Parameters;

+import net.dpml.part.StandardClassLoader;
+
/**
* The ComponentController class is a controller of a component instance.
*
@@ -110,14 +112,36 @@
* @param directive the component definition
* @return the managable component model
*/
- public ComponentModel createComponentModel(
- Classpath classpath, ComponentDirective directive ) throws
ControlException
+ //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
{
- ClassLoader anchor = Logger.class.getClassLoader();
String partition = m_controller.getPartition() +
Model.PARTITION_SEPARATOR;
- return createComponentModel( anchor, classpath, partition, directive
);
+ try
+ {
+ Logger logger = new DefaultLogger( partition );
+ return new DefaultComponentModel( logger, this, composition,
partition );
+ }
+ catch( RemoteException e )
+ {
+ final String error =
+ "Creation of a new component model failed due to an remote
exception.";
+ throw new ControllerException( error, e );
+ }
+ catch( IOException e )
+ {
+ final String error =
+ "Creation of a new component model failed due to an IO
exception.";
+ throw new ControllerException( error, e );
+ }
}
-
+

//--------------------------------------------------------------------------
// ComponentController

//--------------------------------------------------------------------------
@@ -135,7 +159,8 @@
{
try
{
- return new DefaultComponentModel( anchor, this, classpath,
directive, partition );
+ Logger logger = new DefaultLogger( partition );
+ return new DefaultComponentModel( logger, anchor, this,
classpath, directive, partition );
}
catch( RemoteException e )
{
@@ -178,9 +203,9 @@
{
final String name = context.getName();
final String path = context.getContextPath();
- Logger logger = new StandardLogger( path.replace( '/', '.' ) );
+ Logger logger = new DefaultLogger( path );
Classpath classpath = context.getClasspath();
- ClassLoader classloader = getClassLoader( anchor, classpath );
+ ClassLoader classloader = resolveClassLoader( anchor, context );
return new DefaultComponentHandler( parent, classloader, logger,
this, context, flag );
}
catch( RemoteException e )
@@ -201,6 +226,22 @@
}
}

+ private ClassLoader resolveClassLoader( ClassLoader anchor,
ComponentModel model ) throws IOException
+ {
+ if( model instanceof DefaultComponentModel )
+ {
+ getLogger().debug( "using model classloader (local mode) for " +
model.getContextPath() );
+ DefaultComponentModel impl = (DefaultComponentModel) model;
+ return impl.getClassLoader();
+ }
+ else
+ {
+ getLogger().debug( "building new classloader (remote mode) for "
+ model.getContextPath() );
+ Classpath classpath = model.getClasspath();
+ return getClassLoader( anchor, classpath );
+ }
+ }
+
Object createInstance( DefaultProvider provider ) throws
ControlException, InvocationTargetException
{
DefaultComponentHandler handler =
provider.getDefaultComponentHandler();
@@ -230,11 +271,16 @@
String spec = getPathForLogger( handler );
args[i] = java.util.logging.Logger.getLogger( spec );
}
- else if( Logger.class.isAssignableFrom( c ) )
+ else if( net.dpml.logging.Logger.class.isAssignableFrom( c ) )
{
String spec = getPathForLogger( handler );
args[i] = new StandardLogger( spec );
}
+ else if( Logger.class.isAssignableFrom( c ) )
+ {
+ String spec = getPathForLogger( handler );
+ args[i] = new DefaultLogger( spec );
+ }
else if( Parameters.class.isAssignableFrom( c ) )
{
args[i] = createParametersArgument( handler );
@@ -261,7 +307,8 @@
+ handler.getPath()
+ "] ("
+ subject.getName()
- + ").";
+ + ")."
+ + StandardClassLoader.toString(
getClass().getClassLoader(), c.getClassLoader() );
throw new ControllerException( error );
}
}
@@ -312,6 +359,15 @@

Class loadComponentClass( ClassLoader classloader, String classname )
throws ControlException
{
+ if( null == classloader )
+ {
+ throw new NullPointerException( "classloader" );
+ }
+ if( null == classname )
+ {
+ throw new NullPointerException( "classname" );
+ }
+
try
{
return classloader.loadClass( classname );

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -26,7 +26,9 @@

import net.dpml.transit.Artifact;
import net.dpml.transit.UnsupportedSchemeException;
-import net.dpml.transit.StandardClassLoader;
+
+import net.dpml.part.StandardClassLoader;
+
import net.dpml.lang.Category;

/**
@@ -48,11 +50,11 @@
//--------------------------------------------------------------------

public CompositionClassLoader(
- URI uri, Category category, ClassLoader base, URI[] uris, ClassLoader
parent )
+ URI uri, Category category, ClassLoader management, ClassLoader client
)
{
- super( uri, category, urisToURLs( uris, parent ), parent );
+ super( uri, category, new URL[0], client );

- m_base = base;
+ m_base = management;
}

//--------------------------------------------------------------------

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.net.URI;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.HashMap;
import java.util.EventObject;
import java.util.LinkedList;
@@ -28,10 +29,11 @@
import java.util.Map;
import java.util.Hashtable;

-import net.dpml.logging.Logger;

+import net.dpml.metro.ComponentModel;
import net.dpml.metro.data.ComponentDirective;
-import net.dpml.metro.ComponentModel;
+import net.dpml.metro.data.Composite;
+import net.dpml.metro.builder.ComponentDecoder;

import net.dpml.component.Controller;
import net.dpml.component.ControlException;
@@ -41,18 +43,25 @@
import net.dpml.component.ControllerContextEvent;
import net.dpml.component.Model;
import net.dpml.component.Component;
+import net.dpml.component.Composition;

import net.dpml.part.Part;
-import net.dpml.part.PartDecoder;
+import net.dpml.part.Builder;
+import net.dpml.part.StandardClassLoader;
+import net.dpml.part.Info;
+
import net.dpml.part.DecoderFactory;
-import net.dpml.part.StandardPartHandler;
-import net.dpml.part.Strategy;
-
+import net.dpml.lang.Category;
import net.dpml.lang.Classpath;
+import net.dpml.lang.Logger;
+import net.dpml.lang.DefaultLogger;

import net.dpml.transit.Repository;
import net.dpml.transit.Transit;
+import net.dpml.transit.monitor.LoggingAdapter;

+import org.w3c.dom.Element;
+
/**
* The composition controller is the controller used to establish remotely
accessible
* component controls.
@@ -60,25 +69,14 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class CompositionController extends StandardPartHandler implements
Controller
+public class CompositionController implements Controller, Builder
{
//--------------------------------------------------------------------
// static
//--------------------------------------------------------------------

private static final String COMPONENT_NAMESPACE_URI =
"@COMPONENT-NAMESPACE-URI@";
- private static final String COMPONENT_BUILDER_URI =
"@COMPONENT-BUILDER-URI@";

- static final PartDecoder BUILDER = createPartDecoder();
-
- private static PartDecoder createPartDecoder()
- {
- Map map = new Hashtable();
- map.put( COMPONENT_NAMESPACE_URI, createStaticURI(
COMPONENT_BUILDER_URI ) );
- DecoderFactory factory = new DecoderFactory( map );
- return new PartDecoder( factory );
- }
-
//--------------------------------------------------------------------
// immutable state
//--------------------------------------------------------------------
@@ -87,7 +85,6 @@
private final ControllerContext m_context;
private final ComponentController m_controller;
private final HashMap m_handlers = new HashMap(); // foreign controllers
- private final Repository m_loader;
private final InternalControllerContextListener m_listener;
private final String m_partition;

@@ -113,11 +110,10 @@

m_context = context;
m_partition = context.getPartition();
- Logger root = new StandardLogger( m_partition );
+ Logger root = new DefaultLogger( m_partition );
m_logger = root.getChildLogger( "control" );
m_listener = new InternalControllerContextListener( this );
m_context.addControllerContextListener( m_listener );
- m_loader = Transit.getInstance().getRepository();
m_logger.debug( "controller: " + CONTROLLER_URI );
m_controller = new ComponentController( m_logger, this );

@@ -125,6 +121,28 @@
}

//--------------------------------------------------------------------
+ // Builder
+ //--------------------------------------------------------------------
+
+ public Part build( Info info, Classpath classpath, Element strategy )
throws IOException
+ {
+ ClassLoader context = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ ClassLoader anchor = Component.class.getClassLoader();
+ Thread.currentThread().setContextClassLoader( anchor );
+ ComponentDecoder decoder = new ComponentDecoder();
+ ComponentDirective directive = decoder.buildComponent( strategy
);
+ Logger logger = getLogger();
+ return new DefaultComposition( logger, info, classpath, this,
directive );
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( context );
+ }
+ }
+
+ //--------------------------------------------------------------------
// PartHandler
//--------------------------------------------------------------------

@@ -137,10 +155,61 @@
*/
public ClassLoader getClassLoader( ClassLoader anchor, Classpath
classpath ) throws IOException
{
- return super.getClassLoader( anchor, classpath );
+ ClassLoader management = ComponentDirective.class.getClassLoader();
+
+ ClassLoader composer =
+ new CompositionClassLoader( null, Category.PROTECTED, management,
anchor );
+
+ URI[] apis = classpath.getDependencies( Category.PUBLIC );
+ ClassLoader api = StandardClassLoader.buildClassLoader( null,
Category.PUBLIC, composer, apis );
+ if( api != composer )
+ {
+ classloaderConstructed( Category.PUBLIC, api );
+ }
+ URI[] spis = classpath.getDependencies( Category.PROTECTED );
+ ClassLoader spi = StandardClassLoader.buildClassLoader( null,
Category.PROTECTED, api, spis );
+ if( spi != api )
+ {
+ classloaderConstructed( Category.PROTECTED, spi );
+ }
+ URI[] imps = classpath.getDependencies( Category.PRIVATE );
+ ClassLoader impl = StandardClassLoader.buildClassLoader( null,
Category.PRIVATE, spi, imps );
+ if( impl != spi )
+ {
+ classloaderConstructed( Category.PRIVATE, impl );
+ }
+ return impl;
}

/**
+ * Handle notification of the creation of a new classloader.
+ * @param type the type of classloader (api, spi or impl)
+ * @param classloader the new classloader
+ */
+ public void classloaderConstructed( Category category, ClassLoader
classloader )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ int id = System.identityHashCode( classloader );
+ StringBuffer buffer = new StringBuffer();
+ buffer.append( "created " );
+ buffer.append( category.toString() );
+ buffer.append( " classloader: " + id );
+ if( classloader instanceof URLClassLoader )
+ {
+ URLClassLoader loader = (URLClassLoader) classloader;
+ URL[] urls = loader.getURLs();
+ for( int i=0; i < urls.length; i++ )
+ {
+ URL url = urls[i];
+ buffer.append( "\n [" + i + "] \t" + url.toString() );
+ }
+ }
+ getLogger().debug( buffer.toString() );
+ }
+ }
+
+ /**
* Instantiate a value.
* @param anchor the anchor classloader
* @param classpath the part classpath definition
@@ -149,6 +218,7 @@
* @return the instantiated service
* @exception Exception if a deployment error occurs
*/
+ /*
public Object getInstance(
ClassLoader anchor, Classpath classpath, Object data, Object[] args )
throws Exception
{
@@ -164,10 +234,19 @@
{
final String datatype = data.getClass().getName();
final String error =
- "Unsupported datatype [" + datatype + "].";
+ "Datatype not recognized."
+ + "\nClass: " + datatype;
+ final String report =
+ error
+ + "\n"
+ + StandardClassLoader.toString(
+ ComponentDirective.class.getClassLoader(),
+ data.getClass().getClassLoader() );
+ getLogger().error( report );
throw new IllegalArgumentException( error );
}
}
+ */

//--------------------------------------------------------------------
// Controller
@@ -192,53 +271,46 @@
*/
public Model createModel( URI uri ) throws ControlException, IOException
{
- Part part = BUILDER.loadPart( uri );
- Strategy strategy = part.getStrategy();
- Object data = strategy.getDeploymentData();
- if( data instanceof ComponentDirective )
+ Part part = Part.load( uri );
+ if( part instanceof Composition )
{
- Classpath classpath = part.getClasspath();
- ComponentDirective directive = (ComponentDirective) data;
- return m_controller.createComponentModel( classpath, directive );
+ Composition composition = (Composition) part;
+ return createModel( composition );
}
else
{
final String error =
- "Part datatype ["
- + data.getClass().getName()
- + "] referenced in the part ["
- + part
- + "] is not recognized.";
+ "Part class ["
+ + part.getClass().getName()
+ + "] not recognized.";
throw new ControllerException( error );
}
}
-
+
/**
- * Create and return a new management context using the supplied part
- * as the inital management state.
+ * Create and return a new management context using the supplied
directive uri.
*
- * @param directive the part data structure
- * @return the management context model
- * @exception ControlException if an error occurs during model
construction
+ * @param composition a composition directive
+ * @return the management model
+ * @exception ControlException if an error occurs
+ * @exception IOException if an I/O error occurs
*/
- /*
- public Model createModel( Directive directive ) throws ControlException
+ public Model createModel( Composition composition ) throws
ControlException, IOException
{
- if( directive instanceof ComponentDirective )
+ if( composition instanceof DefaultComposition )
{
- ComponentDirective component = (ComponentDirective) directive;
- return m_controller.createComponentModel( component );
+ DefaultComposition data = (DefaultComposition) composition;
+ return m_controller.createComponentModel( data );
}
else
{
- final String error =
- "Construction of a managment context for the part class ["
- + directive.getClass().getName()
- + "] is not supported.";
+ final String error =
+ "Composition class ["
+ + composition.getClass().getName()
+ + "] not recognized.";
throw new ControllerException( error );
}
}
- */

/**
* Create and return a remote reference to a component handler.
@@ -248,23 +320,18 @@
*/
public Component createComponent( URI uri ) throws Exception
{
- Part part = BUILDER.loadPart( uri );
- Strategy strategy = part.getStrategy();
- Object data = strategy.getDeploymentData();
- if( data instanceof ComponentDirective )
+ Part part = Part.load( uri );
+ if( part instanceof DefaultComposition )
{
- Classpath classpath = part.getClasspath();
- ComponentDirective directive = (ComponentDirective) data;
- Model model = m_controller.createComponentModel( classpath,
directive );
+ DefaultComposition composition = (DefaultComposition) part;
+ Model model = m_controller.createComponentModel( composition );
return createComponent( model, true );
}
else
{
final String error =
- "Part datatype ["
- + data.getClass().getName()
- + "] referenced in the part ["
- + part
+ "Part class ["
+ + part.getClass().getName()
+ "] is not recognized.";
throw new ControllerException( error );
}
@@ -344,9 +411,12 @@
public Directive loadDirective( URI uri ) throws ControlException,
IOException
{
ClassLoader current = Thread.currentThread().getContextClassLoader();
+ Part part = Part.load( uri );
+ throw new UnsupportedOperationException( "loadDirective" );
+
+ /*
try
{
- Part part = BUILDER.loadPart( uri );
Strategy strategy = part.getStrategy();
Object data = strategy.getDeploymentData();
if( data instanceof Directive )
@@ -379,6 +449,7 @@
{
Thread.currentThread().setContextClassLoader( current );
}
+ */
}

/**

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -44,7 +44,7 @@
import net.dpml.metro.PartsManager;
import net.dpml.metro.ComponentModelManager;

-import net.dpml.logging.Logger;
+import net.dpml.lang.Logger;

import net.dpml.component.Controller;
import net.dpml.component.Directive;
@@ -272,8 +272,9 @@
* @return the component handler
* @exception Exception if an error occurs during component loading or
establishment
*/
- public ComponentHandler createComponentHandler( ClassLoader anchor, URI
uri ) throws Exception
- {
+ //public ComponentHandler createComponentHandler( ClassLoader anchor,
URI uri ) throws Exception
+ //{
+ /*
Directive directive = getController().loadDirective( uri );
if( directive instanceof ComponentDirective )
{
@@ -293,7 +294,8 @@
+ "] is not supported.";
throw new IllegalArgumentException( error );
}
- }
+ */
+ //}


//--------------------------------------------------------------------------
// ModelListener

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -50,7 +50,7 @@
import net.dpml.configuration.ConfigurationException;
import net.dpml.configuration.impl.DefaultConfiguration;

-import net.dpml.logging.Logger;
+import net.dpml.lang.Logger;

import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;
@@ -94,13 +94,61 @@
//
------------------------------------------------------------------------
// constructor
//
------------------------------------------------------------------------
+
+ public DefaultComponentModel(
+ Logger logger, ComponentController controller, DefaultComposition
composition, String partition )
+ throws ControlException, IOException, RemoteException
+ {
+ super( logger );
+
+ m_classpath = composition.getClasspath();
+ m_controller = controller;
+ m_directive = composition.getComponentDirective();
+ m_classloader = composition.getClassLoader();
+ m_classname = m_directive.getClassname();
+ m_class = m_controller.loadComponentClass( m_classloader,
m_classname );
+ m_type = m_controller.loadType( m_class );

+ String name = m_directive.getName();
+ if( null == name )
+ {
+ m_path = partition + m_type.getInfo().getName();
+ }
+ else
+ {
+ m_path = partition + name;
+ }
+
+ m_activation = m_directive.getActivationPolicy();
+
+ LifestylePolicy lifestyle = m_directive.getLifestylePolicy();
+ if( null == lifestyle )
+ {
+ m_lifestyle = m_type.getInfo().getLifestylePolicy();
+ }
+ else
+ {
+ m_lifestyle = lifestyle;
+ }
+
+ m_collection = m_directive.getCollectionPolicy();
+ m_parameters = m_directive.getParameters();
+ m_configuration = m_directive.getConfiguration();
+
+ ContextDirective context = m_directive.getContextDirective();
+ m_context = new DefaultContextModel( this, logger, m_classloader,
m_type, context );
+
+ final String base = m_path + PARTITION_SEPARATOR;
+ processParts( controller, m_classloader, m_type, m_parts, base );
+ processParts( controller, m_classloader, m_directive, m_parts, base
);
+ }
+
public DefaultComponentModel(
- ClassLoader anchor, ComponentController controller, Classpath
classpath,
+ Logger logger, ClassLoader anchor, ComponentController controller,
Classpath classpath,
ComponentDirective directive, String partition )
throws ControlException, IOException, RemoteException
{
- super( new StandardLogger( partition.replace( '/', '.' ) ) );
+ super( logger );

m_classpath = classpath;
m_controller = controller;
@@ -138,7 +186,6 @@
m_configuration = directive.getConfiguration();

ContextDirective context = directive.getContextDirective();
- Logger logger = getLogger();
m_context = new DefaultContextModel( this, logger, m_classloader,
m_type, context );

final String base = m_path + PARTITION_SEPARATOR;

Added:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.runtime;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import net.dpml.component.Controller;
+import net.dpml.component.Composition;
+
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.builder.ComponentEncoder;
+
+import net.dpml.lang.Classpath;
+import net.dpml.lang.Logger;
+
+import net.dpml.part.Info;
+
+/**
+ * Component composition.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class DefaultComposition extends Composition
+{
+ private ComponentDirective m_directive;
+
+ public DefaultComposition(
+ Logger logger, Info info, Classpath classpath, Controller controller,
ComponentDirective directive )
+ throws IOException
+ {
+ super( logger, info, classpath, controller, directive );
+
+ m_directive = directive;
+ }
+
+ public ComponentDirective getComponentDirective()
+ {
+ return m_directive;
+ }
+
+ protected void encodeStrategy( Writer writer, String pad ) throws
IOException
+ {
+ ComponentEncoder encoder = new ComponentEncoder();
+ encoder.writeComponent( writer, m_directive, pad );
+ }
+}

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -35,7 +35,7 @@
import net.dpml.metro.ValidationException;
import net.dpml.metro.ValidationException.Issue;

-import net.dpml.logging.Logger;
+import net.dpml.lang.Logger;

import net.dpml.component.Directive;
import net.dpml.component.ModelException;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -24,7 +24,6 @@
import java.util.Hashtable;
import java.lang.reflect.InvocationTargetException;

-import net.dpml.logging.Logger;

import net.dpml.metro.PartsManager;
import net.dpml.metro.ComponentHandler;
@@ -39,6 +38,7 @@

import net.dpml.lang.Version;
import net.dpml.lang.UnknownKeyException;
+import net.dpml.lang.Logger;

import net.dpml.job.CommissionerEvent;
import net.dpml.job.CommissionerController;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -27,7 +27,7 @@
import java.util.EventObject;
import java.util.EventListener;

-import net.dpml.logging.Logger;
+import net.dpml.lang.Logger;

import net.dpml.component.Provider;
import net.dpml.component.ControlException;

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -24,7 +24,7 @@
import java.util.EventObject;
import java.util.EventListener;

-import net.dpml.logging.Logger;
+import net.dpml.lang.Logger;

import net.dpml.component.Disposable;


Added:
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/LookupTestCase.java
===================================================================
---
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/LookupTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/LookupTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2005 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.File;
+import java.net.URI;
+
+import net.dpml.component.Directive;
+
+import net.dpml.metro.info.PartReference;
+import net.dpml.metro.data.ContextDirective;
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.data.LookupDirective;
+
+import junit.framework.TestCase;
+
+/**
+ * Default state machine test-case.
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
+ */
+public class LookupTestCase extends TestCase
+{
+ private ComponentDecoder m_builder;
+
+ /**
+ * Testcase setup.
+ * @exception Exception if a setup error occurs
+ */
+ public void setUp() throws Exception
+ {
+ m_builder = new ComponentDecoder();
+ }
+
+ /**
+ * List the state graph.
+ * @exception Exception if an error occurs
+ */
+ public void testLookup() throws Exception
+ {
+ String testPath = System.getProperty( "project.test.dir" );
+ File test = new File( testPath );
+ File example = new File( test, "components/lookup.xml" );
+ URI uri = example.toURI();
+ ComponentDirective component = m_builder.loadComponentDirective( uri
);
+ ContextDirective context = component.getContextDirective();
+ PartReference[] entries = context.getDirectives();
+ if( entries.length != 1 )
+ {
+ fail( "Invalid entries length - expected 1, found " +
entries.length );
+ }
+ else
+ {
+ PartReference entry = entries[0];
+ String key = entry.getKey();
+ Directive directive = entry.getDirective();
+ if( directive instanceof LookupDirective )
+ {
+ LookupDirective value = (LookupDirective) directive;
+ String classname = value.getServiceClassname();
+ assertNotNull( "classname", classname );
+ assertEquals( "classname", "acme.Widget", classname );
+ }
+ else
+ {
+ fail( "Expected LookupDirective, found " +
directive.getClass().getName() );
+ }
+ }
+ }
+}
+
+
+

Added:
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/MinimalTestCase.java
===================================================================
---
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/MinimalTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/MinimalTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2005 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.File;
+import java.net.URI;
+
+import net.dpml.metro.data.ComponentDirective;
+
+import junit.framework.TestCase;
+
+/**
+ * Default state machine test-case.
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
+ */
+public class MinimalTestCase extends TestCase
+{
+ private ComponentDecoder m_builder;
+
+ /**
+ * Testcase setup.
+ * @exception Exception if a setup error occurs
+ */
+ public void setUp() throws Exception
+ {
+ m_builder = new ComponentDecoder();
+ }
+
+ /**
+ * List the state graph.
+ * @exception Exception if an error occurs
+ */
+ public void testComponentLoading() throws Exception
+ {
+ String testPath = System.getProperty( "project.test.dir" );
+ File test = new File( testPath );
+ File example = new File( test, "components/minimal-component.xml" );
+ URI uri = example.toURI();
+ ComponentDirective directive = m_builder.loadComponentDirective( uri
);
+ }
+}
+
+
+

Added:
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/PartsTestCase.java
===================================================================
---
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/PartsTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/PartsTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2005-2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.File;
+import java.net.URI;
+
+import net.dpml.component.Directive;
+import net.dpml.lang.Value;
+
+import net.dpml.metro.info.PartReference;
+import net.dpml.metro.data.ContextDirective;
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.data.ValueDirective;
+
+import junit.framework.TestCase;
+
+/**
+ * Default state machine test-case.
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
+ */
+public class PartsTestCase extends TestCase
+{
+ private ComponentDecoder m_builder;
+
+ /**
+ * Testcase setup.
+ * @exception Exception if a setup error occurs
+ */
+ public void setUp() throws Exception
+ {
+ m_builder = new ComponentDecoder();
+ }
+
+ /**
+ * List the state graph.
+ * @exception Exception if an error occurs
+ */
+ public void testExampleOne() throws Exception
+ {
+ String testPath = System.getProperty( "project.test.dir" );
+ File test = new File( testPath );
+ File example = new File( test, "components/array.xml" );
+ URI uri = example.toURI();
+ ComponentDirective component = m_builder.loadComponentDirective( uri
);
+ ContextDirective context = component.getContextDirective();
+ PartReference[] entries = context.getDirectives();
+ if( entries.length != 1 )
+ {
+ fail( "Invalid entries length - expected 1, found " +
entries.length );
+ }
+ else
+ {
+ PartReference entry = entries[0];
+ String key = entry.getKey();
+ Directive directive = entry.getDirective();
+ if( directive instanceof ValueDirective )
+ {
+ ValueDirective value = (ValueDirective) directive;
+ String base = value.getBaseValue();
+ String method = value.getMethodName();
+ String target = value.getTargetExpression();
+ Value[] values = value.getValues();
+ //System.out.println( "# TARGET: " + target );
+ //System.out.println( "# METHOD: " + method );
+ //System.out.println( "# BASE: " + base );
+ //System.out.println( "# VALUES: " + values.length );
+ }
+ else
+ {
+ fail( "Expected ValueDirective, found " +
directive.getClass().getName() );
+ }
+ }
+ }
+}
+
+
+

Added:
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/TypesTestCase.java
===================================================================
---
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/TypesTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/runtime/src/test/net/dpml/metro/builder/TypesTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2005-2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.metro.builder;
+
+import java.io.File;
+import java.net.URI;
+
+import net.dpml.metro.info.Type;
+import net.dpml.metro.info.ContextDescriptor;
+import net.dpml.metro.info.EntryDescriptor;
+
+import junit.framework.TestCase;
+
+/**
+ * Default state machine test-case.
+ *
+ * @author <a href="http://www.dpml.net";>The Digital Product Meta Library</a>
+ */
+public class TypesTestCase extends TestCase
+{
+ private ComponentTypeDecoder m_builder;
+
+ /**
+ * Testcase setup.
+ * @exception Exception if a setup error occurs
+ */
+ public void setUp() throws Exception
+ {
+ m_builder = new ComponentTypeDecoder();
+ }
+
+ /**
+ * List the state graph.
+ * @exception Exception if an error occurs
+ */
+ public void testExampleOne() throws Exception
+ {
+ String testPath = System.getProperty( "project.test.dir" );
+ File test = new File( testPath );
+ File example = new File( test, "types/example-1.xml" );
+ URI uri = example.toURI();
+ Type type = m_builder.loadType( uri );
+ ContextDescriptor context = type.getContextDescriptor();
+ EntryDescriptor[] entries = context.getEntryDescriptors();
+ if( entries.length != 1 )
+ {
+ fail( "Invalid entries length - expected 1, found " +
entries.length );
+ }
+ else
+ {
+ EntryDescriptor entry = entries[0];
+ String key = entry.getKey();
+ String classname = entry.getClassname();
+ boolean optional = entry.isOptional();
+ assertEquals( "key", "color", key );
+ assertEquals( "classname", "java.awt.Color", classname );
+ assertFalse( "optional", optional );
+ }
+ }
+}
+
+
+

Modified:
trunk/main/metro/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -28,6 +28,8 @@
import net.dpml.component.Controller;
import net.dpml.component.InitialContext;

+import net.dpml.part.Part;
+
import net.dpml.transit.DefaultTransitModel;
import net.dpml.transit.Transit;

@@ -67,18 +69,11 @@

// initialize the controller

- InitialContext context = new InitialContext();
- Controller controller = InitialContext.createController( context );
+ Part part = Transit.getInstance().getRepository().getPart( m_uri );
+ System.out.println( "# PART: " + part );

// do stuff

- Directive directive = controller.loadDirective( m_uri );
- String classname = directive.getClass().getName();
- assertEquals( "directive-classname",
"net.dpml.metro.data.ComponentDirective", classname );
-
- // shutdown controller and transit
-
- context.dispose();
model.dispose();

Logger.global.info( "test complete." );

Modified: trunk/main/metro/tools/build.xml
===================================================================
--- trunk/main/metro/tools/build.xml 2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/tools/build.xml 2006-04-04 13:26:28 UTC (rev 1304)
@@ -28,7 +28,7 @@
<x:filter feature="uri" type="part" token="PART-BUILDER-URI" />
<x:filter key="dpml-metro-runtime" feature="uri" type="part"
token="PART-HANDLER-URI" />
<x:filter ref="dpml/lang/dpml-component" feature="uri" type="xsd"
token="COMPONENT-XSD-URI" />
- <x:filter key="dpml-metro-builder" feature="uri" type="part"
token="STRATEGY-BUILDER-URI" />
+ <x:filter key="dpml-metro-runtime" feature="uri" type="part"
token="STRATEGY-BUILDER-URI" />
</target>

<target name="install" depends="standard.install">

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
===================================================================
---
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -33,6 +33,7 @@
import net.dpml.configuration.Configuration;

import net.dpml.library.info.Scope;
+import net.dpml.library.Resource;

import net.dpml.metro.data.ComponentDirective;
import net.dpml.metro.data.ContextDirective;
@@ -43,12 +44,19 @@
import net.dpml.metro.info.Type;
import net.dpml.metro.info.EntryDescriptor;
import net.dpml.metro.builder.ComponentTypeDecoder;
+import net.dpml.metro.runtime.DefaultComposition;

import net.dpml.parameters.Parameters;

-import net.dpml.part.Strategy;
-import net.dpml.part.PartDirective;
+import net.dpml.lang.Classpath;
+import net.dpml.part.Part;
+import net.dpml.part.Info;

+import net.dpml.transit.monitor.LoggingAdapter;
+
+//import net.dpml.part.Strategy;
+//import net.dpml.part.PartDirective;
+
import net.dpml.tools.tasks.PartTask;

import org.apache.tools.ant.BuildException;
@@ -269,6 +277,7 @@
/**
* Execute the task.
*/
+ /*
public void execute()
{
ClassLoader classloader = createClassLoader();
@@ -277,12 +286,39 @@
setStrategy( strategy );
super.execute();
}
-
+ */
+
/**
+ * Build the plugin definition.
+ * @exception exception if a build related error occurs
+ */
+ protected Part build( Resource resource )
+ {
+ try
+ {
+ Info info = getInfo( resource );
+ Classpath classpath = getClasspath( resource );
+ ClassLoader classloader = createClassLoader();
+ ComponentDirective profile = buildComponentDirective(
classloader );
+ return new DefaultComposition(
+ new LoggingAdapter( "depot" ),
+ info, classpath, null, profile );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Internal error while attempting to build an external part
defintion."
+ + "\nResource: " + resource;
+ throw new BuildException( error, e, getLocation() );
+ }
+ }
+
+ /**
* Create a component strategy.
* @param classloader the classloader
* @return the component directive
*/
+ /*
public Strategy createStrategy( ClassLoader classloader )
{
try
@@ -302,6 +338,7 @@
throw new BuildException( error, e, getLocation() );
}
}
+ */

/**
* Return the runtime classloader.

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/PartDataType.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -24,6 +24,7 @@

import net.dpml.metro.info.PartReference;
import net.dpml.metro.info.Type;
+import net.dpml.metro.builder.ComponentDecoder;

import net.dpml.component.Directive;
import net.dpml.component.DelegationException;
@@ -144,27 +145,28 @@
//Logger logger = new AntAdapter( this );
//CompositionController controller = new CompositionController(
logger );
//return controller.loadDirective( uri );
- return Controller.STANDARD.loadDirective( uri );
+ ComponentDecoder decoder = new ComponentDecoder();
+ return decoder.loadComponentDirective( uri );
}
- catch( PartNotFoundException pnfe )
- {
- final String error =
- "Unable to include the part ["
- + key
- + "] because part reference ["
- + uri
- + "] could not be found.";
- throw new BuildException( error );
- }
- catch( DelegationException de )
- {
- final String error =
- "Delegation error while attempting to load part ["
- + m_uri
- + "] due to: "
- + de.getMessage();
- throw new BuildException( error, de );
- }
+ //catch( PartNotFoundException pnfe )
+ //{
+ // final String error =
+ // "Unable to include the part ["
+ // + key
+ // + "] because part reference ["
+ // + uri
+ // + "] could not be found.";
+ // throw new BuildException( error );
+ //}
+ //catch( DelegationException de )
+ //{
+ // final String error =
+ // "Delegation error while attempting to load part ["
+ // + m_uri
+ // + "] due to: "
+ // + de.getMessage();
+ // throw new BuildException( error, de );
+ //}
catch( IOException ioe )
{
final String error =
@@ -177,7 +179,7 @@
catch( Exception e )
{
final String error =
- "Unexpected error while attempting to load part ["
+ "Unexpected error while attempting to load component directive
["
+ m_uri
+ "] due to: "
+ e.getMessage();

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/planet/http/module.xml 2006-04-04 13:26:28 UTC (rev 1304)
@@ -3,7 +3,7 @@

<properties>
<property
name="project.xsd.builder.artifact:xsd:dpml/lang/dpml-component#1.0"
- value="link:part:dpml/metro/dpml-metro-builder"/>
+ value="link:part:dpml/metro/dpml-metro-runtime"/>
</properties>

<project name="dpml-http-impl" basedir="impl">
@@ -51,7 +51,8 @@
</dependencies>
<dependencies scope="test">
<include ref="dpml/transit/dpml-transit-main"/>
- <include ref="dpml/metro/dpml-metro-model"/>
+ <!--<include ref="dpml/util/dpml-logging-api"/>
+ <include ref="dpml/metro/dpml-metro-model"/>-->
<include ref="ant/ant-junit"/>
</dependencies>
</project>

Modified:
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
===================================================================
---
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,6 +1,5 @@
/*
- * Copyright 2004 Stephen J. McConnell.
- * Copyright 1999-2004 The Apache Software Foundation
+ * Copyright 2006 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,23 +18,18 @@

package net.dpml.http.test;

-import java.io.File;
import java.net.URI;

import junit.framework.TestCase;

-import net.dpml.component.Controller;
-import net.dpml.component.ControlException;
+import net.dpml.part.Part;
+import net.dpml.transit.Transit;

-import net.dpml.metro.PartsManager;
-import net.dpml.metro.ComponentHandler;
-
-
/**
- * Test a simple component case.
+ * Server component testcase.
*
- * @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
- * @version $Id: AbstractDescriptorTestCase.java 1556 2005-01-22 12:43:42Z
niclas $
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
*/
public class ServerTestCase extends TestCase
{
@@ -46,35 +40,8 @@
public void testServerDeployment() throws Exception
{
URI uri = new URI( "link:part:dpml/planet/http/dpml-http-server" );
- Controller control = Controller.STANDARD;
- ComponentHandler component = (ComponentHandler)
control.createComponent( uri );
- try
- {
- PartsManager parts = component.getPartsManager();
- ComponentHandler webapp = parts.getComponentHandler( "webapp" );
- File temp = new File( "target/test/temp" );
- webapp.getContextMap().put( "tempDirectory", temp );
- component.getProvider().getValue( false );
- }
- catch( ControlException e )
- {
- Throwable cause = e.getRootCause();
- if( cause instanceof SecurityException )
- {
- final String error =
- "Skipping test due to security exception."
- + cause.getMessage();
- System.out.println( error );
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- component.decommission();
- }
+ Object object = Transit.getInstance().getRepository().getPlugin(
uri, new Object[0] );
+ assertEquals( "class", "net.dpml.http.Server",
object.getClass().getName() );
}

static
@@ -85,5 +52,15 @@
"java.util.logging.config.class",
"net.dpml.transit.util.ConfigurationHandler" ) );
System.setProperty( "java.protocol.handler.pkgs", "net.dpml.transit"
);
+ System.setProperty(
+ "dpml.logging.config",
+ "local:properties:dpml/transit/default" );
}
}
+
+
+//PartsManager parts = component.getPartsManager();
+//ComponentHandler webapp = parts.getComponentHandler( "webapp" );
+//File temp = new File( "target/test/temp" );
+//webapp.getContextMap().put( "tempDirectory", temp );
+//component.getProvider().getValue( false );

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-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/station/builder/src/main/net/dpml/station/builder/RegistryBuilder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -29,8 +29,8 @@

import net.dpml.part.DOM3DocumentBuilder;

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

import net.dpml.lang.ValueDirective;
import net.dpml.transit.util.ElementHelper;
@@ -60,17 +60,16 @@
{
Document document = DOCUMENT_BUILDER.parse( uri );
Element root = document.getDocumentElement();
- return decode( null, root );
+ return decode( root );
}

/**
* Decode a registry descriptior from a DOM element.
- * @param classloader the base classloader
* @param element the element representing the root registry
* @return the registry descriptor
* @exception DecodingException if a decoding error occurs
*/
- public Object decode( ClassLoader classloader, Element element ) throws
DecodingException
+ public Object decode( Element element ) throws DecodingException
{
String tag = element.getTagName();
if( "application".equals( tag ) )

Modified: trunk/main/station/console/etc/bin/station.lap
===================================================================
--- trunk/main/station/console/etc/bin/station.lap 2006-04-01 11:11:58
UTC (rev 1303)
+++ trunk/main/station/console/etc/bin/station.lap 2006-04-04 13:26:28
UTC (rev 1304)
@@ -2,7 +2,7 @@
# This file contains the runtime configuration of the Janel java launcher
application.
#

--Djava.system.class.loader=net.dpml.transit.SystemClassLoader
+-Djava.system.class.loader=net.dpml.part.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\security.policy
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Ddpml.depot.application=dpml.station

Modified: trunk/main/station/exec/etc/bin/metro.lap
===================================================================
--- trunk/main/station/exec/etc/bin/metro.lap 2006-04-01 11:11:58 UTC (rev
1303)
+++ trunk/main/station/exec/etc/bin/metro.lap 2006-04-04 13:26:28 UTC (rev
1304)
@@ -2,7 +2,7 @@
# This file contains the runtime configuration of the Janel java launcher
application.
#

--Djava.system.class.loader=net.dpml.transit.SystemClassLoader
+-Djava.system.class.loader=net.dpml.part.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\security.policy
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Ddpml.depot.application=dpml.metro

Modified:
trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
===================================================================
---
trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/station/exec/src/main/net/dpml/station/exec/ComponentAdapter.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -108,7 +108,7 @@
ClassLoader classloader = Controller.class.getClassLoader();
URI uri = new URI( "@COMPOSITION-CONTROLLER-URI@" );
Repository repository = Transit.getInstance().getRepository();
- Class c = repository.getPluginClass( classloader, uri );
+ Class c = repository.getPluginClass( uri );
InitialContext context = new InitialContext( partition );
Constructor constructor = c.getConstructor( new
Class[]{ControllerContext.class} );
m_controller = (Controller) constructor.newInstance( new
Object[]{context} );

Modified: trunk/main/station/server/etc/bin/scm/conf/wrapper.conf
===================================================================
--- trunk/main/station/server/etc/bin/scm/conf/wrapper.conf 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/station/server/etc/bin/scm/conf/wrapper.conf 2006-04-04
13:26:28 UTC (rev 1304)
@@ -29,7 +29,7 @@
wrapper.java.library.path.1=../../share/bin/scm/lib

# Java Additional Parameters
-wrapper.java.additional.1=-Djava.system.class.loader=net.dpml.transit.SystemClassLoader
+wrapper.java.additional.1=-Djava.system.class.loader=net.dpml.part.SystemClassLoader

wrapper.java.additional.2=-Djava.security.policy=..\..\share\bin\security.policy
wrapper.java.additional.3=-Ddpml.depot.application=dpml.station
wrapper.java.additional.4=-Djava.protocol.handler.pkgs=net.dpml.transit

Modified: trunk/main/transit/console/etc/bin/transit.lap
===================================================================
--- trunk/main/transit/console/etc/bin/transit.lap 2006-04-01 11:11:58
UTC (rev 1303)
+++ trunk/main/transit/console/etc/bin/transit.lap 2006-04-04 13:26:28
UTC (rev 1304)
@@ -2,7 +2,7 @@
# This file contains the runtime configuration of the Janel java launcher
application.
#

--Djava.system.class.loader=net.dpml.transit.SystemClassLoader
+-Djava.system.class.loader=net.dpml.part.SystemClassLoader
-Djava.security.policy=${env.DPML_HOME}\share\bin\security.policy
-Djava.endorsed.dirs=${env.DPML_HOME}\share\lib\endorsed
-Ddpml.depot.application=dpml.transit

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-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/console/src/main/net/dpml/transit/console/TransitConsoleHandler.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -168,12 +168,10 @@
try
{
URI uri = (URI) line.getValue( LOAD_COMMAND, null );
- ClassLoader loader = ClassLoader.getSystemClassLoader();
List list = line.getValues( ARGUMENTS );
String[] args = (String[]) list.toArray( new String[ list.size()
] );
Object instance =
- Transit.getInstance().getRepository().getPlugin(
- loader, uri, new Object[]{args} );
+ Transit.getInstance().getRepository().getPlugin( uri, new
Object[]{args} );
if( instance instanceof Runnable )
{
Runnable runnable = (Runnable) instance;

Deleted: trunk/main/transit/core/src/main/net/dpml/lang/Decoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Decoder.java 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Decoder.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -1,37 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.lang;
-
-import org.w3c.dom.Element;
-
-/**
- * Interface implemented by generic decoders.
- */
-public interface Decoder
-{
- /**
- * Create an object using a supplied classloader and DOM element.
- * @param classloader the base classloader
- * @param element the DOM element
- * @return the decoded object
- * @exception DecodingException if an error occurs in the evaluation
- * of the supplied element
- */
- Object decode( ClassLoader classloader, Element element ) throws
DecodingException;
-}

Deleted: trunk/main/transit/core/src/main/net/dpml/lang/DecodingException.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/DecodingException.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/lang/DecodingException.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,90 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.lang;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Exception related to data decoding from a DOM element.
- */
-public class DecodingException extends Exception
-{
- private final Element m_element;
-
- /**
- * Create a new decoding exception.
- * @param element the element representing the source of the error
- * @param message the exception message
- */
- public DecodingException( Element element, String message )
- {
- this( element, message, null );
- }
-
- /**
- * Create a new decoding exception.
- * @param element the element representing the source of the error
- * @param message the exception message
- * @param cause the causal exception
- */
- public DecodingException( Element element, String message, Throwable
cause )
- {
- super( message, cause );
- m_element = element;
- }
-
- /**
- * Get the element that is the subject of this exception.
- * @return the subject element
- */
- public Element getElement()
- {
- return m_element;
- }
-
- /**
- * Return a string representation of the exception.
- * @return the string value
- */
- public String getMessage()
- {
- try
- {
- String message = super.getMessage();
- StringBuffer buffer = new StringBuffer( message );
- Element element = getElement();
- String tag = element.getTagName();
- buffer.append( "\nElement: <" );
- buffer.append( tag );
- buffer.append( " ...>" );
- Document document = element.getOwnerDocument();
- String uri = document.getDocumentURI();
- if( null != uri )
- {
- buffer.append( "\nDocument: " + uri );
- }
- return buffer.toString();
- }
- catch( Throwable e )
- {
- return super.getMessage();
- }
- }
-}

Added: trunk/main/transit/core/src/main/net/dpml/lang/DefaultLogger.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/DefaultLogger.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/lang/DefaultLogger.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.lang;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+/**
+ * Generic logging channel.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class DefaultLogger implements net.dpml.lang.Logger
+{
+ //
------------------------------------------------------------------------
+ // static
+ //
------------------------------------------------------------------------
+
+ private static final PID ID = new PID();
+
+ private static String clean( String category )
+ {
+ String result = category.replace( '/', '.' );
+ if( result.startsWith( "." ) )
+ {
+ return clean( result.substring( 1 ) );
+ }
+ else if( result.endsWith( "." ) )
+ {
+ return clean( result.substring( 0, result.length() -1 ) );
+ }
+ else
+ {
+ return result;
+ }
+ }
+
+ //
------------------------------------------------------------------------
+ // state
+ //
------------------------------------------------------------------------
+
+ private Logger m_logger;
+
+ //
------------------------------------------------------------------------
+ // constructor
+ //
------------------------------------------------------------------------
+
+ /**
+ * Creation of a new console adapter that is used to redirect transit
events
+ * the system output stream.
+ */
+ public DefaultLogger()
+ {
+ this( "" );
+ }
+
+ /**
+ * Creation of a new console adapter that is used to redirect transit
events
+ * the system output stream.
+ * @param category the logging channel category name
+ */
+ public DefaultLogger( String category )
+ {
+ this( Logger.getLogger( clean( category ) ) );
+ }
+
+ /**
+ * Creation of a new console adapter that is used to redirect transit
events
+ * the system output stream.
+ * @param logger the assigned logging channel
+ */
+ public DefaultLogger( Logger logger )
+ {
+ m_logger = logger;
+ }
+
+ //
------------------------------------------------------------------------
+ // Logger
+ //
------------------------------------------------------------------------
+
+ /**
+ * Return TRUE is debug level logging is enabled.
+ * @return the enabled state of debug logging
+ */
+ public boolean isDebugEnabled()
+ {
+ return m_logger.isLoggable( Level.FINE );
+ }
+
+ /**
+ * Return TRUE is info level logging is enabled.
+ * @return the enabled state of info logging
+ */
+ public boolean isInfoEnabled()
+ {
+ return m_logger.isLoggable( Level.INFO );
+ }
+
+ /**
+ * Return TRUE is error level logging is enabled.
+ * @return the enabled state of error logging
+ */
+ public boolean isWarnEnabled()
+ {
+ return m_logger.isLoggable( Level.WARNING );
+ }
+
+ /**
+ * Return TRUE is error level logging is enabled.
+ * @return the enabled state of error logging
+ */
+ public boolean isErrorEnabled()
+ {
+ return m_logger.isLoggable( Level.SEVERE );
+ }
+
+ /**
+ * Log a debug message is debug mode is enabled.
+ * @param message the message to log
+ */
+ public void debug( String message )
+ {
+ if( isDebugEnabled() )
+ {
+ m_logger.fine( message );
+ }
+ }
+
+ /**
+ * Log a info level message.
+ * @param message the message to log
+ */
+ public void info( String message )
+ {
+ if( isInfoEnabled() )
+ {
+ m_logger.info( message );
+ }
+ }
+
+ /**
+ * Record a warning message.
+ * @param message the warning message to record
+ */
+ public void warn( String message )
+ {
+ if( isWarnEnabled() )
+ {
+ m_logger.warning( message );
+ }
+ }
+
+ /**
+ * Record a warning message.
+ * @param message the warning message to record
+ * @param cause the causal exception
+ */
+ public void warn( String message, Throwable cause )
+ {
+ if( isWarnEnabled() )
+ {
+ m_logger.log( Level.WARNING, message, cause );
+ }
+ }
+
+ /**
+ * Log a error message.
+ * @param message the message to log
+ */
+ public void error( String message )
+ {
+ if( isErrorEnabled() )
+ {
+ m_logger.log( Level.SEVERE, message );
+ }
+ }
+
+ /**
+ * Log a error message.
+ * @param message the message to log
+ * @param e the causal exception
+ */
+ public void error( String message, Throwable e )
+ {
+ if( isErrorEnabled() )
+ {
+ m_logger.log( Level.SEVERE, message, e );
+ }
+ }
+
+ /**
+ * Return a child logger.
+ * @param category the sub-category name.
+ * @return the child logging channel
+ */
+ public net.dpml.lang.Logger getChildLogger( String category )
+ {
+ if( ( null == category ) || "".equals( category ) )
+ {
+ return this;
+ }
+ else
+ {
+ String name = m_logger.getName();
+ String path = trim( name + "." + category );
+ return new DefaultLogger( Logger.getLogger( path ) );
+ }
+ }
+
+ private String trim( String path )
+ {
+ if( path.startsWith( "." ) )
+ {
+ return trim( path.substring( 1 ) );
+ }
+ else if( ".".equals( path ) )
+ {
+ return "";
+ }
+ else
+ {
+ return path;
+ }
+ }
+}
+

Deleted: trunk/main/transit/core/src/main/net/dpml/lang/Encoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Encoder.java 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Encoder.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -1,37 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.lang;
-
-import java.io.Writer;
-import java.io.IOException;
-
-/**
- * Interface implemented by generic encoders.
- */
-public interface Encoder
-{
- /**
- * Externalize a object to XML.
- * @param writer the output stream writer
- * @param object the object to externalize
- * @param pad the character offset
- * @exception IOException if an IO error occurs
- */
- public void encode( Writer writer, Object object, String pad ) throws
IOException;
-}

Added: trunk/main/transit/core/src/main/net/dpml/part/Builder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/Builder.java 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Builder.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.IOException;
+
+import net.dpml.lang.Classpath;
+
+import org.w3c.dom.Element;
+
+/**
+ * Interace implemented by part builders.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Builder
+{
+ Part build( Info information, Classpath classpath, Element strategy )
throws IOException;
+}

Copied: trunk/main/transit/core/src/main/net/dpml/part/Decoder.java (from rev
1303, trunk/main/transit/core/src/main/net/dpml/lang/Decoder.java)
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Decoder.java 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Decoder.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.IOException;
+
+import org.w3c.dom.Element;
+
+/**
+ * Interface implemented by generic decoders.
+ */
+public interface Decoder
+{
+ /**
+ * Create an object using a supplied classloader and DOM element.
+ * @param element the DOM element
+ * @return the decoded object
+ * @exception IOException if an error occurs in the evaluation
+ * of the supplied element
+ */
+ Object decode( Element element ) throws IOException;
+}

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-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/DecoderFactory.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -24,10 +24,6 @@
import java.util.Map;
import java.util.Hashtable;

-import net.dpml.lang.Encoder;
-import net.dpml.lang.DecodingException;
-import net.dpml.lang.Decoder;
-
import net.dpml.transit.Artifact;
import net.dpml.transit.Transit;
import net.dpml.transit.Repository;
@@ -40,14 +36,7 @@
*/
public final class DecoderFactory
{
- /**
- * Constant uri used to refernce the internal package encoder.
- */
- static final URI LOCAL_URI = createURI( "local:dpml" );
-
- static final String PART_XSD_URI = "@PART-XSD-URI@";
-
- private static final DecoderFactory INSTANCE = new DecoderFactory();
+ private static final String PART_XSD_URI = "@PART-XSD-URI@";

private final Map m_map; // maps namespace uris to element handlers

@@ -77,50 +66,9 @@
{
m_map = map;
}
- if( !m_map.containsKey( "dpml/lang/dpml-part" ) )
- {
- m_map.put( "dpml/lang/dpml-part", LOCAL_URI );
- }
}

/**
- * Internal utility to load an encoder using the supplied uri.
- *
- * @param uri the encoder uri
- * @return the encoder
- * @exception IOException if an IO error occurs
- * @exception InvocationTargetException if the encoder plugin raises an
instantiation error
- */
- public static Encoder loadEncoder( URI uri ) throws IOException,
InvocationTargetException
- {
- if( LOCAL_URI.equals( uri ) )
- {
- return new PartEncoder();
- }
- else
- {
- ClassLoader classloader = getClassLoader();
- Repository repository = Transit.getInstance().getRepository();
- Object[] args = new Object[]{INSTANCE};
- Object object = repository.getPlugin( classloader, uri, args );
- if( object instanceof Encoder )
- {
- return (Encoder) object;
- }
- else
- {
- final String error =
- "URI ["
- + uri
- + "] does not resolve to an object assignable to "
- + Encoder.class.getName()
- + ".";
- throw new IllegalArgumentException( error );
- }
- }
- }
-
- /**
* Get an element helper based on the namespace declared by the supplied
element. If
* the element namespace is the dpml/part namespace then a local uri is
returned,
* otherwise evaluation is based on namespace to hanlder mappings
supplied to
@@ -135,13 +83,15 @@
*/
public Decoder loadDecoder( Element element ) throws Exception
{
- URI uri = getDecoderURI( element );
- if( LOCAL_URI.equals( uri ) )
+ TypeInfo info = element.getSchemaTypeInfo();
+ String namespace = info.getTypeNamespace();
+ if( PART_XSD_URI.equals( namespace ) )
{
- return new PartDecoder( this );
+ return PartDecoder.getInstance();
}
else
{
+ URI uri = getDecoderURI( namespace );
return new DelegatingDecoder( this, uri );
}
}
@@ -153,16 +103,10 @@
* @return the builder uri
* @exception Exception if an eror occurs
*/
- public URI getDecoderURI( Element element ) throws Exception
+ public URI getDecoderURI( String namespace ) throws Exception
{
- TypeInfo info = element.getSchemaTypeInfo();
- String namespace = info.getTypeNamespace();
- if( PART_XSD_URI.equals( namespace ) )
+ if( m_map.containsKey( namespace ) )
{
- return LOCAL_URI;
- }
- else if( m_map.containsKey( namespace ) )
- {
return (URI) m_map.get( namespace );
}
else
@@ -212,10 +156,10 @@
* @param element the subject element
* @return the resulting object
*/
- public Object decode( ClassLoader classloader, Element element )
throws DecodingException
+ public Object decode( Element element ) throws IOException
{
Decoder decoder = getDelegateDecoder();
- return decoder.decode( classloader, element );
+ return decoder.decode( element );
}

private Decoder getDelegateDecoder()
@@ -247,10 +191,9 @@
{
try
{
- ClassLoader classloader = getClassLoader();
Repository repository =
Transit.getInstance().getRepository();
Object[] args = new Object[]{m_factory};
- return repository.getPlugin( classloader, m_uri, args );
+ return repository.getPlugin( m_uri, args );
}
catch( Throwable e )
{
@@ -260,34 +203,8 @@
throw new RuntimeException( error, e ); // change to a
factory exception
}
}
-
- private ClassLoader getClassLoader()
- {
- ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
- if( null != classloader )
- {
- return classloader;
- }
- else
- {
- return getClass().getClassLoader();
- }
- }
}

- static ClassLoader getClassLoader()
- {
- ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
- if( null != classloader )
- {
- return classloader;
- }
- else
- {
- return DecoderFactory.class.getClassLoader();
- }
- }
-
private static URI createURI( String spec )
{
try

Copied: trunk/main/transit/core/src/main/net/dpml/part/DecodingException.java
(from rev 1303,
trunk/main/transit/core/src/main/net/dpml/lang/DecodingException.java)
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/DecodingException.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/DecodingException.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.IOException;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * Exception related to data decoding from a DOM element.
+ */
+public class DecodingException extends IOException
+{
+ private final Element m_element;
+
+ /**
+ * Create a new decoding exception.
+ * @param element the element representing the source of the error
+ * @param message the exception message
+ */
+ public DecodingException( Element element, String message )
+ {
+ this( element, message, null );
+ }
+
+ /**
+ * Create a new decoding exception.
+ * @param element the element representing the source of the error
+ * @param message the exception message
+ * @param cause the causal exception
+ */
+ public DecodingException( Element element, String message, Throwable
cause )
+ {
+ super( message );
+ if( null != cause )
+ {
+ super.initCause( cause );
+ }
+ m_element = element;
+ }
+
+ /**
+ * Get the element that is the subject of this exception.
+ * @return the subject element
+ */
+ public Element getElement()
+ {
+ return m_element;
+ }
+
+ /**
+ * Return a string representation of the exception.
+ * @return the string value
+ */
+ public String getMessage()
+ {
+ try
+ {
+ String message = super.getMessage();
+ StringBuffer buffer = new StringBuffer( message );
+ Element element = getElement();
+ String tag = element.getTagName();
+ buffer.append( "\nElement: <" );
+ buffer.append( tag );
+ buffer.append( " ...>" );
+ Document document = element.getOwnerDocument();
+ String uri = document.getDocumentURI();
+ if( null != uri )
+ {
+ buffer.append( "\nDocument: " + uri );
+ }
+ return buffer.toString();
+ }
+ catch( Throwable e )
+ {
+ return super.getMessage();
+ }
+ }
+}

Copied: trunk/main/transit/core/src/main/net/dpml/part/Encoder.java (from rev
1303, trunk/main/transit/core/src/main/net/dpml/lang/Encoder.java)
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Encoder.java 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Encoder.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2006 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.Writer;
+import java.io.IOException;
+
+/**
+ * Interface implemented by generic encoders.
+ */
+public interface Encoder
+{
+ /**
+ * Externalize a object to XML.
+ * @param writer the output stream writer
+ * @param object the object to externalize
+ * @param pad the character offset
+ * @exception IOException if an IO error occurs
+ */
+ public void encode( Writer writer, Object object, String pad ) throws
IOException;
+}

Modified: trunk/main/transit/core/src/main/net/dpml/part/Info.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/Info.java 2006-04-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Info.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -18,6 +18,7 @@

package net.dpml.part;

+import java.net.URI;
import java.io.Serializable;

/**
@@ -30,14 +31,17 @@
{
private final String m_title;
private final String m_description;
+ private final URI m_uri;

/**
* Creation of a new part info descriptor.
+ * @param uri the part uri
* @param title the title of the part
* @param description the part description
*/
- public Info( String title, String description )
+ public Info( URI uri, String title, String description )
{
+ m_uri = uri;
if( null == title )
{
m_title = "Untitled";
@@ -57,6 +61,16 @@
}

/**
+ * Get the part uri.
+ *
+ * @return the uri
+ */
+ public URI getURI()
+ {
+ return m_uri;
+ }
+
+ /**
* Get the part title.
*
* @return the title

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-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Part.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -18,45 +18,76 @@

package net.dpml.part;

-import java.io.Serializable;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.ArrayList;

+import javax.xml.XMLConstants;
+
+import net.dpml.lang.Category;
import net.dpml.lang.Classpath;
+import net.dpml.lang.Logger;

+import net.dpml.transit.Artifact;
+
/**
* Part datastructure.
*
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public final class Part implements Serializable
+public abstract class Part
{
+ protected static final ValueEncoder VALUE_ENCODER = new ValueEncoder();
+ protected static final String XML_HEADER = "<?xml version=\"1.0\"?>";
+ protected static final String PART_SCHEMA_URN = "@PART-XSD-URI@";
+ protected static final String PART_HEADER =
+ "<part xmlns=\""
+ + PART_SCHEMA_URN
+ + "\""
+ + "\n xmlns:xsi=\""
+ + XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI
+ + "\">";
+ protected static final String PART_FOOTER = "</part>";
+
private final Info m_info;
- private final Strategy m_strategy;
private final Classpath m_classpath;
+ private final ClassLoader m_classloader;
+ private final Logger m_logger;

+ public static Part load( URI uri ) throws IOException
+ {
+ return PartDecoder.getInstance().loadPart( uri );
+ }
+
/**
* 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
*/
- public Part( Info info, Strategy strategy, Classpath classpath )
+ public Part( Logger logger, Info info, Classpath classpath ) throws
IOException
{
+ super();
if( null == info )
{
throw new NullPointerException( "info" );
}
- if( null == strategy )
- {
- throw new NullPointerException( "strategy" );
- }
if( null == classpath )
{
throw new NullPointerException( "classpath" );
}
+ m_logger = logger;
m_info = info;
- m_strategy = strategy;
m_classpath = classpath;
+ m_classloader = buildClassLoader();
}

/**
@@ -70,16 +101,6 @@
}

/**
- * Get the part deployment strategy.
- *
- * @return the strategy definition
- */
- public Strategy getStrategy()
- {
- return m_strategy;
- }
-
- /**
* Get the part classpath definition.
*
* @return the classpath definition
@@ -88,32 +109,46 @@
{
return m_classpath;
}
-
+
/**
- * Test if this instance is equal to the supplied instance.
- * @param other the other instance
- * @return the equality status
+ * Instantiate a value.
+ * @param args supplimentary arguments
+ * @return the resolved instance
+ * @exception Exception if a deployment error occurs
*/
+ public abstract Object instantiate( Object[] args ) throws Exception;
+
+ public void encode( OutputStream output ) throws IOException
+ {
+ final Writer writer = new OutputStreamWriter( output );
+ writer.write( XML_HEADER );
+ writer.write( "\n" );
+ writer.write( "\n" + PART_HEADER );
+ writer.write( "\n" );
+ encodeInfo( writer, getInfo() );
+ writer.write( "\n" );
+ encodeStrategy( writer, " " );
+ writer.write( "\n" );
+ encodeClasspath( writer, getClasspath() );
+ writer.write( "\n" );
+ writer.write( "\n" + PART_FOOTER );
+ writer.write( "\n" );
+ writer.flush();
+ output.close();
+ }
+
public boolean equals( Object other )
{
- if( null == other )
+ if( other instanceof Part )
{
- return false;
- }
- else if( other instanceof Part )
- {
Part part = (Part) other;
- if( !m_info.equals( part.m_info ) )
+ if( !m_info.equals( part.getInfo() ) )
{
return false;
}
- else if( !m_strategy.equals( part.m_strategy ) )
- {
- return false;
- }
else
{
- return m_classpath.equals( part.m_classpath );
+ return m_classpath.equals( part.getClasspath() );
}
}
else
@@ -122,15 +157,189 @@
}
}

+ protected abstract void encodeStrategy( Writer writer, String pad )
throws IOException;
+
/**
- * Get the hashcode for this instance.
- * @return the hash value
+ * Get the implementation classloader.
+ * @return the resolved classloader
+ * @exception IOException if an IO error occurs during classpath
evaluation
*/
- public int hashCode()
+ public ClassLoader getClassLoader() throws IOException
{
- int hash = m_info.hashCode();
- hash ^= m_strategy.hashCode();
- hash ^= m_classpath.hashCode();
- return hash;
+ return m_classloader;
}
+
+ protected Logger getLogger()
+ {
+ return m_logger;
+ }
+
+ private ClassLoader buildClassLoader() throws IOException
+ {
+ ClassLoader base = getAnchorClassLoader();
+ Classpath classpath = getClasspath();
+ return newClassLoader( base, classpath );
+ }
+
+ private ClassLoader newClassLoader( ClassLoader base, Classpath
classpath ) throws IOException
+ {
+ URI uri = getInfo().getURI();
+ URI[] uris = classpath.getDependencies( Category.SYSTEM );
+ if( uris.length > 0 )
+ {
+ updateSystemClassLoader( uris );
+ }
+
+ URI[] apis = classpath.getDependencies( Category.PUBLIC );
+ ClassLoader api = StandardClassLoader.buildClassLoader( uri,
Category.PUBLIC, base, apis );
+ if( api != base )
+ {
+ classloaderConstructed( Category.PUBLIC, api );
+ }
+ URI[] spis = classpath.getDependencies( Category.PROTECTED );
+ ClassLoader spi = StandardClassLoader.buildClassLoader( uri,
Category.PROTECTED, api, spis );
+ if( spi != api )
+ {
+ classloaderConstructed( Category.PROTECTED, spi );
+ }
+ URI[] imps = classpath.getDependencies( Category.PRIVATE );
+ ClassLoader impl = StandardClassLoader.buildClassLoader( uri,
Category.PRIVATE, spi, imps );
+ if( impl != spi )
+ {
+ classloaderConstructed( Category.PRIVATE, impl );
+ }
+ return impl;
+ }
+
+ private ClassLoader getAnchorClassLoader()
+ {
+ ClassLoader context = Thread.currentThread().getContextClassLoader();
+ if( null != context )
+ {
+ return context;
+ }
+ else
+ {
+ return Part.class.getClassLoader();
+ }
+ }
+
+ private void updateSystemClassLoader( URI[] uris ) throws IOException
+ {
+ ClassLoader parent = ClassLoader.getSystemClassLoader();
+ synchronized( parent )
+ {
+ if( parent instanceof SystemClassLoader )
+ {
+ SystemClassLoader loader = (SystemClassLoader) parent;
+ loader.addDelegates( uris );
+ systemExpanded( uris );
+ }
+ else
+ {
+ final String message =
+ "Cannot load ["
+ + uris.length
+ + "] system artifacts into a foreign system classloader.";
+ getLogger().debug( message );
+ }
+ }
+ }
+
+
+ /**
+ * Handle notification of the creation of a new classloader.
+ * @param type the type of classloader (api, spi or impl)
+ * @param classloader the new classloader
+ */
+ public void classloaderConstructed( Category category, ClassLoader
classloader )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ int id = System.identityHashCode( classloader );
+ StringBuffer buffer = new StringBuffer();
+ buffer.append( "created classloader " );
+ buffer.append( m_info.getURI().toString() );
+ buffer.append( "#" + category.toString() );
+ buffer.append( " (" + id + ")" );
+ ClassLoader parent = classloader.getParent();
+ if( null != parent )
+ {
+ buffer.append( " extends (" + System.identityHashCode(
parent ) + ")" );
+ }
+ if( classloader instanceof URLClassLoader )
+ {
+ URLClassLoader loader = (URLClassLoader) classloader;
+ URL[] urls = loader.getURLs();
+ for( int i=0; i < urls.length; i++ )
+ {
+ URL url = urls[i];
+ buffer.append( "\n [" + i + "] \t" + url.toString() );
+ }
+ }
+ getLogger().debug( buffer.toString() );
+ }
+ }
+
+ /**
+ * Handle notification of system classloader expansion.
+ * @param urls the array of urls added to the system classloader
+ */
+ public void systemExpanded( URI[] uris )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append( "system classloader expansion" );
+ for( int i=0; i<uris.length; i++ )
+ {
+ int n = i+1;
+ buffer.append( "\n [" + n + "] \t" + uris[i] );
+ }
+ getLogger().debug( buffer.toString() );
+ }
+ }
+
+ private void encodeInfo( Writer writer, Info info ) throws IOException
+ {
+ String title = info.getTitle();
+ String description = info.getDescription();
+ if( null == description )
+ {
+ writer.write( "\n <info title=\"" + title + "\"/>" );
+ }
+ else
+ {
+ writer.write( "\n <info title=\"" + title + "\">" );
+ writer.write( "\n <description>" + description +
"</description>" );
+ writer.write( "\n </info>" );
+ }
+ }
+
+ private void encodeClasspath( Writer writer, Classpath classpath )
throws IOException
+ {
+ writer.write( "\n <classpath>" );
+ encodeClasspathCategory( writer, classpath, Category.SYSTEM );
+ encodeClasspathCategory( writer, classpath, Category.PUBLIC );
+ encodeClasspathCategory( writer, classpath, Category.PROTECTED );
+ encodeClasspathCategory( writer, classpath, Category.PRIVATE );
+ writer.write( "\n </classpath>" );
+ }
+
+ private void encodeClasspathCategory(
+ Writer writer, Classpath classpath, Category category ) throws
IOException
+ {
+ URI[] uris = classpath.getDependencies( category );
+ if( uris.length > 0 )
+ {
+ String name = category.getName();
+ writer.write( "\n <" + name + ">" );
+ for( int i=0; i<uris.length; i++ )
+ {
+ URI uri = uris[i];
+ writer.write( "\n <uri>" + uri.toASCIIString() +
"</uri>" );
+ }
+ writer.write( "\n </" + name + ">" );
+ }
+ }
}

Modified: trunk/main/transit/core/src/main/net/dpml/part/PartDecoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartDecoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartDecoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -20,11 +20,19 @@

import java.io.IOException;
import java.net.URI;
+import java.util.Map;
+import java.util.Hashtable;
+import java.util.WeakHashMap;
+import java.lang.ref.WeakReference;

import net.dpml.lang.Classpath;
-import net.dpml.lang.Decoder;
-import net.dpml.lang.DecodingException;
+import net.dpml.part.Decoder;
+import net.dpml.part.DecodingException;
+import net.dpml.lang.Logger;
+import net.dpml.lang.DefaultLogger;
+import net.dpml.lang.Value;

+import net.dpml.transit.Artifact;
import net.dpml.transit.util.ElementHelper;

import org.w3c.dom.Document;
@@ -36,169 +44,270 @@
*/
public final class PartDecoder implements Decoder
{
+ public static final String PART_XSD_URI = "@PART-XSD-URI@";
+
private static final DOM3DocumentBuilder DOCUMENT_BUILDER =
new DOM3DocumentBuilder();

- private static final PartStrategyDecoder STRATEGY_DECODER = new
PartStrategyDecoder();
+ private static final ValueDecoder VALUE_DECODER = new ValueDecoder();

- private final DecoderFactory m_factory;
+ private static final PartDecoder DECODER = new PartDecoder();

- /**
- * Creation of a new part builder.
- * @param factory the decoder factory
- */
- public PartDecoder( DecoderFactory factory )
+ public static PartDecoder getInstance()
{
- m_factory = factory;
+ return DECODER;
}

- /**
- * Load a part from a uri.
- * @param uri the part uri
- * @return the part definition
- * @exception IOException if an IO error occurs
- */
- public Part loadPart( URI uri ) throws IOException
+ private Map m_map = new Hashtable();
+
+ private Logger m_logger;
+
+ private PartDecoder()
{
- ClassLoader base = Part.class.getClassLoader();
- return loadPart( base, uri );
+ m_logger = new DefaultLogger();
}

/**
* Load a part from a uri.
- * @param base the base classloader
* @param uri the part uri
* @return the part definition
* @exception IOException if an IO error occurs
*/
- public Part loadPart( ClassLoader base, URI uri ) throws IOException
+ public Part loadPart( URI uri ) throws IOException
{
if( null == uri )
{
throw new NullPointerException( "uri" );
}
- if( null == base )
+ String key = buildKey( uri );
+ WeakReference ref = (WeakReference) m_map.get( key );
+ if( null != ref )
{
- throw new NullPointerException( "base" );
+ Part part = (Part) ref.get();
+ if( null != part )
+ {
+ if( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "loading part [" + uri + "] from
cache." );
+ }
+ //System.out.println( "CACHED PART: " + key );
+ //Exception e = new Exception( "trace" );
+ //e.printStackTrace();
+ return part;
+ }
}
-
try
{
+ if( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "loading part [" + uri + "] from source."
);
+ }
+ //System.out.println( "LOADING PART: " + key );
+ //Exception e = new Exception( "trace" );
+ //e.printStackTrace();
final Document document = DOCUMENT_BUILDER.parse( uri );
final Element root = document.getDocumentElement();
- return decodePart( base, root );
+ Part value = decodePart( uri, root );
+ WeakReference reference = new WeakReference( value );
+ m_map.put( key, reference );
+ return value;
}
catch( Throwable e )
{
final String error =
"An error while attempting to load a part."
- + "\nPart URI: " + uri;
+ + "\nURI: " + uri;
IOException exception = new IOException( error );
exception.initCause( e );
throw exception;
}
}

+ private String buildKey( URI uri )
+ {
+ ClassLoader classloader = getAnchorClassLoader();
+ int n = System.identityHashCode( classloader );
+ return "" + n + "#" + uri.toASCIIString();
+ }
+
/**
+ * Resolve a object from a DOM element.
+ * @param element the dom element
+ * @return the resolved object
+ * @exception DecodingException if an error occurs during element
evaluation
+ */
+ public Object decode( Element element ) throws IOException
+ {
+ return decodePart( null, element );
+ }
+
+ /**
* Resolve a part from a DOM element.
- * @param classloader the classloader
* @param element the dom element
* @return the part definition
* @exception DecodingException if an error occurs during element
evaluation
*/
- public Object decode( ClassLoader classloader, Element element ) throws
DecodingException
+ public Part decodePart( URI uri, Element element ) throws IOException
{
TypeInfo info = element.getSchemaTypeInfo();
- String name = info.getTypeName();
- if( "plugin".equals( name ) || "resource".equals( name ) )
+ String namespace = info.getTypeNamespace();
+ if( PART_XSD_URI.equals( namespace ) )
{
- return STRATEGY_DECODER.decode( classloader, element );
+ boolean alias = ElementHelper.getBooleanAttribute( element,
"alias", false );
+ Info information = getInfo( uri, element );
+ Classpath classpath = getClasspath( element );
+ Element strategy = getStrategyElement( element );
+ return build( information, classpath, strategy );
}
- else if( "part".equals( name ) )
- {
- return decodePart( classloader, element );
- }
else
{
final String error =
- "Element type name ["
- + name
- + "] is not recognized.";
+ "Part namespace not recognized."
+ + "\nExpecting: " + PART_XSD_URI
+ + "\nFound: " + namespace;
throw new DecodingException( element, error );
}
}

- /**
- * Resolve a part from a DOM element.
- * @param base the classloader
- * @param root the dom element
- * @return the part definition
- * @exception DecodingException if an error occurs during element
evaluation
- */
- public Part decodePart( ClassLoader base, Element root ) throws
DecodingException
+ public Part build( Info information, Classpath classpath, Element
strategy ) throws IOException
{
- if( null == root )
+ TypeInfo info = strategy.getSchemaTypeInfo();
+ String namespace = info.getTypeNamespace();
+ if( PART_XSD_URI.equals( namespace ) )
{
- throw new NullPointerException( "root" );
+ // this is either a plugin or a resource
+ Logger logger = getLogger();
+ String name = info.getTypeName();
+ if( "plugin".equals( name ) )
+ {
+ String classname = ElementHelper.getAttribute( strategy,
"class" );
+ Element[] elements = ElementHelper.getChildren( strategy );
+ Value[] values = VALUE_DECODER.decodeValues( elements );
+ return new Plugin( logger, information, classpath,
classname, values );
+ }
+ else if( "resource".equals( name ) )
+ {
+ String urn = ElementHelper.getAttribute( strategy, "urn" );
+ String path = ElementHelper.getAttribute( strategy, "path" );
+ return new Resource( logger, information, classpath, urn,
path );
+ }
+ else
+ {
+ final String error =
+ "Element type name ["
+ + name
+ + "] is not a recognized element type within the "
+ + PART_XSD_URI
+ + " namespace.";
+ throw new DecodingException( strategy, error );
+ }
}
- Info info = getInfo( root );
- Strategy strategy = getStrategy( base, root );
- Classpath classpath = getClasspath( root );
- return new Part( info, strategy, classpath );
+ else
+ {
+ // this is a foreign part
+
+ try
+ {
+ URI uri = getDecoderURIFromNamespaceURI( strategy, namespace
);
+ Builder builder = loadForeignBuilder( uri );
+ return builder.build( information, classpath, strategy );
+ }
+ catch( Exception ioe )
+ {
+ final String error =
+ "Internal error while attempting to load foreign part
builder.";
+ throw new DecodingException( strategy, error, ioe );
+ }
+ }
}

- private Strategy getStrategy( ClassLoader loader, Element root ) throws
DecodingException
+ protected Logger getLogger()
{
- Element[] children = ElementHelper.getChildren( root );
- if( children.length != 3 )
+ return m_logger;
+ }
+
+ private URI getDecoderURIFromNamespaceURI( Element element, String urn )
throws DecodingException
+ {
+ try
{
+ URI raw = new URI( urn );
+ Artifact artifact = Artifact.createArtifact( raw );
+ String scheme = artifact.getScheme();
+ String group = artifact.getGroup();
+ String name = artifact.getName();
+ String type = artifact.getType();
+ String version = artifact.getVersion();
+ String path = "link:part:" + group + "/" + name;
+ Artifact link = Artifact.createArtifact( path );
+ return link.toURI();
+ }
+ catch( Throwable e )
+ {
final String error =
- "Illegal number of child elements in <part>. Expecting 3,
found "
- + children.length
- + ".";
- throw new DecodingException( root, error );
+ "Unexpected error while resolving builder uri. "
+ + "\nNamespace: " + urn;
+ throw new DecodingException( element, error, e );
}
-
- Element strategy = children[1];
- Decoder decoder = getDocoder( strategy );
- Object result = decoder.decode( loader, strategy );
- if( result instanceof Strategy )
+ }
+
+ private Builder loadForeignBuilder( URI uri ) throws DecodingException,
Exception
+ {
+ Part part = loadPart( uri );
+ if( part instanceof Plugin )
{
- return (Strategy) result;
+ Plugin plugin = (Plugin) part;
+ Logger logger = getLogger();
+ Object[] args = new Object[]{logger};
+ Object object = plugin.instantiate( args );
+ if( object instanceof Builder )
+ {
+ return (Builder) object;
+ }
+ else
+ {
+ final String error =
+ "Plugin does not implement the "
+ + Builder.class.getName()
+ + " interface."
+ + "\nURI: " + uri
+ + "\nClass: " + object.getClass().getName();
+ throw new PartHandlerException( error );
+ }
}
else
{
final String error =
- "Decoded object is not assignable to "
- + Strategy.class.getName()
+ "Cannot resolve an instance from a part that is not derived
from "
+ + Plugin.class.getName()
+ "."
- + "\nDecoder: " + decoder.getClass().getName()
- + "\nObject: " + result.getClass().getName();
- throw new DecodingException( strategy, error );
+ + "\nURI: " + uri
+ + "\nPart Type: " + part.getClass().getName();
+ throw new PartHandlerException( error );
}
}

- private Decoder getDocoder( Element element ) throws DecodingException
+ private Element getStrategyElement( Element root ) throws
DecodingException
{
- try
+ Element[] children = ElementHelper.getChildren( root );
+ if( children.length != 3 )
{
- return m_factory.loadDecoder( element );
- }
- catch( Throwable e )
- {
final String error =
- "Unexpected error while attempting to load decoder.";
- throw new DecodingException( element, error );
+ "Illegal number of child elements in <part>. Expecting 3,
found "
+ + children.length
+ + ".";
+ throw new DecodingException( root, error );
}
+ return children[1];
}

- private Info getInfo( Element root )
+
+ private Info getInfo( URI uri, Element root )
{
Element element = ElementHelper.getChild( root, "info" );
String title = ElementHelper.getAttribute( element, "title",
"Unknown" );
Element descriptionElement = ElementHelper.getChild( element,
"description" );
String description = ElementHelper.getValue( descriptionElement );
- return new Info( title, description );
+ return new Info( uri, title, description );
}

/**
@@ -256,25 +365,17 @@
}
}

- private Element getSingleNestedElement( Element parent ) throws Exception
+ private ClassLoader getAnchorClassLoader()
{
- if( null == parent )
+ ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
+ if( null == classloader )
{
- throw new NullPointerException( "parent" );
+ return Part.class.getClassLoader();
}
else
{
- Element[] children = ElementHelper.getChildren( parent );
- if( children.length == 1 )
- {
- return children[0];
- }
- else
- {
- final String error =
- "Parent element does not contain a single child.";
- throw new IllegalArgumentException( error );
- }
+ return classloader;
}
}
+
}

Deleted: trunk/main/transit/core/src/main/net/dpml/part/PartDirective.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartDirective.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartDirective.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,128 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.io.Serializable;
-import java.net.URI;
-
-import net.dpml.lang.Value;
-
-/**
- * Immutable part creation directive.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class PartDirective implements Serializable
-{
- private final URI m_uri;
- private final Value[] m_params;
-
- /**
- * Creation of a new part creation directive.
- * @param uri the part uri
- */
- public PartDirective( URI uri )
- {
- this( uri, null );
- }
-
- /**
- * Creation of a new part creation directive.
- * @param uri the part uri
- * @param params an array of value arguments
- */
- public PartDirective( URI uri, Value[] params )
- {
- if( null == uri )
- {
- throw new NullPointerException( "uri" );
- }
- m_uri = uri;
- if( null == params )
- {
- m_params = new Value[0];
- }
- else
- {
- m_params = params;
- }
- }
-
- /**
- * Get the part uri.
- * @return the uri
- */
- public URI getURI()
- {
- return m_uri;
- }
-
- /**
- * Get the values to be used during part instantiation.
- * @return the directives
- */
- public Value[] getValues()
- {
- return m_params;
- }
-
- /**
- * Test if this instance is equal to the supplied instance.
- * @param other the other instance
- * @return the equality status
- */
- public boolean equals( Object other )
- {
- if( null == other )
- {
- return false;
- }
- else if( other instanceof PartDirective )
- {
- PartDirective part = (PartDirective) other;
- if( !m_uri.equals( part.m_uri ) )
- {
- return false;
- }
- else
- {
- return m_params.equals( part.m_params );
- }
- }
- else
- {
- return false;
- }
- }
-
- /**
- * Get the hashcode for this instance.
- * @return the hash value
- */
- public int hashCode()
- {
- int hash = m_uri.hashCode();
- for( int i=0; i<m_params.length; i++ )
- {
- hash ^= m_params[i].hashCode();
- }
- return hash;
- }
-}

Deleted: trunk/main/transit/core/src/main/net/dpml/part/PartEncoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartEncoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartEncoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,171 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.io.OutputStreamWriter;
-import java.net.URI;
-
-import javax.xml.XMLConstants;
-
-import net.dpml.lang.Category;
-import net.dpml.lang.Classpath;
-import net.dpml.lang.Encoder;
-
-/**
- * Utility class that provides support for the externalization of a part
instance to XML.
- */
-public class PartEncoder implements Encoder
-{
- private static final PartStrategyEncoder STRATEGY_ENCODER = new
PartStrategyEncoder();
-
- private static final String XML_HEADER =
- "<?xml version=\"1.0\"?>";
-
- private static final String PART_SCHEMA_URN = "@PART-XSD-URI@";
-
- private static final String PART_HEADER =
- "<part xmlns=\""
- + PART_SCHEMA_URN
- + "\""
- + "\n xmlns:xsi=\""
- + XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI
- + "\">";
-
- private static final String PART_FOOTER = "</part>";
-
- /**
- * Externalize the part to XML.
- * @param writer the output stream writer
- * @param object the object to encode
- * @param pad the character offset
- * @exception IOException if an IO error occurs
- */
- public void encode( Writer writer, Object object, String pad ) throws
IOException
- {
- if( object instanceof Strategy )
- {
- STRATEGY_ENCODER.encode( writer, (Strategy) object, pad );
- }
- else
- {
- final String error =
- "Object class ["
- + object.getClass().getName()
- + "] is not recognized.";
- throw new IllegalArgumentException( error );
- }
- }
-
- /**
- * Externalize the part to XML.
- * @param part the part to externalize
- * @param output the output stream
- * @param pad the character offset
- * @exception IOException if an IO error occurs
- */
- public void encodePart( Part part, OutputStream output, String pad )
throws IOException
- {
- final Writer writer = new OutputStreamWriter( output );
- writer.write( XML_HEADER );
- writer.write( "\n\n" );
- writer.write( PART_HEADER );
- writer.write( "\n" );
- encodeInfo( writer, part.getInfo() );
- writer.write( "\n" );
- encodeStrategy( writer, part.getStrategy(), " " );
- writer.write( "\n" );
- encodeClasspath( writer, part.getClasspath() );
- writer.write( "\n\n" );
- writer.write( PART_FOOTER );
- writer.write( "\n" );
- writer.flush();
- output.close();
- }
-
- private void encodeInfo( Writer writer, Info info ) throws IOException
- {
- String title = info.getTitle();
- String description = info.getDescription();
- if( null == description )
- {
- writer.write( "\n <info title=\"" + title + "\"/>" );
- }
- else
- {
- writer.write( "\n <info title=\"" + title + "\">" );
- writer.write( "\n <description>" + description +
"</description>" );
- writer.write( "\n </info>" );
- }
- }
-
- /**
- * Write the strategy by delegating to a strategy writer.
- * @param writer the output stream writer
- * @param strategy the strategy
- * @param pad the character offset
- * @exception IOException if an IO error occurs
- */
- protected void encodeStrategy( Writer writer, Strategy strategy, String
pad ) throws IOException
- {
- URI uri = strategy.getBuilderURI();
- try
- {
- Encoder encoder = DecoderFactory.loadEncoder( uri );
- encoder.encode( writer, strategy, pad );
- }
- catch( Exception e )
- {
- final String error =
- "An error occured during strategy externalization.";
- IOException ioe = new IOException( error );
- ioe.initCause( e );
- throw ioe;
- }
- }
-
- private void encodeClasspath( Writer writer, Classpath classpath )
throws IOException
- {
- writer.write( "\n <classpath>" );
- encodeClasspathCategory( writer, classpath, Category.SYSTEM );
- encodeClasspathCategory( writer, classpath, Category.PUBLIC );
- encodeClasspathCategory( writer, classpath, Category.PROTECTED );
- encodeClasspathCategory( writer, classpath, Category.PRIVATE );
- writer.write( "\n </classpath>" );
- }
-
- private void encodeClasspathCategory(
- Writer writer, Classpath classpath, Category category ) throws
IOException
- {
- URI[] uris = classpath.getDependencies( category );
- if( uris.length > 0 )
- {
- String name = category.getName();
- writer.write( "\n <" + name + ">" );
- for( int i=0; i<uris.length; i++ )
- {
- URI uri = uris[i];
- writer.write( "\n <uri>" + uri.toASCIIString() +
"</uri>" );
- }
- writer.write( "\n </" + name + ">" );
- }
- }
-}

Added: trunk/main/transit/core/src/main/net/dpml/part/PartError.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartError.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartError.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2004-2005 Stephen J. McConnell.
+ * Copyright 2004 Niclas Hedhman.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.IOException;
+
+/**
+ * Fatal part related error.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class PartError extends Error
+{
+ /**
+ * Serial version identifier.
+ */
+ static final long serialVersionUID = 1L;
+
+ /**
+ * Construct a new <code>PartError</code> instance.
+ *
+ * @param message The detail message for this exception.
+ */
+ public PartError( final String message )
+ {
+ this( message, null );
+ }
+
+ /**
+ * Construct a new <code>PartError</code> instance.
+ *
+ * @param message The detail message for this exception.
+ * @param cause the root cause of the exception
+ */
+ public PartError( final String message, final Throwable cause )
+ {
+ super( message );
+ super.initCause( cause );
+ }
+}
+
+

Deleted: trunk/main/transit/core/src/main/net/dpml/part/PartHandler.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartHandler.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartHandler.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.io.IOException;
-
-import net.dpml.lang.Classpath;
-
-/**
- * Interface implemented by part runtime handlers. Handler are identified
- * by the uri returned from <tt>Part.getStrategy().getControllerURI()</tt>.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface PartHandler
-{
- /**
- * Build a classloader stack.
- * @param anchor the anchor classloader to server as the classloader
chain root
- * @param classpath the part classpath definition
- * @return the new classloader
- * @exception IOException if an IO error occurs during classpath
evaluation
- */
- ClassLoader getClassLoader( ClassLoader anchor, Classpath classpath )
throws IOException;
-
- /**
- * Instantiate a value.
- * @param anchor the anchor classloader
- * @param classpath the part classpath
- * @param data the part deployment data
- * @param args supplimentary arguments
- * @return the resolved instance
- * @exception Exception if a deployment error occurs
- */
- Object getInstance( ClassLoader anchor, Classpath classpath, Object
data, Object[] args ) throws Exception;
-
-}

Added:
trunk/main/transit/core/src/main/net/dpml/part/PartHandlerException.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartHandlerException.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartHandlerException.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2004-2005 Stephen J. McConnell.
+ * Copyright 2004 Niclas Hedhman.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.IOException;
+
+/**
+ * Exception to indicate that there was a part handler related error.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class PartHandlerException extends IOException
+{
+ /**
+ * Serial version identifier.
+ */
+ static final long serialVersionUID = 1L;
+
+ /**
+ * Construct a new <code>PartHandlerException</code> instance.
+ *
+ * @param message The detail message for this exception.
+ */
+ public PartHandlerException( final String message )
+ {
+ this( message, null );
+ }
+
+ /**
+ * Construct a new <code>PartHandlerException</code> instance.
+ *
+ * @param message The detail message for this exception.
+ * @param cause the root cause of the exception
+ */
+ public PartHandlerException( final String message, final Throwable cause
)
+ {
+ super( message );
+ super.initCause( cause );
+ }
+}
+
+

Deleted:
trunk/main/transit/core/src/main/net/dpml/part/PartHandlerFactory.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartHandlerFactory.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartHandlerFactory.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,133 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.net.URI;
-import java.util.Hashtable;
-
-import net.dpml.transit.Transit;
-import net.dpml.transit.Repository;
-import net.dpml.lang.Value;
-import net.dpml.lang.Construct;
-
-
-/**
- * Factory used to locate part handlers.
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class PartHandlerFactory
-{
- private static final StandardPartHandler HANDLER = new
StandardPartHandler();
-
- private Hashtable m_map = new Hashtable();
-
- private static final PartHandlerFactory FACTORY = new
PartHandlerFactory();
-
- /**
- * Return the singleton part handler factory.
- * @return the factory instance
- */
- public static PartHandlerFactory getInstance()
- {
- return FACTORY;
- }
-
- private PartHandlerFactory()
- {
- }
-
- /**
- * Locate or resolve a part handler.
- * @param uri the part uri
- * @return the part handler
- * @exception Exception if an error occurs during handler resolution
- */
- public PartHandler getPartHandler( URI uri ) throws Exception
- {
- PartDirective directive = new PartDirective( uri, null );
- return getPartHandler( directive );
- }
-
- /**
- * Locate or resolve a part handler.
- * @param directive the part instantiation directive
- * @return the part handler
- * @exception Exception if an error occurs during handler resolution
- */
- public PartHandler getPartHandler( PartDirective directive ) throws
Exception
- {
- URI uri = directive.getURI();
- Value[] params = directive.getValues();
- Object[] args = Construct.getArgs( null, params, new Object[0] );
- return getPartHandler( uri, args );
- }
-
- /**
- * Locate or resolve a part handler.
- * @param uri the part uri
- * @param args part instantiation arguments
- * @return the part handler
- * @exception Exception if an error occurs during handler resolution
- */
- public PartHandler getPartHandler( URI uri, Object[] args ) throws
Exception
- {
- if( DecoderFactory.LOCAL_URI.equals( uri ) )
- {
- return HANDLER;
- }
- else
- {
- synchronized( m_map )
- {
- if( m_map.containsKey( uri ) )
- {
- return (PartHandler) m_map.get( uri );
- }
- else
- {
- PartHandler handler = loadPartHandler( uri, args );
- m_map.put( uri, handler );
- return handler;
- }
- }
- }
- }
-
- private PartHandler loadPartHandler( URI uri, Object[] args ) throws
Exception
- {
- ClassLoader classloader = PartHandler.class.getClassLoader();
- Repository repository = Transit.getInstance().getRepository();
- Object instance = repository.getPlugin( classloader, uri, args );
- if( instance instanceof PartHandler )
- {
- return (PartHandler) instance;
- }
- else
- {
- final String error =
- "Plugin uri does not resolve to an instance of "
- + PartHandler.class.getName()
- + "."
- + "\nURI: " + uri
- + "\nCLass: " + instance.getClass().getName();
- throw new IllegalArgumentException( error );
- }
- }
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/part/PartStrategyDecoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartStrategyDecoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartStrategyDecoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,103 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import net.dpml.lang.Value;
-import net.dpml.lang.Decoder;
-import net.dpml.lang.DecodingException;
-
-import net.dpml.transit.util.ElementHelper;
-
-import org.w3c.dom.TypeInfo;
-import org.w3c.dom.Element;
-
-/**
- * Utility used to build a plugin strategy from a DOM element.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-class PartStrategyDecoder implements Decoder
-{
- //
------------------------------------------------------------------------
- // static
- //
------------------------------------------------------------------------
-
- private static final PartDirective TRANSIT_DIRECTIVE =
- new PartDirective( DecoderFactory.LOCAL_URI );
-
- private static final ValueDecoder VALUE_DECODER = new ValueDecoder();
-
- //
------------------------------------------------------------------------
- // Decoder
- //
------------------------------------------------------------------------
-
- /**
- * Build a strategy from a supplied DOM element.
- * @param classloader the classloader
- * @param element the strategy element
- * @return the resolve instance
- * @exception Exception if an error occurs
- */
- public Object decode( ClassLoader classloader, Element element ) throws
DecodingException
- {
- return decodeStrategy( classloader, element );
- }
-
- //
------------------------------------------------------------------------
- // PartStrategyDecoder
- //
------------------------------------------------------------------------
-
- /**
- * Build a strategy from a supplied DOM element.
- * @param classloader the classloader
- * @param element the strategy element
- * @return the resolve strategy
- * @exception Exception if an error occurs
- */
- public Strategy decodeStrategy( ClassLoader classloader, Element element
) throws DecodingException
- {
- TypeInfo info = element.getSchemaTypeInfo();
- String type = info.getTypeName();
- boolean alias = ElementHelper.getBooleanAttribute( element, "alias",
false );
- if( "plugin".equals( type ) )
- {
- String classname = ElementHelper.getAttribute( element, "class"
);
- Element[] elements = ElementHelper.getChildren( element );
- Value[] values = VALUE_DECODER.decodeValues( elements );
- Plugin plugin = new Plugin( classname, values );
- return new Strategy( DecoderFactory.LOCAL_URI,
TRANSIT_DIRECTIVE, plugin, alias );
- }
- else if( "resource".equals( type ) )
- {
- String urn = ElementHelper.getAttribute( element, "urn" );
- String path = ElementHelper.getAttribute( element, "path" );
- Resource resource = new Resource( urn, path );
- return new Strategy( DecoderFactory.LOCAL_URI,
TRANSIT_DIRECTIVE, resource, alias );
- }
- else
- {
- final String error =
- "Strategy element type ["
- + type
- + "] is not recognized.";
- throw new DecodingException( element, error );
- }
- }
-}

Deleted:
trunk/main/transit/core/src/main/net/dpml/part/PartStrategyEncoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/PartStrategyEncoder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/PartStrategyEncoder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,107 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.io.Writer;
-import java.io.IOException;
-
-import net.dpml.lang.Value;
-import net.dpml.lang.Encoder;
-
-/**
- * Utility used to build a plugin strategy from a DOM element.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class PartStrategyEncoder implements Encoder
-{
- private static final ValueEncoder VALUE_ENCODER = new ValueEncoder();
-
- /**
- * Externalize a object to XML.
- * @param writer the output stream writer
- * @param object the object to externalize
- * @param pad the character offset
- * @exception IOException if an IO error occurs
- */
- public void encode( Writer writer, Object object, String pad ) throws
IOException
- {
- if( object instanceof Strategy )
- {
- encodeStrategy( writer, (Strategy) object, pad );
- }
- else
- {
- final String error =
- "Supplied object argument ["
- + object.getClass().getName()
- + "] is not recognized.";
- throw new IllegalArgumentException( error );
- }
- }
-
- /**
- * Externalize a strategy.
- * @param writer the output stream writer
- * @param strategy the strategy
- * @param pad the character offset
- * @exception IOException if an IO error occurs
- */
- public void encodeStrategy( Writer writer, Strategy strategy, String pad
) throws IOException
- {
- Object data = strategy.getDeploymentData();
- if( data instanceof Plugin )
- {
- Plugin plugin = (Plugin) data;
- String classname = plugin.getClassname();
- writer.write( "\n" + pad + "<strategy xsi:type=\"plugin\"
class=\"" );
- writer.write( classname );
- writer.write( "\"" );
- if( plugin.getValues().length > 0 )
- {
- writer.write( ">" );
- Value[] values = plugin.getValues();
- VALUE_ENCODER.encodeValues( writer, values, " " );
- writer.write( "\n" + pad + "</strategy>" );
- }
- else
- {
- writer.write( "/>" );
- }
- }
- else if( data instanceof Resource )
- {
- Resource resource = (Resource) data;
- String urn = resource.getURN();
- String path = resource.getPath();
- writer.write( "\n <strategy xsi:type=\"resource\"" );
- writer.write( " urn=\"" + urn );
- writer.write( "\" path=\"" + path );
- writer.write( "\"/>" );
- }
- else
- {
- final String error =
- "Unsupported strategy datatype: "
- + data.getClass().getName();
- throw new IOException( error );
- }
- }
-}

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-01
11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Plugin.java 2006-04-04
13:26:28 UTC (rev 1304)
@@ -18,17 +18,27 @@

package net.dpml.part;

-import java.io.Serializable;
+import java.io.Writer;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Array;
+import java.beans.Expression;
import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Iterator;

import net.dpml.lang.Value;
+import net.dpml.lang.Logger;
+import net.dpml.lang.Classpath;
+import net.dpml.lang.Construct;

/**
* Plugin part strategy implementation datatype.
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class Plugin implements Serializable
+public class Plugin extends Part
{
private final String m_classname;
private final Value[] m_params;
@@ -38,8 +48,23 @@
* @param classname the target class
* @param params an array of default value arguments
*/
- public Plugin( String classname, Value[] params )
+ public Plugin(
+ Logger logger, Info info, Classpath classpath, String classname )
+ throws IOException
{
+ this( logger, info, classpath, classname, new Value[0] );
+ }
+
+ /**
+ * Creation of an new plugin datatype.
+ * @param classname the target class
+ * @param params an array of default value arguments
+ */
+ public Plugin(
+ Logger logger, Info info, Classpath classpath, String classname,
Value[] params )
+ throws IOException
+ {
+ super( logger, info, classpath );
if( null == classname )
{
throw new NullPointerException( "classname" );
@@ -54,7 +79,7 @@

/**
* Get the target classname.
- * @return the cloassname
+ * @return the classname
*/
public String getClassname()
{
@@ -71,46 +96,343 @@
}

/**
- * Test if this instance is equal to the supplied instance.
- * @param other the other instance
- * @return the equality status
+ * Get the default plugin class.
+ * @return the plugin class
+ * @exception Exception if an error occurs
*/
+ public Class getPluginClass() throws Exception
+ {
+ ClassLoader classloader = getClassLoader();
+ String classname = getClassname();
+ return classloader.loadClass( classname );
+ }
+
+ /**
+ * Instantiate a value.
+ * @param args supplimentary arguments
+ * @return the resolved instance
+ * @exception Exception if a deployment error occurs
+ */
+ public Object instantiate( Object[] args ) throws Exception
+ {
+ ClassLoader classloader = getClassLoader();
+ ClassLoader context = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader( classloader );
+ try
+ {
+ Value[] values = getValues();
+ Class c = getPluginClass();
+ Object[] params = Construct.getArgs( null, values, args );
+ return instantiate( c, params );
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( context );
+ }
+ }
+
public boolean equals( Object other )
{
- if( null == other )
+ if( super.equals( other ) )
{
+ if( other instanceof Plugin )
+ {
+ Plugin plugin = (Plugin) other;
+ if( !m_classname.equals( plugin.m_classname ) )
+ {
+ return false;
+ }
+ else
+ {
+ return Arrays.equals( m_params, plugin.m_params );
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
return false;
}
- else if( other instanceof Plugin )
+ }
+
+ protected void encodeStrategy( Writer writer, String pad ) throws
IOException
+ {
+ String classname = getClassname();
+ writer.write( "\n" + pad + "<strategy xsi:type=\"plugin\" class=\""
);
+ writer.write( classname );
+ writer.write( "\"" );
+ if( getValues().length > 0 )
{
- Plugin plugin = (Plugin) other;
- if( !m_classname.equals( plugin.m_classname ) )
+ writer.write( ">" );
+ Value[] values = getValues();
+ VALUE_ENCODER.encodeValues( writer, values, pad + " " );
+ writer.write( "\n" + pad + "</strategy>" );
+ }
+ else
+ {
+ writer.write( "/>" );
+ }
+ }
+
+ /**
+ * Create a factory using a supplied class and command line arguments.
+ *
+ * @param clazz the the factory class
+ * @param args the command line args
+ * @return the plugin instance
+ * @exception IOException if a plugin creation error occurs
+ * @exception InvocationTargetException if a plugin constructor
invocation error occurs
+ */
+ public static Object instantiate( Class clazz, Object[] args ) throws
IOException, InvocationTargetException
+ {
+ if( null == clazz )
+ {
+ throw new NullPointerException( "clazz" );
+ }
+ if( null == args )
+ {
+ throw new NullPointerException( "args" );
+ }
+ for( int i=0; i < args.length; i++ )
+ {
+ Object p = args[i];
+ if( null == p )
{
- return false;
+ final String error =
+ "User supplied instantiation argument at position ["
+ + i
+ + "] for the class ["
+ + clazz.getName()
+ + "] is a null value.";
+ throw new NullPointerException( error );
}
+ }
+
+ if( clazz.getConstructors().length == 1 )
+ {
+ Constructor constructor = getSingleConstructor( clazz );
+ return instantiate( constructor, args );
+ }
+ else
+ {
+ try
+ {
+ Expression expression = new Expression( clazz, "new", args );
+ return expression.getValue();
+ }
+ catch( InvocationTargetException e )
+ {
+ throw e;
+ }
+ catch( PartHandlerException e )
+ {
+ throw e;
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Class instantiation error [" + clazz.getName() + "]";
+ throw new PartHandlerException( error, e );
+ }
+ }
+ }
+
+ private static Object instantiate( Constructor constructor, Object[]
args )
+ throws PartHandlerException, InvocationTargetException
+ {
+ Object[] arguments = populate( constructor, args );
+ return newInstance( constructor, arguments );
+ }
+
+ private static Object[] populate( Constructor constructor, Object[] args
) throws PartHandlerException
+ {
+ if( null == constructor )
+ {
+ throw new NullPointerException( "constructor" );
+ }
+ if( null == args )
+ {
+ throw new NullPointerException( "args" );
+ }
+
+ Class[] classes = constructor.getParameterTypes();
+ Object[] arguments = new Object[ classes.length ];
+ ArrayList list = new ArrayList();
+ for( int i=0; i < args.length; i++ )
+ {
+ list.add( args[i] );
+ }
+
+ //
+ // sweep though the construct arguments one by one and
+ // see if we can assign a value based on the supplied args
+ //
+
+ for( int i=0; i < classes.length; i++ )
+ {
+ Class clazz = classes[i];
+ Iterator iterator = list.iterator();
+ while( iterator.hasNext() )
+ {
+ Object object = iterator.next();
+ Class c = object.getClass();
+ if( isAssignableFrom( clazz, c ) )
+ {
+ arguments[i] = object;
+ list.remove( object );
+ break;
+ }
+ }
+ }
+
+ //
+ // if any arguments are unresolved then check if the argument type
+ // is something we can implicity establish
+ //
+
+ for( int i=0; i < arguments.length; i++ )
+ {
+ if( null == arguments[i] )
+ {
+ Class c = classes[i];
+ if( c.isArray() )
+ {
+ arguments[i] = getEmptyArrayInstance( c );
+ }
+ else
+ {
+ final String error =
+ "Unable to resolve a value for a constructor
parameter."
+ + "\nConstructor class: " +
constructor.getDeclaringClass().getName()
+ + "\nParameter class: " + c.getName()
+ + "\nParameter position: " + ( i + 1 );
+ throw new PartHandlerException( error );
+ }
+ }
+ }
+ return arguments;
+ }
+
+ private static boolean isAssignableFrom( Class clazz, Class c )
+ {
+ if( clazz.isPrimitive() )
+ {
+ if( Integer.TYPE == clazz )
+ {
+ return Integer.class.isAssignableFrom( c );
+ }
+ else if( Boolean.TYPE == clazz )
+ {
+ return Boolean.class.isAssignableFrom( c );
+ }
+ else if( Byte.TYPE == clazz )
+ {
+ return Byte.class.isAssignableFrom( c );
+ }
+ else if( Short.TYPE == clazz )
+ {
+ return Short.class.isAssignableFrom( c );
+ }
+ else if( Long.TYPE == clazz )
+ {
+ return Long.class.isAssignableFrom( c );
+ }
+ else if( Float.TYPE == clazz )
+ {
+ return Float.class.isAssignableFrom( c );
+ }
+ else if( Double.TYPE == clazz )
+ {
+ return Double.class.isAssignableFrom( c );
+ }
else
{
-
- return Arrays.equals( m_params, plugin.m_params );
+ final String error =
+ "Primitive type ["
+ + c.getName()
+ + "] not supported.";
+ throw new RuntimeException( error );
}
}
else
{
- return false;
+ return clazz.isAssignableFrom( c );
}
}
+
+ private static Object newInstance( Constructor constructor, Object[]
arguments )
+ throws PartHandlerException, InvocationTargetException
+ {
+ try
+ {
+ Object instance = constructor.newInstance( arguments );
+ //getMonitor().pluginInstantiated( instance );
+ return instance;
+ }
+ catch( InvocationTargetException e )
+ {
+ throw e;
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Cannot create an instance of ["
+ + constructor.getDeclaringClass().getName()
+ + "] due to an instantiation failure.";
+ throw new PartHandlerException( error, e );
+ }
+ }

+ private static Constructor getSingleConstructor( Class clazz ) throws
PartHandlerException
+ {
+ if( null == clazz )
+ {
+ throw new NullPointerException( "clazz" );
+ }
+ Constructor[] constructors = clazz.getConstructors();
+ if( constructors.length < 1 )
+ {
+ final String error =
+ "Target class ["
+ + clazz.getName()
+ + "] does not declare a public constructor.";
+ throw new PartHandlerException( error );
+ }
+ else if( constructors.length > 1 )
+ {
+ final String error =
+ "Target class ["
+ + clazz.getName()
+ + "] declares multiple public constructors.";
+ throw new PartHandlerException( error );
+ }
+ else
+ {
+ return constructors[0];
+ }
+ }
+
/**
- * Get the hashcode for this instance.
- * @return the hash value
+ * Constructs an empty array instance.
+ * @param clazz the array class
+ * @return the empty array instance
+ * @exception RepositoryException if an error occurs
*/
- public int hashCode()
+ private static Object[] getEmptyArrayInstance( Class clazz ) throws
PartHandlerException
{
- int hash = m_classname.hashCode();
- for( int i=0; i<m_params.length; i++ )
+ try
{
- hash ^= m_params[i].hashCode();
+ return (Object[]) Array.newInstance( clazz.getComponentType(), 0
);
}
- return hash;
+ catch( Throwable e )
+ {
+ final String error =
+ "Internal error while attempting to construct an empty array
for the class: "
+ + clazz.getName();
+ throw new PartHandlerException( error, e );
+ }
}
}

Modified: trunk/main/transit/core/src/main/net/dpml/part/Resource.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/Resource.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Resource.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -18,14 +18,18 @@

package net.dpml.part;

-import java.io.Serializable;
+import java.io.IOException;
+import java.io.Writer;

+import net.dpml.lang.Logger;
+import net.dpml.lang.Classpath;
+
/**
* Resource part strategy implementation datatype.
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class Resource implements Serializable
+public class Resource extends Part
{
private final String m_urn;
private final String m_path;
@@ -35,8 +39,10 @@
* @param urn the resource urn
* @param path the resource path
*/
- public Resource( String urn, String path )
+ public Resource( Logger logger, Info info, Classpath classpath, String
urn, String path )
+ throws IOException
{
+ super( logger, info, classpath );
if( null == urn )
{
throw new NullPointerException( "urn" );
@@ -68,26 +74,45 @@
}

/**
- * Test if this instance is equal to the supplied instance.
- * @param other the other instance
- * @return the equality status
+ * Instantiate a value.
+ * @param args supplimentary arguments
+ * @return the resolved instance
+ * @exception Exception if a deployment error occurs
*/
+ public Object instantiate( Object[] args ) throws Exception
+ {
+ throw new UnsupportedOperationException( "instantiate/1" );
+ }
+
+ protected void encodeStrategy( Writer writer, String pad ) throws
IOException
+ {
+ String urn = getURN();
+ String path = getPath();
+ writer.write( "\n <strategy xsi:type=\"resource\"" );
+ writer.write( " urn=\"" + urn );
+ writer.write( "\" path=\"" + path );
+ writer.write( "\"/>" );
+ }
+
public boolean equals( Object other )
{
- if( null == other )
+ if( super.equals( other ) )
{
- return false;
- }
- else if( other instanceof Resource )
- {
- Resource resource = (Resource) other;
- if( !m_urn.equals( resource.m_urn ) )
+ if( other instanceof Resource )
{
- return false;
+ Resource resource = (Resource) other;
+ if( !m_path.equals( resource.m_path ) )
+ {
+ return false;
+ }
+ else
+ {
+ return m_urn.equals( resource.m_urn );
+ }
}
else
{
- return m_path.equals( resource.m_path );
+ return false;
}
}
else
@@ -96,14 +121,5 @@
}
}

- /**
- * Get the hashcode for this instance.
- * @return the hash value
- */
- public int hashCode()
- {
- int hash = m_urn.hashCode();
- hash ^= m_path.hashCode();
- return hash;
- }
+
}

Copied:
trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java (from
rev 1303,
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java)
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/StandardClassLoader.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,456 @@
+/*
+ * Copyright (c) 2005 Stephen J. McConnell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Stack;
+import java.net.URL;
+import java.net.URI;
+import java.net.URLClassLoader;
+
+import net.dpml.lang.Category;
+
+import net.dpml.transit.Artifact;
+
+/**
+ * A named classloader.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class StandardClassLoader extends URLClassLoader
+{
+ //--------------------------------------------------------------------
+ // static
+ //--------------------------------------------------------------------
+
+ /**
+ * 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 parent the parent classloader
+ * @param urls the urls to assign as classloader content
+ * @return the classloader
+ */
+ public static ClassLoader buildClassLoader( URI uri, Category category,
ClassLoader parent, URI[] uris )
+ throws IOException
+ {
+ URL[] urls = toURLs( uris );
+ if( 0 == urls.length )
+ {
+ return parent;
+ }
+ ArrayList list = new ArrayList();
+ for( int i=0; i < urls.length; i++ )
+ {
+ if( isaCandidate( parent, urls[i] ) )
+ {
+ list.add( urls[i] );
+ }
+ }
+ URL[] qualified = (URL[]) list.toArray( new URL[0] );
+ if( qualified.length == 0 )
+ {
+ return parent;
+ }
+ else
+ {
+ return new StandardClassLoader( uri, category, qualified, parent
);
+ }
+ }
+
+ /**
+ * Convert a sequncence of URIs to URLs.
+ * @param uris the uris to convert
+ * @return the corresponding urls
+ * @exception IOException of a transformation error occurs
+ */
+ public static URL[] toURLs( URI[] uris ) throws IOException
+ {
+ URL[] urls = new URL[ uris.length ];
+ for( int i=0; i < urls.length; i++ )
+ {
+ URI uri = uris[i];
+ if( Artifact.isRecognized( uri ) )
+ {
+ urls[i] = Artifact.toURL( uri );
+ }
+ else
+ {
+ urls[i] = uri.toURL();
+ }
+ }
+ return urls;
+ }
+
+ /**
+ * Test if the supplied url is already present within the supplied
classloader.
+ * @param classloader the classloader to validate against
+ * @param url to url to check for
+ * @return true if the url is not included in the classloader
+ */
+ private static boolean isaCandidate( ClassLoader classloader, URL url )
+ {
+ if( classloader instanceof URLClassLoader )
+ {
+ URL[] urls = ( (URLClassLoader) classloader ).getURLs();
+ for( int i=0; i < urls.length; i++ )
+ {
+ if( urls[i].equals( url ) )
+ {
+ return false;
+ }
+ }
+ ClassLoader parent = classloader.getParent();
+ if( parent == null )
+ {
+ return true;
+ }
+ else
+ {
+ return isaCandidate( parent, url );
+ }
+ }
+ else
+ {
+ return true;
+ }
+ }
+
+ //--------------------------------------------------------------------
+ // state
+ //--------------------------------------------------------------------
+
+ private final Category m_category;
+ private final URI m_plugin;
+
+ //--------------------------------------------------------------------
+ // constructor
+ //--------------------------------------------------------------------
+
+ /**
+ * Creation of a new classloader.
+ * @param plugin uri identifying the plugin
+ * @param category the classloader category identifier
+ * @param urls an array of urls to add to the classloader
+ * @param parent the parent classloader
+ */
+ public StandardClassLoader( URI plugin, Category category, URL[] urls,
ClassLoader parent )
+ {
+ super( urls, parent );
+ m_category = category;
+ m_plugin = plugin;
+ }
+
+ //--------------------------------------------------------------------
+ // StandardClassLoader
+ //--------------------------------------------------------------------
+
+ /**
+ * Return the classloader category
+ * @return the classloader category
+ */
+ public Category getCategory()
+ {
+ return m_category;
+ }
+
+ /**
+ * Return the plugin uri identifier
+ * @return the plugin uri
+ */
+ public URI getPluginURI()
+ {
+ return m_plugin;
+ }
+
+ /**
+ * Return a string representation of the classloader.
+ * @return the string value
+ */
+ public String getAnnotations()
+ {
+ StringBuffer buffer = new StringBuffer();
+ ClassLoader parent = getParent();
+ if( parent instanceof URLClassLoader )
+ {
+ URLClassLoader urlClassLoader = (URLClassLoader) parent;
+ buffer.append( getURLClassLoaderAnnotations( urlClassLoader ) );
+ }
+ buffer.append( " " );
+ URL[] urls = getURLs();
+ for( int i=0; i<urls.length; i++ )
+ {
+ String path = urls[i].toString();
+ if( !path.startsWith( "file:" ) )
+ {
+ buffer.append( path );
+ buffer.append( " " );
+ }
+ }
+ return buffer.toString().trim();
+ }
+
+ private String getURLClassLoaderAnnotations( URLClassLoader classloader )
+ {
+ StringBuffer buffer = new StringBuffer();
+ ClassLoader parent = classloader.getParent();
+ if( ( null != parent ) && ( parent instanceof URLClassLoader ) )
+ {
+ URLClassLoader urlClassLoader = (URLClassLoader) parent;
+ buffer.append( getURLClassLoaderAnnotations( urlClassLoader ) );
+ }
+ if( ClassLoader.getSystemClassLoader() == classloader )
+ {
+ return "";
+ }
+ buffer.append( " " );
+ URL[] urls = classloader.getURLs();
+ for( int i=0; i<urls.length; i++ )
+ {
+ String path = urls[i].toString();
+ if( !path.startsWith( "file:" ) )
+ {
+ buffer.append( path );
+ buffer.append( " " );
+ }
+ }
+ return buffer.toString().trim();
+ }
+
+ /**
+ * Return a string representing of the classloader.
+ * @param expanded if true return an expanded representation of the
classloader
+ * @return the string representation
+ */
+ public String toString( boolean expanded )
+ {
+ StringBuffer buffer = new StringBuffer();
+ listClasspath( buffer );
+ return buffer.toString();
+ }
+
+ //--------------------------------------------------------------------
+ // Object
+ //--------------------------------------------------------------------
+
+ /**
+ * Return a string representing of the classloader.
+ * @return the string representation
+ */
+ public String toString()
+ {
+ final String label =
+ getClass().getName()
+ + "#"
+ + System.identityHashCode( this );
+ return label;
+ }
+
+ /**
+ * Internal operation to list the classloader classpath.
+ * @param buffer the buffer to list to
+ */
+ protected void listClasspath( StringBuffer buffer )
+ {
+ listClasspath( buffer, this );
+ buffer.append( "\n" );
+ }
+
+ /**
+ * Internal operation to list a classloader classpath.
+ * @param buffer the buffer to list to
+ * @param classloader the classloader to list
+ */
+ protected void listClasspath( StringBuffer buffer, ClassLoader
classloader )
+ {
+ String label =
+ "\nClassLoader: "
+ + classloader.getClass().getName()
+ + " (" + System.identityHashCode( classloader ) + ")";
+
+ if( classloader instanceof StandardClassLoader )
+ {
+ StandardClassLoader cl = (StandardClassLoader) classloader;
+ ClassLoader parent = cl.getParent();
+ if( null != parent )
+ {
+ listClasspath( buffer, parent );
+ }
+
+ if( null != m_plugin )
+ {
+ label = label.concat( "\nGroup: " + m_plugin + " " +
cl.getCategory() );
+ }
+ else
+ {
+ label = label.concat( "\nCategory: " + cl.getCategory() );
+ }
+ buffer.append( label );
+ buffer.append( "\n" );
+ appendEntries( buffer, cl );
+ }
+ else if( classloader instanceof URLClassLoader )
+ {
+ URLClassLoader cl = (URLClassLoader) classloader;
+ ClassLoader parent = cl.getParent();
+ if( null != parent )
+ {
+ listClasspath( buffer, parent );
+ }
+ buffer.append( label );
+ appendEntries( buffer, cl );
+ }
+ else
+ {
+ buffer.append( label );
+ buffer.append( "]\n" );
+ }
+ }
+
+ private static void appendEntries( StringBuffer buffer, URLClassLoader
classloader )
+ {
+ URL[] urls = classloader.getURLs();
+ for( int i=0; i < urls.length; i++ )
+ {
+ buffer.append( "\n " );
+ URL url = urls[i];
+ String spec = url.toString();
+ buffer.append( spec );
+ }
+ buffer.append( "\n" );
+ }
+
+ public static String toString( ClassLoader primary, ClassLoader
secondary )
+ {
+ StringBuffer buffer = new StringBuffer();
+ ClassLoader anchor = getCommonParent( primary, secondary );
+ if( null != anchor )
+ {
+ buffer.append(
"\n----------------------------------------------------------------" );
+ buffer.append( "\nCommon Classloader" );
+ buffer.append(
"\n----------------------------------------------------------------" );
+ list( buffer, anchor );
+ }
+ buffer.append(
"\n----------------------------------------------------------------" );
+ buffer.append( "\nPrimary Classloader" );
+ buffer.append(
"\n----------------------------------------------------------------" );
+ list( buffer, primary, anchor );
+ buffer.append(
"\n----------------------------------------------------------------" );
+ buffer.append( "\nSecondary Classloader" );
+ buffer.append(
"\n----------------------------------------------------------------" );
+ list( buffer, secondary, anchor );
+ buffer.append(
"\n----------------------------------------------------------------" );
+ return buffer.toString();
+ }
+
+ private static ClassLoader getCommonParent( ClassLoader primary,
ClassLoader secondary )
+ {
+ ClassLoader[] primaryChain = getClassLoaderChain( primary );
+ ClassLoader[] secondaryChain = getClassLoaderChain( secondary );
+ return getCommonClassLoader( primaryChain, secondaryChain );
+ }
+
+ private static ClassLoader[] getClassLoaderChain( ClassLoader
classloader )
+ {
+ ArrayList list = new ArrayList();
+ list.add( classloader );
+ ClassLoader parent = classloader.getParent();
+ while( null != parent )
+ {
+ list.add( parent );
+ parent = parent.getParent();
+ }
+ ArrayList result = new ArrayList();
+ int n = list.size() - 1;
+ for( int i=n; i>-1; i-- )
+ {
+ result.add( list.get( i ) );
+ }
+
+ return (ClassLoader[]) result.toArray( new ClassLoader[0] );
+ }
+
+ private static ClassLoader getCommonClassLoader( ClassLoader[] primary,
ClassLoader[] secondary )
+ {
+ ClassLoader anchor = null;
+ for( int i=0; i<primary.length; i++ )
+ {
+ ClassLoader classloader = primary[i];
+ if( secondary.length > i )
+ {
+ ClassLoader cl = secondary[i];
+ if( classloader == cl )
+ {
+ anchor = cl;
+ }
+ else
+ {
+ return anchor;
+ }
+ }
+ else
+ {
+ return anchor;
+ }
+ }
+ return anchor;
+ }
+
+ private static void list( StringBuffer buffer, ClassLoader classloader )
+ {
+ list( buffer, classloader, null );
+ }
+
+ private static void list( StringBuffer buffer, ClassLoader classloader,
ClassLoader anchor )
+ {
+ if( classloader == anchor )
+ {
+ return;
+ }
+ ClassLoader parent = classloader.getParent();
+ if( null != parent )
+ {
+ list( buffer, parent, anchor );
+ }
+ String label =
+ "\nClassLoader: "
+ + classloader.getClass().getName()
+ + " (" + System.identityHashCode( classloader ) + ")";
+ buffer.append( label );
+ if( classloader instanceof StandardClassLoader )
+ {
+ StandardClassLoader loader = (StandardClassLoader) classloader;
+ buffer.append( " " + loader.m_category );
+ URI uri = loader.getPluginURI();
+ if( null != uri )
+ {
+ buffer.append( "\nURI: " + uri );
+ }
+ }
+ if( classloader instanceof URLClassLoader )
+ {
+ URLClassLoader urlcl = (URLClassLoader) classloader;
+ buffer.append( "\n" );
+ appendEntries( buffer, urlcl );
+ }
+ }
+}

Deleted:
trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/StandardPartHandler.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,82 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.io.IOException;
-
-import net.dpml.lang.Classpath;
-import net.dpml.lang.Construct;
-import net.dpml.lang.Value;
-
-import net.dpml.transit.Transit;
-
-/**
- * Handle part related functions.
- */
-public class StandardPartHandler implements PartHandler
-{
- /**
- * Build a classloader stack.
- * @param anchor the anchor classloader to server as the classloader
chain root
- * @param classpath the part classpath definition
- * @return the resolved classloader
- * @exception IOException if an IO error occurs
- */
- public ClassLoader getClassLoader( ClassLoader anchor, Classpath
classpath ) throws IOException
- {
- return Transit.getInstance().getRepository().createClassLoader(
anchor, null, classpath );
- }
-
- /**
- * Instantiate a value.
- * @param anchor the anchor classloader
- * @param classpath the part classpath
- * @param data the part deployment data
- * @param args supplimentary arguments
- * @return the resolved instance
- * @exception Exception if a deployment error occurs
- */
- public Object getInstance(
- ClassLoader anchor, Classpath classpath, Object data, Object[] args )
throws Exception
- {
- ClassLoader classloader = getClassLoader( anchor, classpath );
- if( data instanceof Plugin )
- {
- Plugin plugin = (Plugin) data;
- String classname = plugin.getClassname();
- Value[] values = plugin.getValues();
- ClassLoader context =
Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( classloader );
- try
- {
- Object[] params = Construct.getArgs( null, values, args );
- Class c = classloader.loadClass( classname );
- return Transit.getInstance().getRepository().instantiate( c,
params );
- }
- finally
- {
- Thread.currentThread().setContextClassLoader( context );
- }
- }
- else
- {
- throw new UnsupportedOperationException( "getInstance/" +
data.getClass().getName() );
- }
- }
-}

Deleted: trunk/main/transit/core/src/main/net/dpml/part/Strategy.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/part/Strategy.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/part/Strategy.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,164 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * Part deployment strategy description.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class Strategy
-{
- private final PartDirective m_controller;
- private final Serializable m_data;
- private final URI m_builder;
- private final boolean m_alias;
-
- /**
- * Creation of a new part instantiation strategy.
- * @param builder the builder uri
- * @param controller the runtime controller that will handle part
deployment
- * @param data the data to tbe supplied to the controller
- */
- public Strategy( URI builder, PartDirective controller, Serializable
data )
- {
- this( builder, controller, data, false );
- }
-
- /**
- * Creation of a new part instantiation strategy.
- * @param builder the builder uri
- * @param controller the runtime controller that will handle part
deployment
- * @param data the data to tbe supplied to the controller
- * @param alias the alias flag
- */
- public Strategy( URI builder, PartDirective controller, Serializable
data, boolean alias )
- {
- if( null == controller )
- {
- throw new NullPointerException( "controller" );
- }
- if( null == data )
- {
- throw new NullPointerException( "data" );
- }
- if( null == builder )
- {
- throw new NullPointerException( "builder" );
- }
- m_builder = builder;
- m_controller = controller;
- m_data = data;
- m_alias = alias;
- }
-
- /**
- * Return the datatype id.
- * @return the constant 'part' type identifier
- */
- public String getID()
- {
- return "part";
- }
-
- /**
- * Return the datatype id.
- * @return the alias flag value
- */
- public boolean getAlias()
- {
- return m_alias;
- }
-
- /**
- * Get the strategy builder uri.
- * @return the builder uri
- */
- public URI getBuilderURI()
- {
- return m_builder;
- }
-
- /**
- * Get the controller deployment directive.
- * @return the deployment controller uri
- */
- public PartDirective getPartDirective()
- {
- return m_controller;
- }
-
- /**
- * Get the deployment data.
- * @return the deployment datastructure
- */
- public Object getDeploymentData()
- {
- return m_data;
- }
-
- /**
- * Test if this instance is equal to the supplied instance.
- * @param other the other instance
- * @return the equality status
- */
- public boolean equals( Object other )
- {
- if( null == other )
- {
- return false;
- }
- else if( other instanceof Strategy )
- {
- Strategy strategy = (Strategy) other;
- if( !m_builder.equals( strategy.m_builder ) )
- {
- return false;
- }
- else if( !m_controller.equals( strategy.m_controller ) )
- {
- return false;
- }
- else
- {
- return m_data.equals( strategy.m_data );
- }
- }
- else
- {
- return false;
- }
- }
-
- /**
- * Get the hashcode for this instance.
- * @return the hash value
- */
- public int hashCode()
- {
- int hash = m_builder.hashCode();
- hash ^= m_controller.hashCode();
- hash ^= m_data.hashCode();
- return hash;
- }
-}

Copied: trunk/main/transit/core/src/main/net/dpml/part/SystemClassLoader.java
(from rev 1296,
trunk/main/transit/core/src/main/net/dpml/transit/SystemClassLoader.java)
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/SystemClassLoader.java
2006-03-30 06:23:45 UTC (rev 1296)
+++ trunk/main/transit/core/src/main/net/dpml/part/SystemClassLoader.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2005 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.part;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.List;
+import java.util.Arrays;
+
+import net.dpml.lang.Category;
+
+/**
+ * The SystemClassLoader is a URLClassLoader that supports late binding of
+ * URLs. This class may be configured as the system classloader when
loading plugins
+ * that declare system category plugin entries.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class SystemClassLoader extends StandardClassLoader
+{
+ private final ClassLoader m_parent;
+
+ /**
+ * Creation of a new Depot classloader.
+ *
+ * @param parent the parent classloader
+ */
+ public SystemClassLoader( ClassLoader parent )
+ {
+ super( SYSTEM_URI, Category.SYSTEM, new URL[0], parent );
+ m_parent = parent;
+
+ if( "true".equals( System.getProperty( "dpml.transit.include.tools"
) ) )
+ {
+ String jrePath = System.getProperty( "java.home" );
+ try
+ {
+ File jre = new File( jrePath );
+ File jdk = jre.getParentFile();
+ File lib = new File( jdk, "lib" );
+ File jar = new File( lib, "tools.jar" );
+ URL url = jar.toURL();
+ addURL( url );
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Internal error while attempting to establish tools.jar in
the system classloader.";
+ throw new PartError( error, e );
+ }
+ }
+ }
+
+ synchronized void addDelegates( final URI[] uris ) throws IOException
+ {
+ URL[] urls = toURLs( uris );
+ URL[] local = super.getURLs();
+ List list = Arrays.asList( local );
+ for( int i=0; i<urls.length; i++ )
+ {
+ URL url = urls[i];
+ if( !list.contains( url ) )
+ {
+ try
+ {
+ url.getContent();
+ addURL( url );
+ }
+ catch( Exception e )
+ {
+ final String error =
+ "Failed to resolve url " + url;
+ System.err.println( error );
+ }
+ }
+ }
+ }
+
+ private static final URI createSystemLabel()
+ {
+ try
+ {
+ return new URI( "transit:system" );
+ }
+ catch( Exception e )
+ {
+ return null;
+ }
+ }
+
+ private static final URI SYSTEM_URI = createSystemLabel();
+}
+

Deleted:
trunk/main/transit/core/src/main/net/dpml/part/UnresolvableHandlerException.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/part/UnresolvableHandlerException.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/core/src/main/net/dpml/part/UnresolvableHandlerException.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.part;
-
-import java.net.URI;
-
-import net.dpml.transit.artifact.ArtifactNotFoundException;
-
-/**
- * Exception throw when a request for a part handler is not resolvable.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class UnresolvableHandlerException extends ArtifactNotFoundException
-{
- /**
- * Creation of a new exception instance.
- * @param message the message
- * @param uri the target uri
- */
- public UnresolvableHandlerException( String message, URI uri )
- {
- super( message, uri );
- }
-}

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultContentRegistry.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -37,6 +37,8 @@
import net.dpml.lang.UnknownKeyException;
import net.dpml.lang.Logger;

+import net.dpml.part.Plugin;
+
/**
* A registry of descriptions of plugable content handlers.
*
@@ -192,7 +194,6 @@
if( null == handler )
{
Class clazz = loadContentHandlerClass( model );
- Repository loader = Transit.getInstance().getRepository();
String type = model.getID();
Logger logger = getLogger().getChildLogger( type );
Value[] params = model.getParameters();
@@ -202,7 +203,7 @@
try
{
Object[] args = Construct.getArgs( map, params, new
Object[]{logger, model} );
- handler = (ContentHandler) loader.instantiate( clazz,
args );
+ handler = (ContentHandler) Plugin.instantiate( clazz,
args );
}
catch( Throwable e )
{
@@ -232,8 +233,7 @@
{
m_logger.debug( "loading content handler plugin: " + uri );
Repository loader = Transit.getInstance().getRepository();
- ClassLoader system = ClassLoader.getSystemClassLoader();
- clazz = loader.getPluginClass( system, uri );
+ clazz = loader.getPluginClass( uri );
}
catch( Exception e )
{

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultLayoutRegistry.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -33,6 +33,8 @@
import net.dpml.lang.UnknownKeyException;
import net.dpml.lang.Logger;

+import net.dpml.part.Plugin;
+
/**
* A registry of descriptions of plugable layout models.
*
@@ -123,10 +125,9 @@
protected Layout loadLayout( LayoutModel model ) throws IOException
{
Class clazz = loadLayoutClass( model );
- Repository loader = Transit.getInstance().getRepository();
try
{
- return (Layout) loader.instantiate( clazz, new Object[]{model} );
+ return (Layout) Plugin.instantiate( clazz, new Object[]{model} );
}
catch( Throwable e )
{
@@ -151,8 +152,7 @@
{
m_logger.debug( "loading resolver plugin: " + uri );
Repository loader = Transit.getInstance().getRepository();
- ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
- clazz = loader.getPluginClass( classloader, uri );
+ clazz = loader.getPluginClass( uri );
}
catch( Exception e )
{

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-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/transit/Repository.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -50,47 +50,24 @@
* Get a part classloader relative to a supplied uri.
*
* @param parent the parent classloader
- * @param part the part definition
- * @return the classloader
- * @exception IOException if plugin loading exception occurs
- */
- ClassLoader getPluginClassLoader( ClassLoader parent, Part part )
- throws IOException;
-
- /**
- * 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( ClassLoader parent, URI uri )
+ ClassLoader getPluginClassLoader( URI uri )
throws IOException;

/**
* Get a plugin class relative to a supplied uri.
*
- * @param parent the parent classloader
* @param uri the part uri
* @return the part class
* @exception IOException if plugin loading exception occurs
*/
- Class getPluginClass( ClassLoader parent, URI uri )
+ Class getPluginClass( URI uri )
throws IOException;

/**
- * Get a plugin class relative to a supplied uri.
- *
- * @param parent the parent classloader
- * @param part the part definition
- * @return the class
- * @exception IOException if plugin loading exception occurs
- */
- Class getPluginClass( ClassLoader parent, Part part )
- throws IOException;
-
- /**
* Creates an object from a uri reference.
*
* @param parent the parent classloader
@@ -100,47 +77,6 @@
* @exception IOException if plugin loading exception occurs
* @exception InvocationTargetException if the plugin constructor
invocation error occurs
*/
- Object getPlugin( ClassLoader parent, URI uri, Object[] args )
+ Object getPlugin( URI uri, Object[] args )
throws IOException, InvocationTargetException;
-
- /**
- * Instantiate an instance of a class using the supplied array of
constructor
- * parameter arguments. Arguments will be evaluated in the order
supplied
- * for each of the parameters declared by a single public constructor of
the
- * supplied class. If a parameter cannot be resolved from supplied
arguments
- * and the parameter is a class with a single public constructor and
implementation
- * shall attempt to instantiate an instance of that class via a recursive
- * invocation of this method.
- *
- * @param clazz the class of the object to instantiate
- * @param params a priority ordered array of instances values to be used
in
- * constructor parameter value assignment
- * @return the instanciated object
- * @exception Exception if an instantiation error occurs
- */
- Object instantiate( Class clazz, Object[] params ) throws Exception;
-
- /**
- * Instantiate an instance using the supplied constructor and array of
constructor
- * parameter arguments.
- *
- * @param constructor the class constructor
- * @param params a priority ordered array of instances values to be used
in
- * constructor parameter value assignment
- * @return the instanciated object
- * @exception Exception if an instantiation error occurs
- */
- Object instantiate( Constructor constructor, Object[] params ) throws
Exception;
-
- /**
- * Create a classloader.
- * @param base the parent classloader
- * @param plugin the plugin uri
- * @param classpath the classpath descriptor
- * @return the classloader
- * @exception IOException if a classloader construction error occurs
- */
- public ClassLoader createClassLoader( ClassLoader base, URI plugin,
Classpath classpath )
- throws IOException;
-
}

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/RepositoryException.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/RepositoryException.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/core/src/main/net/dpml/transit/RepositoryException.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -35,11 +35,6 @@
static final long serialVersionUID = 1L;

/**
- * The causal exception.
- */
- private final Throwable m_cause;
-
- /**
* Construct a new <code>RepositoryException</code> instance.
*
* @param message The detail message for this exception.
@@ -58,17 +53,8 @@
public RepositoryException( final String message, final Throwable cause )
{
super( message );
- m_cause = cause;
+ super.initCause( cause );
}
-
- /**
- * Return the causal exception.
- * @return the causal exception
- */
- public Throwable getCause()
- {
- return m_cause;
- }
}



Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/core/src/main/net/dpml/transit/StandardClassLoader.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 2005 Stephen J. McConnell
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit;
-
-import java.util.ArrayList;
-import java.util.Stack;
-import java.net.URL;
-import java.net.URI;
-import java.net.URLClassLoader;
-
-import net.dpml.lang.Category;
-
-/**
- * A named classloader.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class StandardClassLoader extends URLClassLoader
-{
- //--------------------------------------------------------------------
- // state
- //--------------------------------------------------------------------
-
- private final Category m_category;
- private final URI m_plugin;
-
- //--------------------------------------------------------------------
- // constructor
- //--------------------------------------------------------------------
-
- /**
- * Creation of a new classloader.
- * @param plugin uri identifying the plugin
- * @param category the classloader category identifier
- * @param urls an array of urls to add to the classloader
- * @param parent the parent classloader
- */
- public StandardClassLoader( URI plugin, Category category, URL[] urls,
ClassLoader parent )
- {
- super( urls, parent );
- m_category = category;
- m_plugin = plugin;
- }
-
- //--------------------------------------------------------------------
- // StandardClassLoader
- //--------------------------------------------------------------------
-
- /**
- * Return the classloader category
- * @return the classloader category
- */
- public Category getCategory()
- {
- return m_category;
- }
-
- /**
- * Return the plugin uri identifier
- * @return the plugin uri
- */
- public URI getPluginURI()
- {
- return m_plugin;
- }
-
- /**
- * Return a string representation of the classloader.
- * @return the string value
- */
- public String getAnnotations()
- {
- StringBuffer buffer = new StringBuffer();
- ClassLoader parent = getParent();
- if( parent instanceof URLClassLoader )
- {
- URLClassLoader urlClassLoader = (URLClassLoader) parent;
- buffer.append( getURLClassLoaderAnnotations( urlClassLoader ) );
- }
- buffer.append( " " );
- URL[] urls = getURLs();
- for( int i=0; i<urls.length; i++ )
- {
- String path = urls[i].toString();
- if( !path.startsWith( "file:" ) )
- {
- buffer.append( path );
- buffer.append( " " );
- }
- }
- return buffer.toString().trim();
- }
-
- private String getURLClassLoaderAnnotations( URLClassLoader classloader )
- {
- StringBuffer buffer = new StringBuffer();
- ClassLoader parent = classloader.getParent();
- if( ( null != parent ) && ( parent instanceof URLClassLoader ) )
- {
- URLClassLoader urlClassLoader = (URLClassLoader) parent;
- buffer.append( getURLClassLoaderAnnotations( urlClassLoader ) );
- }
- if( ClassLoader.getSystemClassLoader() == classloader )
- {
- return "";
- }
- buffer.append( " " );
- URL[] urls = classloader.getURLs();
- for( int i=0; i<urls.length; i++ )
- {
- String path = urls[i].toString();
- if( !path.startsWith( "file:" ) )
- {
- buffer.append( path );
- buffer.append( " " );
- }
- }
- return buffer.toString().trim();
- }
-
- /**
- * Return a string representing of the classloader.
- * @param expanded if true return an expanded representation of the
classloader
- * @return the string representation
- */
- public String toString( boolean expanded )
- {
- StringBuffer buffer = new StringBuffer();
- listClasspath( buffer );
- return buffer.toString();
- }
-
- //--------------------------------------------------------------------
- // Object
- //--------------------------------------------------------------------
-
- /**
- * Return a string representing of the classloader.
- * @return the string representation
- */
- public String toString()
- {
- final String label =
- getClass().getName()
- + "#"
- + System.identityHashCode( this );
- return label;
- }
-
- /**
- * Internal operation to list the classloader classpath.
- * @param buffer the buffer to list to
- */
- protected void listClasspath( StringBuffer buffer )
- {
- listClasspath( buffer, this );
- buffer.append( "\n" );
- }
-
- /**
- * Internal operation to list a classloader classpath.
- * @param buffer the buffer to list to
- * @param classloader the classloader to list
- */
- protected void listClasspath( StringBuffer buffer, ClassLoader
classloader )
- {
- String label =
- "\nClassLoader: "
- + classloader.getClass().getName()
- + " (" + System.identityHashCode( classloader ) + ")";
-
- if( classloader instanceof StandardClassLoader )
- {
- StandardClassLoader cl = (StandardClassLoader) classloader;
- ClassLoader parent = cl.getParent();
- if( null != parent )
- {
- listClasspath( buffer, parent );
- }
-
- if( null != m_plugin )
- {
- label = label.concat( "\nGroup: " + m_plugin + " " +
cl.getCategory() );
- }
- else
- {
- label = label.concat( "\nCategory: " + cl.getCategory() );
- }
- buffer.append( label );
- buffer.append( "\n" );
- appendEntries( buffer, cl );
- }
- else if( classloader instanceof URLClassLoader )
- {
- URLClassLoader cl = (URLClassLoader) classloader;
- ClassLoader parent = cl.getParent();
- if( null != parent )
- {
- listClasspath( buffer, parent );
- }
- buffer.append( label );
- appendEntries( buffer, cl );
- }
- else
- {
- buffer.append( label );
- buffer.append( "]\n" );
- }
- }
-
- private static void appendEntries( StringBuffer buffer, URLClassLoader
classloader )
- {
- URL[] urls = classloader.getURLs();
- for( int i=0; i < urls.length; i++ )
- {
- buffer.append( "\n " );
- URL url = urls[i];
- String spec = url.toString();
- buffer.append( spec );
- }
- buffer.append( "\n" );
- }
-
- public static String toString( ClassLoader primary, ClassLoader
secondary )
- {
- StringBuffer buffer = new StringBuffer();
- ClassLoader anchor = getCommonParent( primary, secondary );
- if( null != anchor )
- {
- buffer.append(
"\n----------------------------------------------------------------" );
- buffer.append( "\nCommon Classloader" );
- buffer.append(
"\n----------------------------------------------------------------" );
- list( buffer, anchor );
- }
- buffer.append(
"\n----------------------------------------------------------------" );
- buffer.append( "\nPrimary Classloader" );
- buffer.append(
"\n----------------------------------------------------------------" );
- list( buffer, primary, anchor );
- buffer.append(
"\n----------------------------------------------------------------" );
- buffer.append( "\nSecondary Classloader" );
- buffer.append(
"\n----------------------------------------------------------------" );
- list( buffer, secondary, anchor );
- buffer.append(
"\n----------------------------------------------------------------" );
- return buffer.toString();
- }
-
- private static ClassLoader getCommonParent( ClassLoader primary,
ClassLoader secondary )
- {
- ClassLoader[] primaryChain = getClassLoaderChain( primary );
- ClassLoader[] secondaryChain = getClassLoaderChain( secondary );
- return getCommonClassLoader( primaryChain, secondaryChain );
- }
-
- private static ClassLoader[] getClassLoaderChain( ClassLoader
classloader )
- {
- ArrayList list = new ArrayList();
- list.add( classloader );
- ClassLoader parent = classloader.getParent();
- while( null != parent )
- {
- list.add( parent );
- parent = parent.getParent();
- }
- ArrayList result = new ArrayList();
- int n = list.size() - 1;
- for( int i=n; i>-1; i-- )
- {
- result.add( list.get( i ) );
- }
-
- return (ClassLoader[]) result.toArray( new ClassLoader[0] );
- }
-
- private static ClassLoader getCommonClassLoader( ClassLoader[] primary,
ClassLoader[] secondary )
- {
- ClassLoader anchor = null;
- for( int i=0; i<primary.length; i++ )
- {
- ClassLoader classloader = primary[i];
- if( secondary.length > i )
- {
- ClassLoader cl = secondary[i];
- if( classloader == cl )
- {
- anchor = cl;
- }
- else
- {
- return anchor;
- }
- }
- else
- {
- return anchor;
- }
- }
- return anchor;
- }
-
- private static void list( StringBuffer buffer, ClassLoader classloader )
- {
- list( buffer, classloader, null );
- }
-
- private static void list( StringBuffer buffer, ClassLoader classloader,
ClassLoader anchor )
- {
- if( classloader == anchor )
- {
- return;
- }
- ClassLoader parent = classloader.getParent();
- if( null != parent )
- {
- list( buffer, parent, anchor );
- }
- String label =
- "\nClassLoader: "
- + classloader.getClass().getName()
- + " (" + System.identityHashCode( classloader ) + ")";
- buffer.append( label );
- if( classloader instanceof StandardClassLoader )
- {
- StandardClassLoader loader = (StandardClassLoader) classloader;
- buffer.append( " " + loader.m_category );
- }
- if( classloader instanceof URLClassLoader )
- {
- URLClassLoader urlcl = (URLClassLoader) classloader;
- buffer.append( "\n" );
- appendEntries( buffer, urlcl );
- }
- }
-}

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/StandardLoader.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/StandardLoader.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/transit/StandardLoader.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -37,12 +37,6 @@
import net.dpml.lang.Logger;

import net.dpml.part.Part;
-import net.dpml.part.PartDirective;
-import net.dpml.part.PartHandler;
-import net.dpml.part.PartHandlerFactory;
-import net.dpml.part.PartDecoder;
-import net.dpml.part.DecoderFactory;
-import net.dpml.part.Strategy;
import net.dpml.part.Plugin;

/**
@@ -55,11 +49,7 @@
class StandardLoader implements Repository
{
private final Logger m_logger;
- private final DecoderFactory m_factory = new DecoderFactory();
- private final PartDecoder m_decoder = new PartDecoder( m_factory );

- private static final PartHandlerFactory FACTORY =
PartHandlerFactory.getInstance();
-
/**
* Creation of a new repository handler.
* @param logger the assigned logging channel
@@ -84,7 +74,7 @@
{
try
{
- return m_decoder.loadPart( uri );
+ return Part.load( uri );
}
catch( Exception e )
{
@@ -98,53 +88,20 @@
/**
* Get a plugin classloader relative to a supplied uri.
*
- * @param parent the parent classloader
* @param uri the plugin uri
* @return the plugin classloader.
* @exception IOException if plugin loading exception occurs.
* @exception NullArgumentException if the supplied uri or parent
classloader
* is null.
*/
- public ClassLoader getPluginClassLoader( ClassLoader parent, URI uri )
+ public ClassLoader getPluginClassLoader( URI uri )
throws IOException, NullArgumentException
{
Part part = getPart( uri );
- return getPluginClassLoader( parent, part );
+ return part.getClassLoader();
}

/**
- * Get a plugin classloader relative to a supplied uri.
- *
- * @param parent the parent classloader
- * @param uri the plugin uri
- * @return the plugin classloader.
- * @exception IOException if plugin loading exception occurs.
- * @exception NullArgumentException if the supplied uri or parent
classloader
- * is null.
- */
- public ClassLoader getPluginClassLoader( ClassLoader parent, Part part )
- throws IOException, NullArgumentException
- {
- try
- {
- Classpath classpath = part.getClasspath();
- Strategy strategy = part.getStrategy();
- PartDirective directive = strategy.getPartDirective();
- PartHandler handler =
- PartHandlerFactory.getInstance().getPartHandler( directive );
- return handler.getClassLoader( parent, classpath );
- }
- catch( Exception e )
- {
- final String error =
- "Unexpected error during part classloader resolve."
- + "\nPart: " + part;
- throw new RepositoryException( error, e );
- }
- }
-
-
- /**
* Get a plugin class relative to a supplied artifact. The artifact uri
* must refer to a plugin descriptor (i.e. the artifact type is "plugin").
* The class returned will be the class named in the plugin descriptor.
@@ -153,73 +110,33 @@
* @param uri the plugin artifact
* @return the plugin class
* @exception IOException if a class resolution error occurs
- * @exception NullArgumentException if the supplied parent classloader or
uri is null
*/
- public Class getPluginClass( ClassLoader parent, URI uri )
- throws IOException, NullArgumentException
+ public Class getPluginClass( URI uri )
+ throws IOException
{
- try
+ Part part = Part.load( uri );
+ if( part instanceof Plugin )
{
- Part part = m_decoder.loadPart( parent, uri );
- return getPluginClass( parent, part );
- }
- catch( Exception e )
- {
- final String error =
- "Unexpected error during part class resolve."
- + "\nURI: " + uri;
- throw new RepositoryException( error, e );
- }
- }
-
- /**
- * Get a plugin class relative to a supplied artifact. The artifact uri
- * must refer to a plugin descriptor (i.e. the artifact type is "plugin").
- * The class returned will be the class named in the plugin descriptor.
- *
- * @param parent the parent classloader
- * @param uri the plugin artifact
- * @return the plugin class
- * @exception IOException if a class resolution error occurs
- * @exception NullArgumentException if the supplied parent classloader or
uri is null
- */
- public Class getPluginClass( ClassLoader parent, Part part )
- throws IOException, NullArgumentException
- {
- try
- {
- Classpath classpath = part.getClasspath();
- Strategy strategy = part.getStrategy();
- PartDirective directive = strategy.getPartDirective();
- PartHandler handler =
- PartHandlerFactory.getInstance().getPartHandler( directive );
- ClassLoader classloader = handler.getClassLoader( parent,
classpath );
- Object data = strategy.getDeploymentData();
- if( data instanceof Plugin )
+ try
{
- Plugin plugin = (Plugin) data;
- String classname = plugin.getClassname();
- return classloader.loadClass( classname );
+ Plugin plugin = (Plugin) part;
+ return plugin.getPluginClass();
}
- else
+ catch( Exception e )
{
- throw new UnsupportedOperationException( "getPartClass/" +
data.getClass().getName() );
+ final String error =
+ "Internal error while attempting to load plugin class.";
+ throw new RepositoryException( error, e );
}
}
- catch( ClassNotFoundException e )
+ else
{
final String error =
- "Class: " + e.getMessage()
- + "\nPart: " + part;
- throw new PluginClassNotFoundException( error );
+ "Part uri is not a plugin."
+ + "\nPart: " + part.getClass().getName()
+ + "\nURI: " + uri;
+ throw new RepositoryException( error );
}
- catch( Exception e )
- {
- final String error =
- "Unexpected error during part class resolve."
- + "\nPart: " + part;
- throw new RepositoryException( error, e );
- }
}

/**
@@ -231,538 +148,32 @@
* implementation will resolve constructor parameters relative to the
* supplied argument array and return an instance of the class.
*
- * @param parent the parent classloader
* @param uri the reference to the application
* @param args commandline arguments
* @return the plugin instance
* @exception IOException if a plugin creation error occurs
* @exception InvocationTargetException if the plugin constructor
invocation error occurs
- * @exception NullArgumentException if the supplied parent classloader,
- * uri or args are null
*/
- public Object getPlugin( ClassLoader parent, URI uri, Object[] args )
- throws IOException, InvocationTargetException, NullArgumentException
+ public Object getPlugin( URI uri, Object[] args )
+ throws IOException, InvocationTargetException
{
+ Part part = Part.load( uri );
try
{
- net.dpml.part.Part part = m_decoder.loadPart( parent, uri );
- Classpath classpath = part.getClasspath();
- net.dpml.part.Strategy strategy = part.getStrategy();
- net.dpml.part.PartDirective directive =
strategy.getPartDirective();
- net.dpml.part.PartHandler handler =
PartHandlerFactory.getInstance().getPartHandler( directive );
- Object data = strategy.getDeploymentData();
- return handler.getInstance( parent, classpath, data, args );
+ return part.instantiate( args );
}
- catch( RepositoryException re )
+ catch( Exception e )
{
- throw re;
+ final String error =
+ "Internal error while attempting to load plugin instance.";
+ throw new RepositoryException( error, e );
}
- catch( InvocationTargetException e )
- {
- throw e;
- }
- catch( Exception ce )
- {
- String error = "Unable to create a plugin using [" + uri + "].";
- getLogger().error( error, ce );
- throw new RepositoryException( error, ce );
- }
}

//---------------------------------------------------------------------
// implementation
//---------------------------------------------------------------------

- private URL getURL( URI uri ) throws IOException
- {
- return Artifact.toURL( uri );
- }
-
- /**
- * Create a factory using a supplied class and command line arguments.
- *
- * @param clazz the the factory class
- * @param args the command line args
- * @return the plugin instance
- * @exception IOException if a plugin creation error occurs
- * @exception InvocationTargetException if a plugin constructor
invocation error occurs
- * @exception NullArgumentException if the class or args argument is null
- */
- public Object instantiate( Class clazz, Object[] args ) throws
RepositoryException, InvocationTargetException
- {
- if( null == clazz )
- {
- throw new NullArgumentException( "clazz" );
- }
- if( null == args )
- {
- throw new NullArgumentException( "args" );
- }
- for( int i=0; i < args.length; i++ )
- {
- Object p = args[i];
- if( null == p )
- {
- final String error =
- "User supplied instantiation argument at position ["
- + i
- + "] for the class ["
- + clazz.getName()
- + "] is a null value.";
- throw new NullArgumentException( error );
- }
- }
-
- if( clazz.getConstructors().length == 1 )
- {
- Constructor constructor = getSingleConstructor( clazz );
- return instantiate( constructor, args );
- }
- else
- {
- try
- {
- Expression expression = new Expression( clazz, "new", args );
- return expression.getValue();
- }
- catch( InvocationTargetException e )
- {
- throw e;
- }
- catch( RepositoryException e )
- {
- throw e;
- }
- catch( Throwable e )
- {
- final String error =
- "Class instantiation error [" + clazz.getName() + "]";
- throw new RepositoryException( error, e );
- }
- }
- }
-
- public Object instantiate( Constructor constructor, Object[] args )
- throws RepositoryException, InvocationTargetException
- {
- Object[] arguments = populate( constructor, args );
- return newInstance( constructor, arguments );
- }
-
- protected Object[] populate( Constructor constructor, Object[] args )
throws RepositoryException
- {
- if( null == constructor )
- {
- throw new NullArgumentException( "constructor" );
- }
- if( null == args )
- {
- throw new NullArgumentException( "args" );
- }
-
- Class[] classes = constructor.getParameterTypes();
- Object[] arguments = new Object[ classes.length ];
- ArrayList list = new ArrayList();
- for( int i=0; i < args.length; i++ )
- {
- list.add( args[i] );
- }
-
- //
- // sweep though the construct arguments one by one and
- // see if we can assign a value based on the supplied args
- //
-
- for( int i=0; i < classes.length; i++ )
- {
- Class clazz = classes[i];
- Iterator iterator = list.iterator();
- while( iterator.hasNext() )
- {
- Object object = iterator.next();
- Class c = object.getClass();
- if( isAssignableFrom( clazz, c ) )
- {
- arguments[i] = object;
- list.remove( object );
- break;
- }
- }
- }
-
- //
- // if any arguments are unresolved then check if the argument type
- // is something we can implicity establish
- //
-
- for( int i=0; i < arguments.length; i++ )
- {
- if( null == arguments[i] )
- {
- Class c = classes[i];
- if( c.isArray() )
- {
- arguments[i] = getEmptyArrayInstance( c );
- }
- else
- {
- final String error =
- "Unable to resolve a value for a constructor
parameter."
- + "\nConstructor class: " +
constructor.getDeclaringClass().getName()
- + "\nParameter class: " + c.getName()
- + "\nParameter position: " + ( i + 1 );
- throw new RepositoryException( error );
- }
- }
- }
- return arguments;
- }
-
- private boolean isAssignableFrom( Class clazz, Class c )
- {
- if( clazz.isPrimitive() )
- {
- if( Integer.TYPE == clazz )
- {
- return Integer.class.isAssignableFrom( c );
- }
- else if( Boolean.TYPE == clazz )
- {
- return Boolean.class.isAssignableFrom( c );
- }
- else if( Byte.TYPE == clazz )
- {
- return Byte.class.isAssignableFrom( c );
- }
- else if( Short.TYPE == clazz )
- {
- return Short.class.isAssignableFrom( c );
- }
- else if( Long.TYPE == clazz )
- {
- return Long.class.isAssignableFrom( c );
- }
- else if( Float.TYPE == clazz )
- {
- return Float.class.isAssignableFrom( c );
- }
- else if( Double.TYPE == clazz )
- {
- return Double.class.isAssignableFrom( c );
- }
- else
- {
- final String error =
- "Primitive type ["
- + c.getName()
- + "] not supported.";
- throw new RuntimeException( error );
- }
- }
- else
- {
- return clazz.isAssignableFrom( c );
- }
- }
-
- private Object newInstance( Constructor constructor, Object[] arguments )
- throws RepositoryException, InvocationTargetException
- {
- try
- {
- Object instance = constructor.newInstance( arguments );
- getMonitor().pluginInstantiated( instance );
- return instance;
- }
- catch( InvocationTargetException e )
- {
- throw e;
- }
- catch( Throwable e )
- {
- final String error =
- "Cannot create an instance of ["
- + constructor.getDeclaringClass().getName()
- + "] due to an instantiation failure.";
- throw new RepositoryException( error, e );
- }
- }
-
- private Constructor getSingleConstructor( Class clazz ) throws
RepositoryException
- {
- if( null == clazz )
- {
- throw new NullArgumentException( "clazz" );
- }
- Constructor[] constructors = clazz.getConstructors();
- if( constructors.length < 1 )
- {
- final String error =
- "Target class ["
- + clazz.getName()
- + "] does not declare a public constructor.";
- throw new RepositoryException( error );
- }
- else if( constructors.length > 1 )
- {
- final String error =
- "Target class ["
- + clazz.getName()
- + "] declares multiple public constructors.";
- throw new RepositoryException( error );
- }
- else
- {
- return constructors[0];
- }
- }
-
- /**
- * Constructs an empty array instance.
- * @param clazz the array class
- * @return the empty array instance
- * @exception RepositoryException if an error occurs
- */
- private Object[] getEmptyArrayInstance( Class clazz ) throws
RepositoryException
- {
- try
- {
- return (Object[]) Array.newInstance( clazz.getComponentType(), 0
);
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to construct an empty array
for the class: "
- + clazz.getName();
- throw new RepositoryException( error, e );
- }
- }
-
- /**
- * Returns a classloader.
- * @param base the parent classloader
- * @param plugin the plugin uri
- * @param classpath the classpath descriptor
- * @return the classloader
- * @exception IOException if a classloader construction error occurs
- * @exception NullArgumentException if either the base or the descriptor
- * argument is null.
- */
- public ClassLoader createClassLoader( ClassLoader base, URI plugin,
Classpath classpath )
- throws IOException, NullArgumentException
- {
- if( null == classpath )
- {
- throw new NullArgumentException( "classpath" );
- }
- if( null == base )
- {
- throw new NullArgumentException( "base" );
- }
-
- URI[] systemArtifacts = classpath.getDependencies( Category.SYSTEM );
- URL[] sysUrls = getURLs( systemArtifacts );
- if( sysUrls.length > 0 )
- {
- updateSystemClassLoader( plugin, sysUrls );
- }
-
- URI[] apiArtifacts = classpath.getDependencies( Category.PUBLIC );
- URL[] apis = getURLs( apiArtifacts );
- ClassLoader api = buildClassLoader( plugin, Category.PUBLIC, base,
apis );
-
- URI[] spiArtifacts = classpath.getDependencies( Category.PROTECTED );
- URL[] spis = getURLs( spiArtifacts );
- ClassLoader spi = buildClassLoader( plugin, Category.PROTECTED, api,
spis );
-
- URI[] impArtifacts = classpath.getDependencies( Category.PRIVATE );
- URL[] imps = getURLs( impArtifacts );
- ClassLoader classloader = buildClassLoader( plugin,
Category.PRIVATE, spi, imps );
-
- return classloader;
- }
-
- private void updateSystemClassLoader( URI plugin, URL[] urls ) throws
TransitException
- {
- ClassLoader parent = ClassLoader.getSystemClassLoader();
- synchronized( parent )
- {
- if( parent instanceof SystemClassLoader )
- {
- SystemClassLoader loader = (SystemClassLoader) parent;
- loader.addDelegates( urls );
- getMonitor().systemExpanded( plugin, urls );
- }
- else
- {
- final String message =
- "Cannot load ["
- + urls.length
- + "] system artifacts from ["
- + plugin
- + "] into a foreign system classloader.";
- getLogger().debug( message );
- }
- }
- }
-
- /**
- * Convert a sequncence of URIs to URLs.
- * @param uris the uris to convert
- * @return the corresponding urls
- * @exception IOException of a transformation error occurs
- */
- private URL[] getURLs( URI[] uris ) throws IOException
- {
- URL[] urls = new URL[ uris.length ];
- for( int i=0; i < urls.length; i++ )
- {
- URI uri = uris[i];
- if( Artifact.isRecognized( uri ) )
- {
- urls[i] = Artifact.toURL( uri );
- }
- else
- {
- urls[i] = uri.toURL();
- }
- }
- return urls;
- }
-
- /**
- * 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 parent the parent classloader
- * @param urls the urls to assign as classloader content
- * @return the classloader
- */
- private ClassLoader buildClassLoader( URI plugin, Category category,
ClassLoader parent, URL[] urls )
- {
- if( 0 == urls.length )
- {
- return parent;
- }
- ArrayList list = new ArrayList();
- for( int i=0; i < urls.length; i++ )
- {
- if( isaCandidate( parent, urls[i] ) )
- {
- list.add( urls[i] );
- }
- }
- URL[] qualified = (URL[]) list.toArray( new URL[0] );
- if( qualified.length == 0 )
- {
- return parent;
- }
- else
- {
- ClassLoader loader = new StandardClassLoader( plugin, category,
qualified, parent );
- getMonitor().classloaderConstructed( category.toString(), loader
);
- return loader;
- }
- }
-
- /**
- * Test if the supplied url is already present within the supplied
classloader.
- * @param classloader the classloader to validate against
- * @param url to url to check for
- * @return true if the url is not included in the classloader
- */
- private boolean isaCandidate( ClassLoader classloader, URL url )
- {
- if( classloader instanceof URLClassLoader )
- {
- URL[] urls = ( (URLClassLoader) classloader ).getURLs();
- for( int i=0; i < urls.length; i++ )
- {
- if( urls[i].equals( url ) )
- {
- return false;
- }
- }
- ClassLoader parent = classloader.getParent();
- if( parent == null )
- {
- return true;
- }
- else
- {
- return isaCandidate( parent, url );
- }
- }
- else
- {
- return true;
- }
- }
-
- /**
- * Load a factory class using a supplied classloader and factory
classname.
- * @param classloader the classloader to load the class from
- * @param classname the plugin classname
- * @return the factory class
- * @exception RepositoryException if a factory class loading error occurs
- * @exception NullArgumentException if the supplied classloader or
classname is null
- * @exception ClassNotFoundException if the plugin class is not found in
the supplied classloader
- */
- /*
- protected Class loadPluginClass( ClassLoader classloader, String
classname )
- throws RepositoryException, NullArgumentException,
ClassNotFoundException
- {
- if( null == classloader )
- {
- throw new NullArgumentException( "classloader" );
- }
- if( null == classname )
- {
- throw new NullArgumentException( "classname" );
- }
-
- try
- {
- return classloader.loadClass( classname );
- }
- catch( ClassNotFoundException e )
- {
- throw e;
- }
- catch( Throwable e )
- {
- final String error =
- "Unexpected error while attempting to load factory class: ["
- + classname
- + "].";
- throw new RepositoryException( error, e );
- }
- }
- */
-
- /**
- * Convert a uri to an artifact.
- * @param uri the uri to convert
- * @return the artifact
- * @exception RepositoryException if the convertion cannot be performed
- */
- private Artifact getArtifact( URI uri ) throws RepositoryException
- {
- try
- {
- return Artifact.createArtifact( uri );
- }
- catch( Throwable e )
- {
- final String error =
- "Unable to convert the uri ["
- + uri
- + "] to an artifact.";
- throw new RepositoryException( error, e );
- }
- }
-
private RepositoryMonitorRouter getMonitor()
{
return Transit.getInstance().getRepositoryMonitorRouter();

Deleted:
trunk/main/transit/core/src/main/net/dpml/transit/SystemClassLoader.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/SystemClassLoader.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/transit/SystemClassLoader.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -1,110 +0,0 @@
-/*
- * Copyright 2005 Stephen J. McConnell.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.transit;
-
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-import java.util.Arrays;
-
-import net.dpml.lang.Category;
-
-/**
- * The SystemClassLoader is a URLClassLoader that supports late binding of
- * URLs. This class may be configured as the system classloader when
loading plugins
- * that declare system category plugin entries.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class SystemClassLoader extends StandardClassLoader
-{
- private final ClassLoader m_parent;
-
- /**
- * Creation of a new Depot classloader.
- *
- * @param parent the parent classloader
- */
- public SystemClassLoader( ClassLoader parent )
- {
- super( SYSTEM_URI, Category.SYSTEM, new URL[0], parent );
- m_parent = parent;
-
- if( "true".equals( System.getProperty( "dpml.transit.include.tools"
) ) )
- {
- String jrePath = System.getProperty( "java.home" );
- try
- {
- File jre = new File( jrePath );
- File jdk = jre.getParentFile();
- File lib = new File( jdk, "lib" );
- File jar = new File( lib, "tools.jar" );
- URL url = jar.toURL();
- addURL( url );
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to establish tools.jar in
the system classloader.";
- throw new TransitError( error, e );
- }
- }
- }
-
- synchronized void addDelegates( final URL[] urls )
- {
- URL[] local = super.getURLs();
- List list = Arrays.asList( local );
- for( int i=0; i<urls.length; i++ )
- {
- URL url = urls[i];
- if( !list.contains( url ) )
- {
- try
- {
- url.getContent();
- addURL( url );
- }
- catch( Exception e )
- {
- final String error =
- "Failed to resolve url " + url;
- System.err.println( error );
- }
- }
- }
- }
-
- private static final URI createSystemLabel()
- {
- try
- {
- return new URI( "transit:system" );
- }
- catch( Exception e )
- {
- return null;
- }
- }
-
- private static final URI SYSTEM_URI = createSystemLabel();
-}
-

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/main/net/dpml/transit/TransitBuilder.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -38,7 +38,7 @@
import net.dpml.transit.info.LayoutDirective;

import net.dpml.lang.ValueDirective;
-import net.dpml.lang.DecodingException;
+import net.dpml.part.DecodingException;
import net.dpml.lang.Logger;

import org.xml.sax.ErrorHandler;

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -205,13 +205,12 @@
if( "part".equals( type ) )
{
Repository loader = Transit.getInstance().getRepository();
- ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
URI uri = m_artifact.toURI();
if( classes.length == 0 )
{
try
{
- return loader.getPlugin( classloader, uri, new Object[0]
);
+ return loader.getPlugin( uri, new Object[0] );
}
catch( InvocationTargetException e )
{
@@ -230,16 +229,13 @@
Class c = classes[i];
if( ClassLoader.class.equals( c ) )
{
- return loader.getPluginClassLoader( classloader, uri
);
+ Part part = loader.getPart( uri );
+ return part.getClassLoader();
}
else if( Class.class.equals( c ) )
{
- return loader.getPluginClass( classloader, uri );
+ return loader.getPluginClass( uri );
}
- //else if( Plugin.class.equals( c ) )
- //{
- // return loader.getPluginDescriptor( uri );
- //}
else if( Part.class.equals( c ) )
{
return loader.getPart( uri );

Modified: trunk/main/transit/core/src/test/net/dpml/part/PartTestCase.java
===================================================================
--- trunk/main/transit/core/src/test/net/dpml/part/PartTestCase.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/core/src/test/net/dpml/part/PartTestCase.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -23,6 +23,8 @@

import junit.framework.TestCase;

+import net.dpml.transit.monitor.LoggingAdapter;
+
/**
* Plugin test case.
*
@@ -35,24 +37,11 @@
{
System.setProperty( "java.protocol.handler.pkgs", "net.dpml.transit"
);
}
-
- private PartDecoder m_decoder;
- private PartEncoder m_encoder;
-
+
/**
* Test the demo class.
* @exception Exception if a error occurs during test execution
*/
- public void setUp() throws Exception
- {
- m_decoder = new PartDecoder( new DecoderFactory() );
- m_encoder = new PartEncoder();
- }
-
- /**
- * Test the demo class.
- * @exception Exception if a error occurs during test execution
- */
public void testPlugin() throws Exception
{
evaluateDocument( "plugin.xml" );
@@ -74,11 +63,11 @@
File file = new File( test, path );
System.out.println( "source: " + file + " (" + file.exists() + ")" );

- Part part = m_decoder.loadPart( file.toURI() );
+ Part part = Part.load( file.toURI() );
File out = new File( test, "export-" + path );
FileOutputStream output = new FileOutputStream( out );
- m_encoder.encodePart( part, output, "" );
- Part newPart = m_decoder.loadPart( out.toURI() );
+ part.encode( output );
+ Part newPart = Part.load( out.toURI() );
assertEquals( "part", part, newPart );
}
}

Modified:
trunk/main/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
===================================================================
--- trunk/main/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/tools/src/main/net/dpml/transit/tools/MainTask.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -76,17 +76,6 @@
super();
}

- /**
- * Creation of a new Main task.
- * @param model the assigned transit model
- * @param logger the assigned logging channel
- * @exception Exception if an error occurs
- */
- //public MainTask( TransitModel model, Logger logger ) throws Exception
- //{
- // super( model, logger );
- //}
-
//
------------------------------------------------------------------------
// Task
//
------------------------------------------------------------------------

Modified:
trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
===================================================================
--- trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
2006-04-01 11:11:58 UTC (rev 1303)
+++ trunk/main/transit/tools/src/main/net/dpml/transit/tools/PluginTask.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -18,9 +18,12 @@

package net.dpml.transit.tools;

+import java.io.IOException;
import java.io.InputStream;

import java.net.URI;
+import java.util.Map;
+import java.util.Hashtable;

import java.util.List;
import java.util.ArrayList;
@@ -49,6 +52,8 @@
public class PluginTask extends TransitTask
{
private static Repository m_REPOSITORY;
+
+ private Map m_map = new Hashtable();

/**
* The uri of the plugin to load.
@@ -184,7 +189,6 @@
}

final Project project = getProject();
- ClassLoader classloader =
Thread.currentThread().getContextClassLoader();
final ComponentHelper helper =
ComponentHelper.getComponentHelper( project );

@@ -196,9 +200,9 @@
try
{
URI uri = new URI( m_uri );
- ClassLoader loader =
- getRepository().getPluginClassLoader( classloader, uri );
-
+ Part part = getPart( uri );
+
+ ClassLoader loader = part.getClassLoader();
Task[] tasks = (Task[]) m_tasks.toArray( new Task[0] );
if( tasks.length > 0 )
{
@@ -271,6 +275,22 @@
throw new BuildException( error, e, getLocation() );
}
}
+
+ private Part getPart( URI uri ) throws IOException
+ {
+ return (Part) getRepository().getPart( uri );
+ //Part part = (Part) m_map.get( uri );
+ //if( null != part )
+ //{
+ // return part;
+ //}
+ //else
+ //{
+ // part = (Part) getRepository().getPart( uri );
+ // m_map.put( uri, part );
+ // return part;
+ //}
+ }

/**
* Load an antlib.
@@ -283,15 +303,14 @@
URI uri, ClassLoader classloader, ComponentHelper helper, Antlib
antlib ) throws Exception
{
//Plugin plugin = getRepository().getPluginDescriptor( uri );
- Part part = getRepository().getPart( uri );
- Object data = part.getStrategy().getDeploymentData();
+ Part part = getPart( uri );

String resource = antlib.getPath();
if( null == resource )
{
- if( data instanceof Resource )
+ if( part instanceof Resource )
{
- Resource res = (Resource) data;
+ Resource res = (Resource) part;
resource = res.getPath();
}
//resource = plugin.getStrategy().getProperties().getProperty(
"project.plugin.resource" );
@@ -306,7 +325,7 @@
throw new BuildException( error, getLocation() );
}

- String urn = getAntLibURN( antlib, data );
+ String urn = getAntLibURN( antlib, part );
if( null == urn )
{
final String error =
@@ -338,8 +357,7 @@
}
}

- //private String getAntLibURN( Antlib antlib, Plugin plugin )
- private String getAntLibURN( Antlib antlib, Object data )
+ private String getAntLibURN( Antlib antlib, Part part )
{
if( null != m_urn )
{
@@ -352,16 +370,15 @@
}
else
{
- if( data instanceof Resource )
+ if( part instanceof Resource )
{
- Resource res = (Resource) data;
+ Resource res = (Resource) part;
return res.getURN();
}
else
{
return null;
}
- //return plugin.getStrategy().getProperties().getProperty(
"project.plugin.urn" );
}
}


Modified:
trunk/main/transit/tools/src/main/net/dpml/transit/tools/TransitComponentHelper.java
===================================================================
---
trunk/main/transit/tools/src/main/net/dpml/transit/tools/TransitComponentHelper.java
2006-04-01 11:11:58 UTC (rev 1303)
+++
trunk/main/transit/tools/src/main/net/dpml/transit/tools/TransitComponentHelper.java
2006-04-04 13:26:28 UTC (rev 1304)
@@ -27,7 +27,6 @@
import net.dpml.part.Plugin;
import net.dpml.part.Resource;

-//import net.dpml.lang.Plugin;
import net.dpml.transit.Repository;
import net.dpml.transit.Transit;
import net.dpml.transit.util.ElementHelper;
@@ -81,14 +80,8 @@
public static final String TRANSIT_GET_URN = TRANSIT_ANTLIB_URN + ":get";

/**
- * The constant Transit ANTLIB get task namespace.
- */
- public static final String TRANSIT_PREFS_URN = TRANSIT_ANTLIB_URN +
":prefs";
-
- /**
* The constant artifact plugin header.
*/
- //public static final String PLUGIN_ARTIFACT_HEADER = "artifact:plugin:";
public static final String PLUGIN_ARTIFACT_HEADER = "artifact:part:";

/**
@@ -346,28 +339,28 @@

Repository loader = Transit.getInstance().getRepository();
Part part = loader.getPart( uri );
- Object data = part.getStrategy().getDeploymentData();

ClassLoader current =
Thread.currentThread().getContextClassLoader();

- if( data instanceof Plugin )
+ if( part instanceof Plugin )
{
- Class clazz = loader.getPluginClass( current, part );
+ Plugin plugin = (Plugin) part;
+ Class clazz = plugin.getPluginClass();
final String key = uri + ":" + name;
getProject().log( "installing single task plugin [" + key +
"]", Project.MSG_VERBOSE );
super.addTaskDefinition( key, clazz );
}
- else if( data instanceof Resource )
+ else if( part instanceof Resource )
{
- ClassLoader classloader = loader.getPluginClassLoader(
current, part );
- Resource res = (Resource) data;
+ Resource res = (Resource) part;
String resource = res.getPath();
getProject().log( "installing antlib plugin [" + resource +
"]", Project.MSG_VERBOSE );
+ ClassLoader classloader = part.getClassLoader();
InputStream input = classloader.getResourceAsStream(
resource );
if( null == input )
{
final String error =
- "Cannot load plugin resource ["
+ "Cannot load resource ["
+ resource
+ "] because it does not exist within the cloassloader
defined by the uri ["
+ uri
@@ -422,30 +415,6 @@
}

/**
- * Return the plugin uri by resolving the string form the beggining of
the name
- * to the last occurance of ":". The content following the ":" is used by
ant for
- * the actual task name. We use the string preceeding the name to hold the
- * artifact uri.
- *
- * @param name the fully qualified task name
- * @return the plugin uri
- * @exception BuildException if a convertion error occurs
- */
- private URI getURI( String name ) throws BuildException
- {
- String urn = name.substring( 0, name.lastIndexOf( ":" ) );
- if( name.startsWith( "artifact:plugin:" ) )
- {
- return convertToURI( urn );
- }
- else
- {
- String spec = "artifact:plugin:" + urn.substring( SEVEN );
- return convertToURI( spec );
- }
- }
-
- /**
* Convert a urn to a url wrapping any errors in a build exception.
* @param urn the urn
* @return the uri
@@ -542,7 +511,5 @@
public void messageLogged( BuildEvent event )
{
}
-
- private static final int SEVEN = 7;
}

---

• r1304 - in trunk/main: central/src/docs/depot/library central/src/docs/transit/parts central/src/docs/transit/parts/classpath depot/build/etc/bin depot/build/src/main/net/dpml/library/console depot/core depot/core/etc/bin depot/core/src/main/net/dpml/depot depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/test/net/dpml/library/impl depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/tasks metro metro/component/src/main/net/dpml/component metro/content/src/main/net/dpml/metro/content metro/model/src/main/net/dpml/metro metro/model/src/main/net/dpml/metro/data metro/runtime metro/runtime/etc metro/runtime/etc/test metro/runtime/etc/test/components metro/runtime/etc/test/parts metro/runtime/etc/test/types metro/runtime/src metro/runtime/src/main/net/dpml/metro metro/runtime/src/main/net/dpml/metro/builder metro/runtime/src/main/net/dpml/metro/runtime metro/runtime/src/test met! ro/runtime/src/test/net metro/runtime/src/test/net/dpml metro/runtime/src/test/net/dpml/metro metro/runtime/src/test/net/dpml/metro/builder metro/test/src/test/net/dpml/test/part metro/tools metro/tools/src/main/net/dpml/metro/tools planet/http planet/http/test/src/test/net/dpml/http/test station/builder/src/main/net/dpml/station/builder station/console/etc/bin station/exec/etc/bin station/exec/src/main/net/dpml/station/exec station/server/etc/bin/scm/conf transit/console/etc/bin transit/console/src/main/net/dpml/transit/console transit/core/etc/main/net/dpml transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/part transit/core/src/main/net/dpml/transit transit/core/src/main/net/dpml/transit/artifact transit/core/src/test/net/dpml/part transit/tools/src/main/net/dpml/transit/tools, mcconnell at BerliOS, 04/04/2006

---

Archive powered by MHonArc 2.6.24.