notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1499 - in trunk/main: central/src/docs/about/download depot depot/tools/builder/src/main/net/dpml/tools/tasks lang/component/etc lang/type/etc metro metro/job/impl/src/test/net/dpml/job/test metro/model/src/main/net/dpml/metro/info metro/runtime/src/main/net/dpml/metro/builder metro/test/src/test/net/dpml/test/part metro/test/src/test/net/dpml/test/runtime metro/tools/src planet/http planet/http/server planet/http/test/src/test/net/dpml/http/test station station/api/src/test/net/dpml/station/info
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1499 - in trunk/main: central/src/docs/about/download depot depot/tools/builder/src/main/net/dpml/tools/tasks lang/component/etc lang/type/etc metro metro/job/impl/src/test/net/dpml/job/test metro/model/src/main/net/dpml/metro/info metro/runtime/src/main/net/dpml/metro/builder metro/test/src/test/net/dpml/test/part metro/test/src/test/net/dpml/test/runtime metro/tools/src planet/http planet/http/server planet/http/test/src/test/net/dpml/http/test station station/api/src/test/net/dpml/station/info
- Date: Tue, 6 Jun 2006 10:53:58 +0200
Author: mcconnell
Date: 2006-06-06 10:53:49 +0200 (Tue, 06 Jun 2006)
New Revision: 1499
Removed:
trunk/main/metro/tools/src/test/
Modified:
trunk/main/central/src/docs/about/download/archive.xml
trunk/main/depot/module.xml
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
trunk/main/lang/component/etc/component.xsd
trunk/main/lang/type/etc/type.xsd
trunk/main/metro/job/impl/src/test/net/dpml/job/test/DefaultCommissionerTestCase.java
trunk/main/metro/model/src/main/net/dpml/metro/info/Type.java
trunk/main/metro/module.xml
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
trunk/main/metro/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/AppTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/ArrayTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/CategoriesTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/CompositeTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/DefaultComponentHandlerTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/DisposalTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/HardCollectionPolicyTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/LifecycleTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/NullTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/ObserverTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/PartsTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/ProviderTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/SingletonProviderTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/StateTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/TransientProviderTestCase.java
trunk/main/metro/test/src/test/net/dpml/test/runtime/WeakCollectionPolicyTestCase.java
trunk/main/planet/http/module.xml
trunk/main/planet/http/server/project.xml
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
trunk/main/station/api/src/test/net/dpml/station/info/RegistryDescriptorTestCase.java
trunk/main/station/module.xml
Log:
1. improve implicit component creation logic to handle context evaluation
(without a type definition)
2. add DPML standard logging configuration to the default JUnit system
properties
Modified: trunk/main/central/src/docs/about/download/archive.xml
===================================================================
--- trunk/main/central/src/docs/about/download/archive.xml 2006-06-05
18:18:15 UTC (rev 1498)
+++ trunk/main/central/src/docs/about/download/archive.xml 2006-06-06
08:53:49 UTC (rev 1499)
@@ -30,6 +30,8 @@
and alias references.</li>
<li>Addition of testcases dealing with <tt>xsi:type</tt> usage in
plugin
XML instances.</li>
+ <li>Update JUnit task to assert forked test mode as default.</li>
+ <li>Removal of redundant declaration in component and type
XSD.</li>
</ul>
<table>
Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/depot/module.xml 2006-06-06 08:53:49 UTC (rev 1499)
@@ -40,7 +40,6 @@
<project name="dpml-depot-console" basedir="core">
<properties>
- <property name="project.test.fork" value="true"/>
<property name="depot.short.filename" value="${project.name}.jar"/>
<property name="transit.short.filename" value="dpml-transit-main.jar"/>
<property name="project.jar.main.class" value="net.dpml.depot.Main"/>
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -330,6 +330,11 @@
endorsed.setValue( new File( Transit.DPML_SYSTEM, "lib/endorsed"
).getAbsolutePath() );
junit.addConfiguredSysproperty( endorsed );
+ final Environment.Variable logging = new Environment.Variable();
+ logging.setKey( "java.util.logging.config.class" );
+ logging.setValue( "net.dpml.util.ConfigurationHandler" );
+ junit.addConfiguredSysproperty( logging );
+
junit.setErrorProperty( ERROR_KEY );
junit.setFailureProperty( FAILURE_KEY );
junit.setTaskName( getTaskName() );
@@ -483,7 +488,7 @@
private static final String TEST_SRC_VALUE = "test";
private static final String TEST_ENV_VALUE = "env";
private static final boolean DEBUG_VALUE = true;
- private static final boolean FORK_VALUE = false;
+ private static final boolean FORK_VALUE = true;
private static final boolean HALT_ON_ERROR_VALUE = true;
private static final boolean HALT_ON_FAILURE_VALUE = true;
Modified: trunk/main/lang/component/etc/component.xsd
===================================================================
--- trunk/main/lang/component/etc/component.xsd 2006-06-05 18:18:15 UTC (rev
1498)
+++ trunk/main/lang/component/etc/component.xsd 2006-06-06 08:53:49 UTC (rev
1499)
@@ -9,32 +9,18 @@
<import namespace="@PART-XSD-LINK-URI@"
schemaLocation="@PART-XSD-LINK-URI@"/>
<element name="component" type="this:component"
substitutionGroup="part:strategy"/>
- <element name="strategy" type="this:strategy"
substitutionGroup="part:strategy"/>
<element name="category" type="this:CategoryType"/>
<element name="categories" type="this:CategoriesType"
substitutionGroup="this:category"/>
<element name="entry" type="this:EntryType"/>
<element name="param" type="part:ValueType"
substitutionGroup="part:param"/>
- <element name="parts" type="this:parts"/>
- <complexType name="strategy">
- <complexContent>
- <extension base="part:StrategyType">
- <sequence>
- <element name="controller" type="this:ControllerType"
minOccurs="0" maxOccurs="1"/>
- <element name="component" type="this:component" minOccurs="0"
maxOccurs="1"/>
- </sequence>
- <attribute name="handler" type="part:URI"
default="link:part:dpml/metro/dpml-metro-runtime"/>
- </extension>
- </complexContent>
- </complexType>
-
<complexType name="component">
<complexContent>
<extension base="part:StrategyType">
<sequence>
<element name="categories" type="this:CategoriesType"
minOccurs="0" maxOccurs="1"/>
<element name="context" type="this:ContextType" minOccurs="0"
maxOccurs="1"/>
- <element name="parts" type="this:parts" minOccurs="0"
maxOccurs="1"/>
+ <element name="parts" type="this:PartsType" minOccurs="0"
maxOccurs="1"/>
</sequence>
<attribute name="name" type="string"/>
<attribute name="type" type="string" use="required"/>
@@ -46,13 +32,6 @@
</complexContent>
</complexType>
- <complexType name="ControllerType">
- <sequence>
- <element ref="part:param" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="uri" type="string" use="required"/>
- </complexType>
-
<complexType name="CategoryType">
<attribute name="name" type="string"/>
<attribute name="priority" type="this:priority"/>
@@ -84,7 +63,7 @@
</complexContent>
</complexType>
- <complexType name="parts">
+ <complexType name="PartsType">
<sequence>
<element name="component" type="this:TaggedComponent" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
Modified: trunk/main/lang/type/etc/type.xsd
===================================================================
--- trunk/main/lang/type/etc/type.xsd 2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/lang/type/etc/type.xsd 2006-06-06 08:53:49 UTC (rev 1499)
@@ -16,7 +16,6 @@
<import namespace="@COMPONENT-XSD-URI@"
schemaLocation="@COMPONENT-XSD-URI@"/>
<element name="type" type="this:TypeDefinition"/>
- <element name="strategy" type="this:strategy"
substitutionGroup="component:strategy"/>
<complexType name="TypeDefinition">
<sequence>
@@ -25,7 +24,7 @@
<element name="context" type="this:ContextType" minOccurs="0"
maxOccurs="1"/>
<element name="categories" type="this:CategoriesType" minOccurs="0"
maxOccurs="1"/>
<element ref="state:state" minOccurs="0" maxOccurs="1"/>
- <element name="parts" type="component:parts" minOccurs="0"
maxOccurs="1"/>
+ <element name="parts" type="component:PartsType" minOccurs="0"
maxOccurs="1"/>
</sequence>
</complexType>
@@ -84,12 +83,6 @@
<attribute name="value" type="string"/>
</complexType>
- <complexType name="strategy">
- <complexContent>
- <extension base="component:strategy"/>
- </complexContent>
- </complexType>
-
<simpleType name="priority">
<restriction base="string">
<enumeration value="info"/>
Modified:
trunk/main/metro/job/impl/src/test/net/dpml/job/test/DefaultCommissionerTestCase.java
===================================================================
---
trunk/main/metro/job/impl/src/test/net/dpml/job/test/DefaultCommissionerTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/job/impl/src/test/net/dpml/job/test/DefaultCommissionerTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -46,9 +46,6 @@
static
{
System.setProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" );
- System.setProperty(
"dpml.logging.config",
"file:" + System.getProperty( "project.test.dir" ) +
"/logging.properties" );
}
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-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/model/src/main/net/dpml/metro/info/Type.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -20,6 +20,9 @@
package net.dpml.metro.info;
import java.io.Serializable;
+import java.beans.IntrospectionException;
+import java.util.ArrayList;
+import java.lang.reflect.Method;
import net.dpml.state.State;
@@ -293,20 +296,170 @@
/**
* Utility operation to construct a default type given a supplied class.
- * @param clazz the component implementation class
+ * @param subject the component implementation class
* @return the defalt type descriptor for the class
*/
- public static Type createType( Class clazz )
+ public static Type createType( Class subject )
+ throws IntrospectionException
{
- String name = clazz.getName();
- final InfoDescriptor info = new InfoDescriptor( name,
clazz.getName() );
+ final InfoDescriptor info = new InfoDescriptor( null,
subject.getName() );
final CategoryDescriptor[] loggers = new CategoryDescriptor[0];
- final ContextDescriptor context = new ContextDescriptor( new
EntryDescriptor[0] );
+ final ContextDescriptor context = createContextDescriptor( subject );
final ServiceDescriptor[] services =
new ServiceDescriptor[]{
- new ServiceDescriptor( clazz.getName() )
+ new ServiceDescriptor( subject.getName() )
};
final PartReference[] parts = new PartReference[0];
return new Type( info, loggers, context, services, parts,
State.NULL_STATE );
}
+
+ private static ContextDescriptor createContextDescriptor( Class subject
)
+ throws IntrospectionException
+ {
+ EntryDescriptor[] entries = createEntryDescriptors( subject );
+ return new ContextDescriptor( entries );
+ }
+
+ private static EntryDescriptor[] createEntryDescriptors( Class subject )
+ throws IntrospectionException
+ {
+ String classname = subject.getName();
+ Class[] classes = subject.getClasses();
+ Class param = locateClass( "$Context", classes );
+ if( null == param )
+ {
+ return new EntryDescriptor[0];
+ }
+ else
+ {
+ //
+ // For each method in the Context inner-interface we construct a
+ // descriptor that establishes the key, type, and required
status.
+ //
+
+ Method[] methods = param.getMethods();
+ ArrayList list = new ArrayList();
+ for( int i=0; i<methods.length; i++ )
+ {
+ Method method = methods[i];
+ String name = method.getName();
+ if( name.startsWith( "get" ) )
+ {
+ EntryDescriptor descriptor =
+ createEntryDescriptor( method );
+ list.add( descriptor );
+ }
+ }
+ return (EntryDescriptor[]) list.toArray( new EntryDescriptor[0]
);
+ }
+ }
+
+ /**
+ * Creation of a new parameter descriptor using a supplied method.
+ * The method is the method used by the component implementation to get
the parameter
+ * instance.
+ */
+ private static EntryDescriptor createEntryDescriptor( Method method )
+ throws IntrospectionException
+ {
+ validateMethodName( method );
+ validateNoExceptions( method );
+
+ String key = EntryDescriptor.getEntryKey( method );
+
+ Class returnType = method.getReturnType();
+ if( method.getParameterTypes().length == 0 )
+ {
+ //
+ // required context entry
+ //
+
+ validateNonNullReturnType( method );
+ String type = returnType.getName();
+ return new EntryDescriptor( key, type, EntryDescriptor.REQUIRED
);
+ }
+ else if( method.getParameterTypes().length == 1 )
+ {
+ Class[] params = method.getParameterTypes();
+ Class param = params[0];
+ if( returnType.isAssignableFrom( param ) )
+ {
+ String type = param.getName();
+ return new EntryDescriptor( key, type,
EntryDescriptor.OPTIONAL );
+ }
+ else
+ {
+ final String error =
+ "Context entry assessor declares an optional default
parameter class ["
+ + param.getName()
+ + "] which is not assignable to the return type ["
+ + returnType.getName()
+ + "]";
+ throw new IntrospectionException( error );
+ }
+ }
+ else
+ {
+ final String error =
+ "Unable to establish a required or optional context entry
method pattern on ["
+ + method.getName()
+ + "]";
+ throw new IntrospectionException( error );
+ }
+ }
+
+ private static void validateMethodName( Method method )
+ throws IntrospectionException
+ {
+ if( !method.getName().startsWith( "get" ) )
+ {
+ final String error =
+ "Method ["
+ + method.getName()
+ + "] does not start with 'get'.";
+ throw new IntrospectionException( error );
+ }
+ }
+
+ private static void validateNoExceptions( Method method )
+ throws IntrospectionException
+ {
+ Class[] exceptionTypes = method.getExceptionTypes();
+ if( exceptionTypes.length > 0 )
+ {
+ final String error =
+ "Method ["
+ + method.getName()
+ + "] declares one or more exceptions.";
+ throw new IntrospectionException( error );
+ }
+ }
+
+ private static void validateNonNullReturnType( Method method )
+ throws IntrospectionException
+ {
+ Class returnType = method.getReturnType();
+ if( Void.TYPE.equals( returnType ) )
+ {
+ final String error =
+ "Method ["
+ + method.getName()
+ + "] does not declare a return type.";
+ throw new IntrospectionException( error );
+ }
+ }
+
+ private static Class locateClass( String postfix, Class[] classes )
+ {
+ for( int i=0; i<classes.length; i++ )
+ {
+ Class inner = classes[i];
+ String name = inner.getName();
+ if( name.endsWith( postfix ) )
+ {
+ return inner;
+ }
+ }
+ return null;
+ }
}
Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/module.xml 2006-06-06 08:53:49 UTC (rev 1499)
@@ -40,9 +40,6 @@
</project>
<project name="dpml-job-impl" basedir="job/impl">
- <properties>
- <property name="project.test.fork" value="true"/>
- </properties>
<types>
<type id="jar"/>
</types>
@@ -163,7 +160,6 @@
<project name="dpml-metro-test" basedir="test">
<properties>
- <property name="project.test.fork" value="true"/>
<property name="project.javadoc.exclude" value="true"/>
</properties>
<types>
Modified:
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-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -23,6 +23,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Properties;
+import java.beans.IntrospectionException;
import net.dpml.lang.Version;
@@ -71,7 +72,7 @@
* @return the component type descriptor
* @exception IOException if an error occurs reading the type definition
*/
- public Type loadType( Class subject ) throws IOException
+ public Type loadType( Class subject ) throws IOException,
IntrospectionException
{
String classname = subject.getName();
String path = classname.replace( '.', '/' );
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-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/part/PartLoadingTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -77,9 +77,6 @@
static
{
System.setProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" );
- System.setProperty(
"dpml.logging.config",
"file:" + System.getProperty( "project.test.dir" ) +
"/logging.properties" );
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/AppTestCase.java
===================================================================
--- trunk/main/metro/test/src/test/net/dpml/test/runtime/AppTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/test/src/test/net/dpml/test/runtime/AppTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -68,12 +68,4 @@
assertEquals( "count", 2, count );
}
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/ArrayTestCase.java
===================================================================
--- trunk/main/metro/test/src/test/net/dpml/test/runtime/ArrayTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/test/src/test/net/dpml/test/runtime/ArrayTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -68,12 +68,4 @@
assertTrue( "array-return-value", flag );
}
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/CategoriesTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/CategoriesTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/CategoriesTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -64,13 +64,4 @@
CategoriesComponent instance = (CategoriesComponent)
provider.getValue( false );
component.decommission();
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/CompositeTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/CompositeTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/CompositeTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -91,13 +91,4 @@
Color c = child.getColor();
assertEquals( "color", color, c );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextTestCase.java
===================================================================
--- trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/test/src/test/net/dpml/test/runtime/ContextTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -215,13 +215,4 @@
{
assertEquals( "path", "/context", m_context.getPath() );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/DefaultComponentHandlerTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/DefaultComponentHandlerTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/DefaultComponentHandlerTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -87,13 +87,4 @@
Provider instance = (Provider) component.getProvider();
assertTrue( "is-active-post-instantiation", component.isActive() );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/DisposalTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/DisposalTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/DisposalTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -66,13 +66,4 @@
disposable.dispose();
assertEquals( "count", 0, component.size() );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/HardCollectionPolicyTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/HardCollectionPolicyTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/HardCollectionPolicyTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -88,13 +88,4 @@
assertEquals( "count", 1, count );
component.decommission();
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/LifecycleTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/LifecycleTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/LifecycleTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -66,13 +66,4 @@
component.decommission();
assertTrue( "component is stopped", startable.wasStopped() );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/NullTestCase.java
===================================================================
--- trunk/main/metro/test/src/test/net/dpml/test/runtime/NullTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/test/src/test/net/dpml/test/runtime/NullTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -38,13 +38,4 @@
Controller control = Controller.STANDARD;
assertNotNull( "control", control );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/ObserverTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/ObserverTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/ObserverTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -69,13 +69,4 @@
context.setEntryDirective( key, newDirective );
component.decommission();
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/PartsTestCase.java
===================================================================
--- trunk/main/metro/test/src/test/net/dpml/test/runtime/PartsTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/test/src/test/net/dpml/test/runtime/PartsTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -70,13 +70,4 @@
Color c = child.getColor();
assertEquals( "color", color, c );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/ProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/ProviderTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/ProviderTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -215,13 +215,4 @@
component.decommission();
}
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/SingletonProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/SingletonProviderTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/SingletonProviderTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -63,13 +63,4 @@
assertEquals( "singletons-are-equal", firstProvider, secondProvider
);
component.decommission();
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/StateTestCase.java
===================================================================
--- trunk/main/metro/test/src/test/net/dpml/test/runtime/StateTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/metro/test/src/test/net/dpml/test/runtime/StateTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -70,13 +70,4 @@
Monitor monitor = (Monitor) provider.exec( "monitor", new Object[0]
);
assertEquals( "count", 100, monitor.getAccessCount() );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/TransientProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/TransientProviderTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/TransientProviderTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -66,13 +66,4 @@
}
component.decommission();
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified:
trunk/main/metro/test/src/test/net/dpml/test/runtime/WeakCollectionPolicyTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/test/runtime/WeakCollectionPolicyTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/metro/test/src/test/net/dpml/test/runtime/WeakCollectionPolicyTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -85,13 +85,4 @@
assertEquals( "count", 0, count );
component.decommission();
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- }
}
Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/planet/http/module.xml 2006-06-06 08:53:49 UTC (rev 1499)
@@ -2,8 +2,6 @@
<module name="http" basedir="." xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<properties>
- <property
name="project.xsd.builder.link:xsd:dpml/lang/dpml-component#1.0"
- value="link:part:dpml/metro/dpml-metro-runtime"/>
<property name="jetty.version" value="6.0.0-R534"/>
<property name="jasper.version" value="5.5.15"/>
<property name="sl4j.version" value="1.0.1"/>
@@ -52,7 +50,6 @@
<project name="dpml-http-test" basedir="test">
<properties>
- <property name="project.test.fork" value="true"/>
<property name="project.javadoc.exclude" value="true"/>
</properties>
<dependencies>
Modified: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml 2006-06-05 18:18:15 UTC (rev
1498)
+++ trunk/main/planet/http/server/project.xml 2006-06-06 08:53:49 UTC (rev
1499)
@@ -3,8 +3,10 @@
xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<types>
- <component xmlns="link:xsd:dpml/lang/dpml-component#1.0"
- alias="true" type="net.dpml.http.Server" lifestyle="singleton"
collection="hard">
+ <component xmlns="link:xsd:dpml/lang/dpml-component#1.0" alias="true"
+ type="net.dpml.http.Server"
+ lifestyle="singleton"
+ collection="hard">
<parts>
<!--
Add a select channel connector to 8080.
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-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -43,17 +43,4 @@
Object object = part.instantiate( new Object[0] );
assertEquals( "class", "net.dpml.http.Server",
object.getClass().getName() );
}
-
- static
- {
- System.setProperty(
- "java.util.logging.config.class",
- System.getProperty(
- "java.util.logging.config.class",
- "net.dpml.util.ConfigurationHandler" ) );
- System.setProperty( "java.protocol.handler.pkgs", "net.dpml.transit"
);
- System.setProperty(
- "dpml.logging.config",
- "local:properties:dpml/transit/default" );
- }
}
Modified:
trunk/main/station/api/src/test/net/dpml/station/info/RegistryDescriptorTestCase.java
===================================================================
---
trunk/main/station/api/src/test/net/dpml/station/info/RegistryDescriptorTestCase.java
2006-06-05 18:18:15 UTC (rev 1498)
+++
trunk/main/station/api/src/test/net/dpml/station/info/RegistryDescriptorTestCase.java
2006-06-06 08:53:49 UTC (rev 1499)
@@ -46,19 +46,22 @@
new Entry(
"aaa",
new ApplicationDescriptor(
- new URI( "link:part:acme/demo" ), "test", new
ValueDirective[0], null, StartupPolicy.AUTOMATIC,
+ new URI( "link:part:acme/demo" ), "test", new
ValueDirective[0],
+ null, StartupPolicy.AUTOMATIC,
0, 0, new Properties(), null ) );
m_entries[1] =
new Entry(
"bbb",
new ApplicationDescriptor(
- new URI( "link:part:acme/demo" ), "test", new
ValueDirective[0], null, StartupPolicy.AUTOMATIC,
+ new URI( "link:part:acme/demo" ), "test", new
ValueDirective[0],
+ null, StartupPolicy.AUTOMATIC,
0, 0, new Properties(), null ) );
m_entries[2] =
new Entry(
"ccc",
new ApplicationDescriptor(
- new URI( "link:part:acme/demo" ), "test", new
ValueDirective[0], null, StartupPolicy.AUTOMATIC,
+ new URI( "link:part:acme/demo" ), "test", new
ValueDirective[0],
+ null, StartupPolicy.AUTOMATIC,
0, 0, new Properties(), null ) );
m_descriptor = new RegistryDescriptor( m_entries );
Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-06-05 18:18:15 UTC (rev 1498)
+++ trunk/main/station/module.xml 2006-06-06 08:53:49 UTC (rev 1499)
@@ -29,7 +29,7 @@
<include ref="dpml/metro/dpml-metro-component"/>
</runtime>
<test>
- <include ref="junit/junit"/>
+ <include ref="ant/ant-junit"/>
</test>
</dependencies>
<filters>
@@ -59,7 +59,8 @@
</runtime>
</dependencies>
<filters>
- <feature token="COMPOSITION-CONTROLLER-URI"
ref="dpml/metro/dpml-metro-runtime" type="part" id="uri"/>
+ <feature token="COMPOSITION-CONTROLLER-URI"
+ ref="dpml/metro/dpml-metro-runtime" type="part" id="uri"/>
</filters>
</project>
@@ -72,11 +73,12 @@
<include key="dpml-station-api" tag="public"/>
</runtime>
<test>
- <include ref="junit/junit"/>
+ <include ref="ant/ant-junit"/>
</test>
</dependencies>
<filters>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri" alias="true"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info"
+ type="xsd" id="uri" alias="true"/>
</filters>
</project>
@@ -102,7 +104,8 @@
</test>
</dependencies>
<filters>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri" alias="true"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info"
+ type="xsd" id="uri" alias="true"/>
</filters>
</project>
@@ -119,7 +122,8 @@
</runtime>
</dependencies>
<filters>
- <feature token="DEPOT-STATION-PLUGIN-URI"
ref="dpml/station/dpml-station-server" type="part" id="uri"/>
+ <feature token="DEPOT-STATION-PLUGIN-URI"
ref="dpml/station/dpml-station-server"
+ type="part" id="uri"/>
</filters>
</project>
- r1499 - in trunk/main: central/src/docs/about/download depot depot/tools/builder/src/main/net/dpml/tools/tasks lang/component/etc lang/type/etc metro metro/job/impl/src/test/net/dpml/job/test metro/model/src/main/net/dpml/metro/info metro/runtime/src/main/net/dpml/metro/builder metro/test/src/test/net/dpml/test/part metro/test/src/test/net/dpml/test/runtime metro/tools/src planet/http planet/http/server planet/http/test/src/test/net/dpml/http/test station station/api/src/test/net/dpml/station/info, mcconnell at BerliOS, 06/06/2006
Archive powered by MHonArc 2.6.24.