Skip to Content.
Sympa Menu

notify-dpml - r1575 - in trunk/main: . central/src/docs/metro/directives/type metro/model/etc/data/types metro/model/src/main/net/dpml/metro/builder metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/info/test metro/runtime/src/main/net/dpml/metro/runtime metro/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl planet/http/impl/src/main/net/dpml/http planet/http/server transit/core/src/main/net/dpml/transit

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1575 - in trunk/main: . central/src/docs/metro/directives/type metro/model/etc/data/types metro/model/src/main/net/dpml/metro/builder metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/info/test metro/runtime/src/main/net/dpml/metro/runtime metro/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl planet/http/impl/src/main/net/dpml/http planet/http/server transit/core/src/main/net/dpml/transit
  • Date: Sun, 16 Jul 2006 20:36:52 +0200

Author: mcconnell
Date: 2006-07-16 20:36:43 +0200 (Sun, 16 Jul 2006)
New Revision: 1575

Removed:
trunk/main/central/src/docs/metro/directives/type/parts/
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/central/src/docs/metro/directives/type/index.xml
trunk/main/central/src/docs/metro/directives/type/navigation.xml
trunk/main/metro/model/etc/data/types/example-1.xml

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

trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
trunk/main/metro/model/src/main/net/dpml/metro/info/Type.java
trunk/main/metro/model/src/test/net/dpml/metro/info/test/TypeTestCase.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
trunk/main/metro/test/build.xml
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
trunk/main/metro/tools/src/main/net/dpml/metro/tools/TypeBuilderTask.java
trunk/main/planet/http/impl/build.xml
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
trunk/main/planet/http/server/project.xml
trunk/main/transit/core/src/main/net/dpml/transit/Artifact.java
Log:
synchronize code-base with removal of parts abstract in a component type

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/bootstrap 2006-07-16 18:36:43 UTC (rev 1575)
@@ -139,8 +139,8 @@
dpmlModule
dpmlPart
dpmlState
+dpmlType
dpmlComponent
-dpmlType
transitMain
transitTools
dpmlLibrary

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/bootstrap.bat 2006-07-16 18:36:43 UTC (rev 1575)
@@ -21,10 +21,10 @@
IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-state
IF ERRORLEVEL 1 GOTO :exit
+CALL :dpml-type
+IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-component
IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-type
-IF ERRORLEVEL 1 GOTO :exit
CALL :transit-main
IF ERRORLEVEL 1 GOTO :exit
CALL :transit-tools

Modified: trunk/main/central/src/docs/metro/directives/type/index.xml
===================================================================
--- trunk/main/central/src/docs/metro/directives/type/index.xml 2006-07-16
18:28:47 UTC (rev 1574)
+++ trunk/main/central/src/docs/metro/directives/type/index.xml 2006-07-16
18:36:43 UTC (rev 1575)
@@ -20,7 +20,6 @@
supplimentary information about a Java class. This information
includes details about the assumtions that the class makes concerning
context information, it's capabilities with respect to
thread-safety,
- internal parts of the component, and other infromation including
garbage collection policy, lifestyle, and lifecycle.
</p>

@@ -59,15 +58,6 @@
<td><a href="state/index.html"><tt>state</tt></a></td>
<td>Definition of a component lifecycle expressed as a state
transition graph.</td>
</tr>
- <tr>
- <td><a href="parts/index.html"><tt>parts</tt></a></td>
- <td>Definition of the internal parts (nested components)
- within this component type. The <tt>parts</tt> element
allows
- for the structural composition of components as
<i>part-of</i>
- an enclosing component type. Enclosed components can be
viewed
- as a private internal implementation strategy of the type.
- </td>
- </tr>
</table>

</subsection>
@@ -119,32 +109,6 @@
</transition>
</state>
</state>
-
- <parts>
- <component xmlns="link:xsd:dpml/lang/dpml-component#1.0"
- key="requestLog"
- class="net.dpml.http.NCSARequestLog"
- name="requestLog"
- collection="hard"
- activation="demand">
- <context>
- <entry key="filename" class="java.lang.String"
value="${dpml.data}/logs/http/request.log"/>
- <entry key="append" class="boolean" value="true"/>
- <entry key="extended" class="boolean" value="true"/>
- </context>
- </component>
- <component xmlns="link:xsd:dpml/lang/dpml-component#1.0"
- key="threadPool"
- class="net.dpml.http.BoundedThreadPool"
- name="threadPool"
- collection="hard"
- activation="demand">
- <context>
- <entry key="min" class="int" value="10"/>
- <entry key="max" class="int" value="100"/>
- </context>
- </component>
- </parts>

</type>
]]></source>

Modified: trunk/main/central/src/docs/metro/directives/type/navigation.xml
===================================================================
--- trunk/main/central/src/docs/metro/directives/type/navigation.xml
2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/central/src/docs/metro/directives/type/navigation.xml
2006-07-16 18:36:43 UTC (rev 1575)
@@ -30,7 +30,6 @@
<item name="Context" href="context/index.html"/>
<item name="Categories" href="categories/index.html"/>
<item name="State" href="state/index.html"/>
- <item name="Parts" href="parts/index.html"/>
</menu>

</body>

Modified: trunk/main/metro/model/etc/data/types/example-1.xml
===================================================================
--- trunk/main/metro/model/etc/data/types/example-1.xml 2006-07-16 18:28:47
UTC (rev 1574)
+++ trunk/main/metro/model/etc/data/types/example-1.xml 2006-07-16 18:36:43
UTC (rev 1575)
@@ -20,6 +20,4 @@

<state xmlns="@STATE-XSD-URI@"/>

- <parts/>
-
</type>

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-07-16 18:28:47 UTC (rev 1574)
+++
trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -65,8 +65,6 @@

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
@@ -138,8 +136,7 @@
ContextDescriptor context = buildNestedContext( root );
CategoryDescriptor[] categories = buildNestedCategories( root );
State state = buildNestedState( root );
- PartReference[] parts = buildNestedParts( root, resolver );
- return new Type( info, categories, context, services, parts, state );
+ return new Type( info, categories, context, services, state );
}

private InfoDescriptor buildNestedInfoDescriptor( Element root ) throws
DecodingException
@@ -253,9 +250,6 @@

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 )
{
@@ -266,41 +260,7 @@
return STATE_DECODER.buildStateGraph( element );
}
}
-
- private PartReference[] buildNestedParts( Element root, Resolver
resolver ) 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, resolver );
- }
- return refs;
- }
- }
- }
-
- private PartReference buildPartReference( Element element, Resolver
resolver ) throws Exception
- {
- String key = ElementHelper.getAttribute( element, "key" );
- ComponentDirective definition = COMPONENT_DECODER.buildComponent(
element, resolver );
- return new PartReference( key, definition );
- }
-
+
private Properties buildNestedProperties( Element element )
{
Element[] entries = ElementHelper.getChildren( element, "property" );

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
2006-07-16 18:28:47 UTC (rev 1574)
+++
trunk/main/metro/model/src/main/net/dpml/metro/builder/ComponentTypeEncoder.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -49,13 +49,9 @@
"<?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
@@ -66,8 +62,6 @@
+ PART_SCHEMA_URN
+ "\"\n xmlns:type=\""
+ TYPE_SCHEMA_URN
- + "\"\n xmlns:component=\""
- + COMPONENT_SCHEMA_URN
+ "\">";

private static final String FOOTER = "</type>";
@@ -100,7 +94,6 @@
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
@@ -221,11 +214,6 @@
writer.write( "\n" );
}

- private void writeTypeParts( Writer writer, PartReference[] parts,
String pad ) throws IOException
- {
- COMPONENT_ENCODER.writeParts( writer, parts, pad, true );
- }
-
private void writeAttributes( Writer writer, Descriptor descriptor,
String pad ) throws IOException
{
String[] names = descriptor.getAttributeNames();

Modified: trunk/main/metro/model/src/main/net/dpml/metro/info/Type.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/info/Type.java
2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/Type.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -25,6 +25,8 @@
import java.net.URI;
import java.net.URL;

+import net.dpml.lang.AbstractDirective;
+
import net.dpml.state.State;
import net.dpml.state.StateDecoder;
import net.dpml.state.StateBuilderRuntimeException;
@@ -47,7 +49,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class Type extends Composite implements Serializable
+public class Type extends AbstractDirective implements Serializable
{
static final long serialVersionUID = 1L;

@@ -70,17 +72,15 @@
* and context entry key and value classnames
* @param services a set of service descriptors that detail the service
that
* this component type is capable of supplying
- * @param parts an array of part descriptors
* @param graph the state graph
* @exception NullPointerException if the info, loggers, state, or
context is null
*/
public Type(
final InfoDescriptor info, final CategoryDescriptor[] loggers,
- final ContextDescriptor context, final ServiceDescriptor[] services,
- final PartReference[] parts, State graph )
+ final ContextDescriptor context, final ServiceDescriptor[] services,
final State graph )
throws NullPointerException
{
- super( parts );
+ //super( parts );

if( null == info )
{
@@ -315,9 +315,8 @@
new ServiceDescriptor[]{
new ServiceDescriptor( subject.getName() )
};
- final PartReference[] parts = new PartReference[0];
State state = loadStateFromResource( subject );
- return new Type( info, loggers, context, services, parts, state );
+ return new Type( info, loggers, context, services, state );
}

private static ContextDescriptor createContextDescriptor( Class subject
)

Modified:
trunk/main/metro/model/src/test/net/dpml/metro/info/test/TypeTestCase.java
===================================================================
---
trunk/main/metro/model/src/test/net/dpml/metro/info/test/TypeTestCase.java
2006-07-16 18:28:47 UTC (rev 1574)
+++
trunk/main/metro/model/src/test/net/dpml/metro/info/test/TypeTestCase.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -52,7 +52,6 @@
private CategoryDescriptor[] m_loggers;
private ContextDescriptor m_context;
private ServiceDescriptor[] m_services;
- private PartReference[] m_parts;
private ServiceDescriptor m_reference;
private String m_key;
private State m_graph;
@@ -71,7 +70,6 @@
};
m_context = new ContextDescriptor( new EntryDescriptor[0] );
m_services = new ServiceDescriptor[]{m_reference};
- m_parts = new PartReference[0];
m_graph = State.NULL_STATE;
}

@@ -82,7 +80,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
checkArray( m_loggers, type.getCategoryDescriptors() );
assertTrue( type.isaCategory( m_loggers[0].getName() ) );
assertTrue( !type.isaCategory( "fake name" ) );
@@ -95,7 +93,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
assertEquals( m_context, type.getContextDescriptor() );
}

@@ -106,7 +104,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
assertEquals( m_info, type.getInfo() );
}

@@ -117,7 +115,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
assertEquals( m_graph, type.getStateGraph() );
}

@@ -131,7 +129,7 @@
services[1] = new ServiceDescriptor( "Gizmo" );
Type type =
new Type(
- m_info, m_loggers, m_context, services, m_parts, m_graph );
+ m_info, m_loggers, m_context, services, m_graph );
checkArray( services, type.getServiceDescriptors() );
}

@@ -145,7 +143,6 @@
assertEquals( m_services[0], type.getServiceDescriptor( m_reference
) );
assertEquals( m_services[0], type.getServiceDescriptor(
m_services[0].getClassname() ) );
checkArray( m_services, type.getServiceDescriptors() );
- checkArray( m_parts, type.getPartReferences() );
assertTrue( type.isaCategory( m_loggers[0].getName() ) );
assertTrue( !type.isaCategory( "fake name" ) );
}
@@ -166,7 +163,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
checkType( type );
}

@@ -179,7 +176,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
checkType( type );
File file = new File( "test.out" );
ObjectOutputStream oos = new ObjectOutputStream( new
FileOutputStream( file ) );
@@ -208,7 +205,7 @@
{
Type type =
new Type(
- m_info, m_loggers, m_context, m_services, m_parts, m_graph );
+ m_info, m_loggers, m_context, m_services, m_graph );
executeEncodingTest( type, "type.xml" );
}
}

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-07-16 18:28:47 UTC (rev 1574)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -229,26 +229,8 @@
{
populatePartReferences( map, parent );
}
- else
- {
- populateTypeReferences( map );
- }
}

- private void populateTypeReferences( Map map )
- {
- PartReference[] typeRefs = m_type.getPartReferences();
- for( int i=0; i < typeRefs.length; i++ )
- {
- PartReference ref = typeRefs[i];
- String key = ref.getKey();
- if( !map.containsKey( key ) )
- {
- map.put( key, ref );
- }
- }
- }
-
/**
* Return the component thread-safe status.
*

Modified: trunk/main/metro/test/build.xml
===================================================================
--- trunk/main/metro/test/build.xml 2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/metro/test/build.xml 2006-07-16 18:36:43 UTC (rev 1575)
@@ -109,24 +109,8 @@

<types xmlns="dpml:metro">
<type class="net.dpml.test.composite.ChildComponent" name="child"/>
- <type class="net.dpml.test.composite.CompositeComponent" name="parent">
- <parts>
- <component type="net.dpml.test.composite.ChildComponent"
key="child">
- <context>
- <entry key="color" method="BLUE"/>
- </context>
- </component>
- </parts>
- </type>
- <type class="net.dpml.test.composite.PartsComponent" name="parent">
- <parts>
- <component type="net.dpml.test.composite.ChildComponent"
key="child">
- <context>
- <entry key="color" method="BLUE"/>
- </context>
- </component>
- </parts>
- </type>
+ <type class="net.dpml.test.composite.CompositeComponent"
name="parent"/>
+ <type class="net.dpml.test.composite.PartsComponent" name="parent"/>
</types>

<c:component dest="target/test/composite.part" test="true"
@@ -134,6 +118,13 @@
<context>
<entry key="color" method="RED"/>
</context>
+ <parts>
+ <component type="net.dpml.test.composite.ChildComponent" key="child">
+ <context>
+ <entry key="color" method="BLUE"/>
+ </context>
+ </component>
+ </parts>
</c:component>

<c:component dest="target/test/parts.part" test="true"
@@ -141,6 +132,13 @@
<context>
<entry key="color" method="RED"/>
</context>
+ <parts>
+ <component type="net.dpml.test.composite.ChildComponent" key="child">
+ <context>
+ <entry key="color" method="BLUE"/>
+ </context>
+ </component>
+ </parts>
</c:component>

<!-- create the lifecycle managed component -->
@@ -169,8 +167,7 @@
</c:type>

<c:component dest="target/test/lifecycle.part" test="true"
- type="net.dpml.test.lifecycle.StartableComponent" collection="HARD">
- </c:component>
+ type="net.dpml.test.lifecycle.StartableComponent" collection="HARD"/>

<!-- categories component -->

@@ -204,24 +201,24 @@
<c:types>
<type name="server" class="net.dpml.test.app.DefaultServer"
lifestyle="singleton"/>
<type name="listener" class="net.dpml.test.app.DefaultListener"
lifestyle="singleton"/>
- <type name="demo" class="net.dpml.test.app.Demo" lifestyle="singleton">
- <parts>
- <component key="server" type="net.dpml.test.app.DefaultServer" >
- <context>
- <entry key="port" value="1010"/>
- </context>
- </component>
- <component key="listener" type="net.dpml.test.app.DefaultListener"
>
- <context>
- <entry key="server" lookup="net.dpml.test.app.Server"/>
- </context>
- </component>
- </parts>
- </type>
+ <type name="demo" class="net.dpml.test.app.Demo"
lifestyle="singleton"/>
</c:types>

<c:component type="net.dpml.test.app.Demo"
- dest="target/test/application.part" test="true" collection="hard"/>
+ dest="target/test/application.part" test="true" collection="hard">
+ <parts>
+ <component key="server" type="net.dpml.test.app.DefaultServer" >
+ <context>
+ <entry key="port" value="1010"/>
+ </context>
+ </component>
+ <component key="listener" type="net.dpml.test.app.DefaultListener" >
+ <context>
+ <entry key="server" lookup="net.dpml.test.app.Server"/>
+ </context>
+ </component>
+ </parts>
+ </c:component>

<!-- operations test -->


Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/CatalogTask.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -622,13 +622,6 @@
writer.write( "\n </table>" );
}

- //
- // write out links to embedded types
- //
-
- PartReference[] parts = type.getPartReferences();
- writePartReferences( writer, type, parts, offset );
-
writer.write( "\n </body>" );
writer.write( "\n</html>" );
writer.close();
@@ -684,48 +677,6 @@
writer.write( "\n </table>" );
}
}
-
- private void writePartReferences( FileWriter writer, Type type,
PartReference[] parts, String offset )
- throws IOException
- {
- boolean flag = true;
- if( parts.length > 0 )
- {
- writer.write( "\n <p class=\"category\">Embedded
Components</p>" );
- writer.write( "\n <table width=\"100%\">" );
- for( int j=0; j < parts.length; j++ )
- {
- PartReference ref = parts[j];
- String key = ref.getKey();
- Directive directive = type.getDirective( key );
-
- if( flag )
- {
- writer.write( "<tr class=\"p-even\">" );
- }
- else
- {
- writer.write( "<tr class=\"p-odd\">" );
- }
- writer.write( "<td>" + key + "</td>" );
- String pname = directive.getClass().getName();
- if( pname.equals( ComponentDirective.class.getName() ) )
- {
- ComponentDirective component = (ComponentDirective)
directive;
- String tname = component.getClassname();
- String tpath = tname.replace( '.', '/' ).concat( ".html"
);
- writer.write( "<td><a href=\"" + offset + "/" + tpath +
"\">" + tname + "</a></td>" );
- }
- else
- {
- writer.write( "<td>" + directive.getClass().getName() +
"</td>" );
- }
- writer.write( "</tr>" );
- flag = !flag;
- }
- writer.write( "\n </table>" );
- }
- }

private List getPackageList( String name )
{

Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/TypeBuilderTask.java
===================================================================
--- trunk/main/metro/tools/src/main/net/dpml/metro/tools/TypeBuilderTask.java
2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/metro/tools/src/main/net/dpml/metro/tools/TypeBuilderTask.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -82,7 +82,6 @@
private LifestylePolicy m_lifestyle;
private CollectionPolicy m_collection;
private ThreadSafePolicy m_threadsafe = ThreadSafePolicy.UNKNOWN;
- private PartsDataType m_parts;
private StateDataType m_state;
private ServicesDataType m_services;
private CategoriesDescriptorDataType m_categories;
@@ -144,25 +143,6 @@
}

/**
- * Create a new part datatype.
- * @return a new part datatype
- */
- public PartsDataType createParts()
- {
- if( m_parts == null )
- {
- m_parts = new PartsDataType( this );
- return m_parts;
- }
- else
- {
- final String error =
- "Illegal attempt to create a duplicate parts element.";
- throw new BuildException( error, getLocation() );
- }
- }
-
- /**
* Create a new services datatype.
* @return a new services datatype
*/
@@ -278,9 +258,8 @@
ServiceDescriptor[] services = createServiceDescriptors( subject );
CategoryDescriptor[] categories = createCategoryDescriptors();
ContextDescriptor context = createContextDescriptor( subject );
- PartReference[] parts = getPartReferences( subject.getClassLoader()
);
State graph = getStateGraph( subject );
- return new Type( info, categories, context, services, parts, graph );
+ return new Type( info, categories, context, services, graph );
}

private File getReportDestination( File dir, Type type )
@@ -526,28 +505,6 @@
}
}

- private PartReference[] getPartReferences( ClassLoader classloader )
- throws IntrospectionException, IOException
- {
- if( null != m_parts )
- {
- try
- {
- return m_parts.getParts( classloader, null );
- }
- catch( ClassNotFoundException cnfe )
- {
- final String error =
- "Unable to load a class referenced by a nested part within
a component type.";
- throw new BuildException( error, cnfe );
- }
- }
- else
- {
- return new PartReference[0];
- }
- }
-
private ContextDescriptor createContextDescriptor( Class subject )
throws IntrospectionException
{

Modified: trunk/main/planet/http/impl/build.xml
===================================================================
--- trunk/main/planet/http/impl/build.xml 2006-07-16 18:28:47 UTC (rev
1574)
+++ trunk/main/planet/http/impl/build.xml 2006-07-16 18:36:43 UTC (rev
1575)
@@ -109,15 +109,6 @@
</transition>
</state>
</state>
- <parts>
- <component key="threadPool"
- type="net.dpml.http.BoundedThreadPool" collection="hard"
activation="DEMAND">
- <context>
- <entry key="min" value="10"/>
- <entry key="max" value="100"/>
- </context>
- </component>
- </parts>
</type>

<catalog xmlns="metro" title="Test Catalog">

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -83,7 +83,7 @@
*
* @return the configured handler collection.
*/
- HandlerCollection getHandlerCollection();
+ HandlerCollection getHandlers();
}

private final Logger m_logger;
@@ -139,7 +139,7 @@

addConnectors( parts );
addUserRealms( parts );
- HandlerCollection collection = parts.getHandlerCollection();
+ HandlerCollection collection = parts.getHandlers();
setHandler( collection );

// notify completion of server establishment

Modified: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml 2006-07-16 18:28:47 UTC (rev
1574)
+++ trunk/main/planet/http/server/project.xml 2006-07-16 18:36:43 UTC (rev
1575)
@@ -8,6 +8,13 @@
lifestyle="singleton"
collection="hard">
<parts>
+ <component key="threadPool"
+ type="net.dpml.http.BoundedThreadPool" collection="hard"
activation="demand">
+ <context>
+ <entry key="min" value="10"/>
+ <entry key="max" value="100"/>
+ </context>
+ </component>
<!--
Add a select channel connector to 8080.
-->
@@ -50,7 +57,7 @@
<!--
Add handler collection.
-->
- <component key="handlerCollection"
type="net.dpml.http.HandlerCollection"
+ <component key="handlers" type="net.dpml.http.HandlerCollection"
lifestyle="singleton"
collection="hard">


Modified: trunk/main/transit/core/src/main/net/dpml/transit/Artifact.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/transit/Artifact.java
2006-07-16 18:28:47 UTC (rev 1574)
+++ trunk/main/transit/core/src/main/net/dpml/transit/Artifact.java
2006-07-16 18:36:43 UTC (rev 1575)
@@ -260,12 +260,27 @@
}
catch( UnsupportedSchemeException e )
{
- return uri.toURL();
}
catch( IllegalArgumentException e )
{
+ }
+
+ try
+ {
return uri.toURL();
}
+ catch( MalformedURLException mue )
+ {
+ throw mue;
+ }
+ catch( Throwable t )
+ {
+ final String error =
+ "Unexpected error while attempting to convert a uri to a url."
+ + "\n URI: "
+ + uri;
+ throw new TransitRuntimeException( error, t );
+ }
}

/**




  • r1575 - in trunk/main: . central/src/docs/metro/directives/type metro/model/etc/data/types metro/model/src/main/net/dpml/metro/builder metro/model/src/main/net/dpml/metro/info metro/model/src/test/net/dpml/metro/info/test metro/runtime/src/main/net/dpml/metro/runtime metro/test metro/tools/src/main/net/dpml/metro/tools planet/http/impl planet/http/impl/src/main/net/dpml/http planet/http/server transit/core/src/main/net/dpml/transit, mcconnell at BerliOS, 07/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page