Skip to Content.
Sympa Menu

notify-dpml - r974 - in trunk/main/metro: exec/src/main/net/dpml/metro/exec model/src/main/net/dpml/metro/control runtime/src/main/net/dpml/metro/runtime test/src/main/net/dpml/test/composite test/src/test/net/dpml/metro/runtime/test

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: r974 - in trunk/main/metro: exec/src/main/net/dpml/metro/exec model/src/main/net/dpml/metro/control runtime/src/main/net/dpml/metro/runtime test/src/main/net/dpml/test/composite test/src/test/net/dpml/metro/runtime/test
  • Date: Wed, 25 Jan 2006 12:17:52 +0100

Author: mcconnell
Date: 2006-01-25 12:17:50 +0100 (Wed, 25 Jan 2006)
New Revision: 974

Added:

trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextManager.java
Removed:

trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java

trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
Modified:
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java

trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentHandler.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.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/test/src/main/net/dpml/test/composite/PartsComponent.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java

trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
Log:
working over the internal parts management interfaces (more coming)

Modified:
trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
===================================================================
--- trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-01-25 11:14:50 UTC (rev 973)
+++ trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -44,8 +44,8 @@

import net.dpml.metro.model.ComponentModel;
import net.dpml.metro.model.ContextModel;
-import net.dpml.metro.control.ComponentModelManager;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.ContextManager;

import net.dpml.configuration.Configurable;
import net.dpml.configuration.Configuration;
@@ -157,10 +157,10 @@
throw new UnsupportedOperationException( "Parameters not
currently supported." );
}

- if( model instanceof ComponentModelManager )
+ if( model instanceof ComponentManager )
{
- ComponentModelManager componentModel = (ComponentModelManager)
model;
- ContextModelManager cm = componentModel.getContextModelManager();
+ ComponentManager componentModel = (ComponentManager) model;
+ ContextManager cm = componentModel.getContextManager();
Enumeration names = properties.propertyNames();
while( names.hasMoreElements() )
{

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentHandler.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentHandler.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentHandler.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -50,7 +50,7 @@
* Return the component model manager associated with the component
handler.
* @return the component model manager
*/
- ComponentModelManager getComponentModelManager();
+ ComponentManager getComponentManager();

/**
* Return the internal parts manager.

Copied:
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
(from rev 973,
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java)
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -0,0 +1,58 @@
+/*
+ * 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.control;
+
+import java.rmi.RemoteException;
+
+import net.dpml.metro.info.CollectionPolicy;
+
+import net.dpml.part.ActivationPolicy;
+
+import net.dpml.metro.model.ComponentModelOperations;
+
+/**
+ * The MutableComponentModel interface extends ComponentModel with a set of
+ * operations supporting model changes.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface ComponentManager extends ComponentModelOperations
+{
+ /**
+ * Return the context model manager.
+ * @return the context model manager
+ */
+ ContextManager getContextManager();
+
+ /**
+ * Set the component activation policy to the supplied value.
+ * @param policy the new activation policy
+ * @exception RemoteException if a remote exception occurs
+ */
+ void setActivationPolicy( ActivationPolicy policy );
+
+ /**
+ * Override the assigned collection policy.
+ * @param policy the collection policy value
+ * @exception RemoteException if a remote exception occurs
+ */
+ void setCollectionPolicy( CollectionPolicy policy );
+}
+

Deleted:
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -1,58 +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.metro.control;
-
-import java.rmi.RemoteException;
-
-import net.dpml.metro.info.CollectionPolicy;
-
-import net.dpml.part.ActivationPolicy;
-
-import net.dpml.metro.model.ComponentModelOperations;
-
-/**
- * The MutableComponentModel interface extends ComponentModel with a set of
- * operations supporting model changes.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ComponentModelManager extends ComponentModelOperations
-{
- /**
- * Return the context model manager.
- * @return the context model manager
- */
- ContextModelManager getContextModelManager();
-
- /**
- * Set the component activation policy to the supplied value.
- * @param policy the new activation policy
- * @exception RemoteException if a remote exception occurs
- */
- void setActivationPolicy( ActivationPolicy policy );
-
- /**
- * Override the assigned collection policy.
- * @param policy the collection policy value
- * @exception RemoteException if a remote exception occurs
- */
- void setCollectionPolicy( CollectionPolicy policy );
-}
-

Copied:
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextManager.java
(from rev 973,
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java)
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextManager.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -0,0 +1,73 @@
+/*
+ * 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.control;
+
+import java.rmi.RemoteException;
+
+import net.dpml.metro.info.PartReference;
+import net.dpml.part.Directive;
+
+import net.dpml.lang.UnknownKeyException;
+
+import net.dpml.metro.model.ContextModelOperations;
+
+/**
+ * The MutableContextModel interface extends ContextModel with operations
supporting
+ * context entry value mutation.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface ContextManager extends ContextModelOperations
+{
+ /**
+ * Set a context entry value.
+ * @param key the context entry key
+ * @param value the context entry value
+ * @exception UnknownKeyException if the key is unknown
+ */
+ //void setEntry( String key, Object value ) throws UnknownKeyException;
+
+ /**
+ * Return a context entry value.
+ * @return the context entry value
+ * @exception UnknownKeyException if the key is unknown
+ */
+ //Object getEntry( String key ) throws UnknownKeyException;
+
+ /**
+ * Set a context entry directive value.
+ * @param key the context entry key
+ * @param directive the context entry directive
+ * @exception UnknownKeyException if the key is unknown
+ */
+ void setEntryDirective( String key, Directive directive ) throws
UnknownKeyException;
+
+ /**
+ * Apply an array of tagged directive as an atomic operation.
Application of
+ * directives to the context model is atomic such that changes are
applied under a
+ * 'all-or-nothing' policy.
+ *
+ * @param directives an array of part references
+ * @exception UnknownKeyException if a key within the array does not
match a key within
+ * the context model.
+ */
+ void setEntryDirectives( PartReference[] directives ) throws
UnknownKeyException;
+
+}

Deleted:
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -1,73 +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.metro.control;
-
-import java.rmi.RemoteException;
-
-import net.dpml.metro.info.PartReference;
-import net.dpml.part.Directive;
-
-import net.dpml.lang.UnknownKeyException;
-
-import net.dpml.metro.model.ContextModelOperations;
-
-/**
- * The MutableContextModel interface extends ContextModel with operations
supporting
- * context entry value mutation.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ContextModelManager extends ContextModelOperations
-{
- /**
- * Set a context entry value.
- * @param key the context entry key
- * @param value the context entry value
- * @exception UnknownKeyException if the key is unknown
- */
- //void setEntry( String key, Object value ) throws UnknownKeyException;
-
- /**
- * Return a context entry value.
- * @return the context entry value
- * @exception UnknownKeyException if the key is unknown
- */
- //Object getEntry( String key ) throws UnknownKeyException;
-
- /**
- * Set a context entry directive value.
- * @param key the context entry key
- * @param directive the context entry directive
- * @exception UnknownKeyException if the key is unknown
- */
- void setEntryDirective( String key, Directive directive ) throws
UnknownKeyException;
-
- /**
- * Apply an array of tagged directive as an atomic operation.
Application of
- * directives to the context model is atomic such that changes are
applied under a
- * 'all-or-nothing' policy.
- *
- * @param directives an array of part references
- * @exception UnknownKeyException if a key within the array does not
match a key within
- * the context model.
- */
- void setEntryDirectives( PartReference[] directives ) throws
UnknownKeyException;
-
-}

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-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -38,7 +38,7 @@
import net.dpml.metro.data.ComponentDirective;
import net.dpml.metro.model.ComponentModel;
import net.dpml.metro.model.ContextModel;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ContextManager;

import net.dpml.configuration.Configuration;


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-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -43,7 +43,7 @@
import net.dpml.metro.model.ComponentModel;
import net.dpml.metro.control.ComponentHandler;
import net.dpml.metro.control.PartsManager;
-import net.dpml.metro.control.ComponentModelManager;
+import net.dpml.metro.control.ComponentManager;

import net.dpml.logging.Logger;

@@ -299,11 +299,11 @@
* Return the component model assiged to the handler.
* @return the component model
*/
- public ComponentModelManager getComponentModelManager()
+ public ComponentManager getComponentManager()
{
- if( m_model instanceof ComponentModelManager )
+ if( m_model instanceof ComponentManager )
{
- return (ComponentModelManager) m_model;
+ return (ComponentManager) m_model;
}
else
{

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-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -34,8 +34,8 @@
import net.dpml.metro.info.PartReference;
import net.dpml.metro.model.ComponentModel;
import net.dpml.metro.model.ContextModel;
-import net.dpml.metro.control.ComponentModelManager;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.ContextManager;

import net.dpml.part.Directive;
import net.dpml.part.ActivationPolicy;
@@ -62,7 +62,7 @@
* @version @PROJECT-VERSION@
*/
class DefaultComponentModel extends UnicastEventSource
- implements ComponentModel, ComponentModelManager, Configurable
+ implements ComponentModel, ComponentManager, Configurable
{
//
------------------------------------------------------------------------
// state
@@ -315,11 +315,11 @@
* Return the context manager.
* @return the context manager
*/
- public ContextModelManager getContextModelManager()
+ public ContextManager getContextManager()
{
- if( m_context instanceof ContextModelManager )
+ if( m_context instanceof ContextManager )
{
- return (ContextModelManager) m_context;
+ return (ContextManager) m_context;
}
else
{

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-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -35,7 +35,7 @@
import net.dpml.metro.model.ContextModel;
import net.dpml.metro.model.ValidationException;
import net.dpml.metro.model.ValidationException.Issue;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ContextManager;

import net.dpml.logging.Logger;

@@ -52,7 +52,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-class DefaultContextModel extends UnicastEventSource implements
ContextModel, ContextModelManager
+class DefaultContextModel extends UnicastEventSource implements
ContextModel, ContextManager
{
//
------------------------------------------------------------------------
// immutable state

Modified:
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
===================================================================
---
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -27,8 +27,8 @@

import net.dpml.metro.control.PartsManager;
import net.dpml.metro.control.ComponentHandler;
-import net.dpml.metro.control.ComponentModelManager;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.ContextManager;

import net.dpml.lang.UnknownKeyException;


Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -96,7 +96,7 @@
assertEquals( "initial-activation", ActivationPolicy.STARTUP,
m_model.getActivationPolicy() );
ActivationPolicy policy = ActivationPolicy.DEMAND;

- // uncomment remainder as this is under the ComponentModelManager
+ // uncomment remainder as this is under the ComponentManager
//m_model.setActivationPolicy( policy );
//assertEquals( "mutated-activation", policy,
m_model.getActivationPolicy() );
}
@@ -119,7 +119,7 @@
assertEquals( "initial-collection", CollectionPolicy.SYSTEM,
m_model.getCollectionPolicy() );
CollectionPolicy policy = CollectionPolicy.SOFT;

- // uncomment remainder as this is under the ComponentModelManager
+ // uncomment remainder as this is under the ComponentManager
//m_model.setCollectionPolicy( policy );
//assertEquals( "mutated-collection", policy,
m_model.getCollectionPolicy() );
}

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -27,8 +27,8 @@
import net.dpml.part.local.Controller;
import net.dpml.metro.data.ValueDirective;
import net.dpml.metro.info.EntryDescriptor;
-import net.dpml.metro.control.ComponentModelManager;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.ContextManager;
import net.dpml.metro.model.ContextModel;
import net.dpml.metro.model.ValidationException;
import net.dpml.metro.model.ValidationException.Issue;
@@ -40,7 +40,7 @@
*/
public class ContextModelTestCase extends TestCase
{
- private ComponentModelManager m_model;
+ private ComponentManager m_model;

/**
* Testcase setup during which the part definition 'example.part'
@@ -52,7 +52,7 @@
final String path = "example.part";
final File test = new File( System.getProperty( "project.test.dir" )
);
final URI uri = new File( test, path ).toURI();
- m_model = (ComponentModelManager) Controller.STANDARD.createModel(
uri );
+ m_model = (ComponentManager) Controller.STANDARD.createModel( uri );
}

/**
@@ -61,7 +61,7 @@
*/
public void testContextModel() throws Exception
{
- ContextModelManager context = m_model.getContextModelManager();
+ ContextManager context = m_model.getContextManager();
assertNotNull( "context", context );
EntryDescriptor[] entries = context.getEntryDescriptors();
assertEquals( "entries", 1, entries.length );
@@ -83,7 +83,7 @@
*/
public void testValidationWithoutCause() throws Exception
{
- ContextModelManager context = m_model.getContextModelManager();
+ ContextManager context = m_model.getContextManager();
context.validate();
}

@@ -93,7 +93,7 @@
*/
public void testValidationWithCause() throws Exception
{
- ContextModelManager context = m_model.getContextModelManager();
+ ContextManager context = m_model.getContextManager();
context.setEntryDirective( "color", null );
try
{

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-01-25 11:17:50 UTC (rev 974)
@@ -30,8 +30,8 @@
import net.dpml.metro.data.ValueDirective;
import net.dpml.metro.model.ComponentModel;
import net.dpml.metro.model.ContextModel;
-import net.dpml.metro.control.ComponentModelManager;
-import net.dpml.metro.control.ContextModelManager;
+import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.ContextManager;

/**
* Test aspects of the component model implementation.
@@ -40,7 +40,7 @@
*/
public class ObserverTestCase extends TestCase
{
- private ComponentModelManager m_model;
+ private ComponentManager m_model;

/**
* Test case setup.
@@ -51,7 +51,7 @@
final String path = "observer.part";
final File test = new File( System.getProperty( "project.test.dir" )
);
final URI uri = new File( test, path ).toURI();
- m_model = (ComponentModelManager) Controller.STANDARD.createModel(
uri );
+ m_model = (ComponentManager) Controller.STANDARD.createModel( uri );
}

/**
@@ -60,7 +60,7 @@
*/
public void testContextModel() throws Exception
{
- ContextModelManager context = (ContextModelManager)
m_model.getContextModelManager();
+ ContextManager context = (ContextManager)
m_model.getContextManager();
Component component = Controller.STANDARD.createComponent(
(ComponentModel) m_model );
Provider provider = component.getProvider();
Object instance = provider.getValue( false );




  • r974 - in trunk/main/metro: exec/src/main/net/dpml/metro/exec model/src/main/net/dpml/metro/control runtime/src/main/net/dpml/metro/runtime test/src/main/net/dpml/test/composite test/src/test/net/dpml/metro/runtime/test, mcconnell at BerliOS, 01/25/2006

Archive powered by MHonArc 2.6.24.

Top of Page