Skip to Content.
Sympa Menu

notify-dpml - r973 - in trunk/main: central/src/docs/about/notepad/freight metro metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro/control metro/model/src/main/net/dpml/metro/model metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/main/net/dpml/test/app metro/test/src/main/net/dpml/test/composite metro/test/src/test/net/dpml/metro/runtime/test planet/http

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: r973 - in trunk/main: central/src/docs/about/notepad/freight metro metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro/control metro/model/src/main/net/dpml/metro/model metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/main/net/dpml/test/app metro/test/src/main/net/dpml/test/composite metro/test/src/test/net/dpml/metro/runtime/test planet/http
  • Date: Wed, 25 Jan 2006 12:14:53 +0100

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

Added:

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

trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
trunk/main/metro/model/src/main/net/dpml/metro/control/PartsManager.java
Removed:

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

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

trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelManager.java
Modified:
trunk/main/central/src/docs/about/notepad/freight/observations.xml
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/model/src/main/net/dpml/metro/model/ComponentModel.java

trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelOperations.java
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java

trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelOperations.java
trunk/main/metro/module.xml

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/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java

trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
trunk/main/metro/test/src/main/net/dpml/test/app/Demo.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/CompositeTestCase.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

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

Modified: trunk/main/central/src/docs/about/notepad/freight/observations.xml
===================================================================
--- trunk/main/central/src/docs/about/notepad/freight/observations.xml
2006-01-25 01:02:47 UTC (rev 972)
+++ trunk/main/central/src/docs/about/notepad/freight/observations.xml
2006-01-25 11:14:50 UTC (rev 973)
@@ -85,7 +85,7 @@
<li>Packaging of default part with a component (e.g.
[classname].parts) is required.</li>
<li>The &lt;type&gt; task needs to be updated to include the
part association or we could put in place a .parts serialized object
colocated with the class.</li>
<li>Parts builders need to updated to load and check for
pre-declared default part entries.</li>
- <li>The ComponentManager is not currently implemented
(however, it is expected that this will follow closely the general approach
used for context management.</li>
+ <li>The PartsManager is not currently implemented (however, it
is expected that this will follow closely the general approach used for
context management.</li>
</ol>
</li>
<li>integration between FT and classic

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 01:02:47 UTC (rev 972)
+++ trunk/main/metro/exec/src/main/net/dpml/metro/exec/ComponentAdapter.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -44,6 +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.configuration.Configurable;
import net.dpml.configuration.Configuration;
@@ -155,10 +157,10 @@
throw new UnsupportedOperationException( "Parameters not
currently supported." );
}

- if( model instanceof ComponentModel )
+ if( model instanceof ComponentModelManager )
{
- ComponentModel componentModel = (ComponentModel) model;
- ContextModel cm = componentModel.getContextModel();
+ ComponentModelManager componentModel = (ComponentModelManager)
model;
+ ContextModelManager cm = componentModel.getContextModelManager();
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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentHandler.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -44,7 +44,18 @@
* Return the component model associated with the component handler.
* @return the component model
*/
- ComponentModel getComponentModel();
+ //ComponentModel getComponentModel();

+ /**
+ * Return the component model manager associated with the component
handler.
+ * @return the component model manager
+ */
+ ComponentModelManager getComponentModelManager();
+
+ /**
+ * Return the internal parts manager.
+ * @return the parts manager
+ */
+ PartsManager getPartsManager();
}


Deleted:
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -1,67 +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 net.dpml.part.ControlException;
-import net.dpml.part.remote.Component;
-import net.dpml.part.remote.Model;
-
-import net.dpml.lang.UnknownKeyException;
-
-/**
- * Local interface through which a component implementation may
- * interact with subsidary parts.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface ComponentManager
-{
- /**
- * Return the array of keys used to idenetity internal parts.
- * @return the part key array
- */
- String[] getKeys();
-
- /**
- * Return a local component handler.
- * @param key the internal part key
- * @return the local component handler
- * @exception UnknownKeyException the key is not recognized
- */
- ComponentHandler getComponentHandler( String key ) throws
UnknownKeyException;
-
- /**
- * Return the commissioned state of the part collection.
- * @return true if commissioned else false
- */
- boolean isCommissioned();
-
- /**
- * Initiate the oprdered activation of all internal parts.
- * @exception ControlException if an activation error occurs
- */
- void commission() throws ControlException;
-
- /**
- * Initiate deactivation of all internal parts.
- */
- void decommission();
-}
-

Copied:
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java
(from rev 970,
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelManager.java)
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelManager.java
2006-01-24 17:07:29 UTC (rev 970)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -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 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/ContextModelManager.java
(from rev 970,
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelManager.java)
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelManager.java
2006-01-24 17:07:29 UTC (rev 970)
+++
trunk/main/metro/model/src/main/net/dpml/metro/control/ContextModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -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 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;
+
+}

Copied:
trunk/main/metro/model/src/main/net/dpml/metro/control/PartsManager.java
(from rev 971,
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java)
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/control/ComponentManager.java
2006-01-24 17:13:25 UTC (rev 971)
+++ trunk/main/metro/model/src/main/net/dpml/metro/control/PartsManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -0,0 +1,67 @@
+/*
+ * 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 net.dpml.part.ControlException;
+import net.dpml.part.remote.Component;
+import net.dpml.part.remote.Model;
+
+import net.dpml.lang.UnknownKeyException;
+
+/**
+ * Local interface through which a component implementation may
+ * interact with subsidary parts.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface PartsManager
+{
+ /**
+ * Return the array of keys used to idenetity internal parts.
+ * @return the part key array
+ */
+ String[] getKeys();
+
+ /**
+ * Return a local component handler.
+ * @param key the internal part key
+ * @return the local component handler
+ * @exception UnknownKeyException the key is not recognized
+ */
+ ComponentHandler getComponentHandler( String key ) throws
UnknownKeyException;
+
+ /**
+ * Return the commissioned state of the part collection.
+ * @return true if commissioned else false
+ */
+ boolean isCommissioned();
+
+ /**
+ * Initiate the oprdered activation of all internal parts.
+ * @exception ControlException if an activation error occurs
+ */
+ void commission() throws ControlException;
+
+ /**
+ * Initiate deactivation of all internal parts.
+ */
+ void decommission();
+}
+

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
2006-01-25 01:02:47 UTC (rev 972)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModel.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -41,7 +41,14 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public interface ComponentModel extends Model, ComponentModelManager
+public interface ComponentModel extends Model, ComponentModelOperations
{
+ /**
+ * Return the current context model.
+ *
+ * @return the context model
+ * @exception RemoteException if a remote exception occurs
+ */
+ ContextModel getContextModel() throws RemoteException;
}


Deleted:
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelManager.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelManager.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -1,50 +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.model;
-
-import java.rmi.RemoteException;
-
-import net.dpml.metro.info.CollectionPolicy;
-
-import net.dpml.part.ActivationPolicy;
-
-/**
- * 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
-{
- /**
- * 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 ) throws
RemoteException;
-
- /**
- * Override the assigned collection policy.
- * @param policy the collection policy value
- * @exception RemoteException if a remote exception occurs
- */
- void setCollectionPolicy( CollectionPolicy policy ) throws
RemoteException;
-}
-

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelOperations.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelOperations.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/model/src/main/net/dpml/metro/model/ComponentModelOperations.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -84,14 +84,6 @@
CollectionPolicy getCollectionPolicy() throws RemoteException;

/**
- * Return the current context model.
- *
- * @return the context model
- * @exception RemoteException if a remote exception occurs
- */
- ContextModel getContextModel() throws RemoteException;
-
- /**
* Return the set of component model keys.
* @return the component part keys
* @exception RemoteException if a remote exception occurs

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
2006-01-25 01:02:47 UTC (rev 972)
+++ trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModel.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -33,39 +33,6 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public interface ContextModel extends Remote, ContextModelManager
+public interface ContextModel extends Remote, ContextModelOperations
{
- /**
- * Return the set of context entries descriptors.
- *
- * @return context entry descriptor array
- * @exception RemoteException if a remote exception occurs
- */
- EntryDescriptor[] getEntryDescriptors() throws RemoteException;
-
- /**
- * Return a of context entry descriptor.
- *
- * @param key the entry key
- * @return the entry descriptor
- * @exception UnknownKeyException if the key is unknown
- * @exception RemoteException if a remote exception occurs
- */
- EntryDescriptor getEntryDescriptor( String key ) throws
UnknownKeyException, RemoteException;
-
- /**
- * Return the current directive assigned to a context entry.
- * @param key the context entry key
- * @return the directive
- * @exception UnknownKeyException if the key is unknown
- * @exception RemoteException if a remote exception occurs
- */
- Directive getEntryDirective( String key ) throws UnknownKeyException,
RemoteException;
-
- /**
- * Validate the model.
- * @exception ValidationException if one or more issues exist within the
model
- * @exception RemoteException if a remote exception occurs
- */
- void validate() throws ValidationException, RemoteException;
}

Deleted:
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelManager.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelManager.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -1,59 +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.model;
-
-import java.rmi.RemoteException;
-
-import net.dpml.metro.info.PartReference;
-import net.dpml.part.Directive;
-
-import net.dpml.lang.UnknownKeyException;
-
-
-/**
- * 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 directive value.
- * @param key the context entry key
- * @param directive the context entry directive
- * @exception UnknownKeyException if the key is unknown
- * @exception RemoteException if a remote exception occurs
- */
- void setEntryDirective( String key, Directive directive ) throws
UnknownKeyException, RemoteException;
-
- /**
- * 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.
- * @exception RemoteException if a remote exception occurs
- */
- void setEntryDirectives( PartReference[] directives ) throws
UnknownKeyException, RemoteException;
-
-}

Modified:
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelOperations.java
===================================================================
---
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelOperations.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/model/src/main/net/dpml/metro/model/ContextModelOperations.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -26,7 +26,6 @@

import net.dpml.lang.UnknownKeyException;

-
/**
* The ContextModelOperations interface defines the common local and
remotely accessible component context.
*

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-01-25 01:02:47 UTC (rev 972)
+++ trunk/main/metro/module.xml 2006-01-25 11:14:50 UTC (rev 973)
@@ -105,7 +105,6 @@
</types>
<dependencies>
<include ref="dpml/util/dpml-logging-api" tag="public"/>
- <!--<include ref="dpml/util/dpml-activity-api" tag="public"/>-->
<include ref="dpml/util/dpml-parameters-impl"/>
<include ref="dpml/util/dpml-configuration-impl"/>
<include key="dpml-state-impl"/>

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -38,6 +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.configuration.Configuration;

@@ -48,7 +49,7 @@
import net.dpml.part.Directive;
import net.dpml.part.ControlException;
import net.dpml.part.Version;
-import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.PartsManager;
import net.dpml.part.remote.Component;
import net.dpml.part.remote.Model;
import net.dpml.part.ServiceNotFoundException;
@@ -465,7 +466,7 @@
Class clazz = getInnerClass( subject, "$Parts" );
if( null == clazz )
{
- return ComponentManager.class;
+ return PartsManager.class;
}
else
{
@@ -549,7 +550,7 @@
private Object createPartsInvocationHandler( DefaultComponentHandler
handler, Class clazz )
throws ControlException
{
- DefaultComponentManager manager = handler.getComponentManager();
+ PartsManager manager = handler.getPartsManager();
try
{
InvocationHandler invocationHandler = new
PartsInvocationHandler( manager );
@@ -563,7 +564,7 @@
throw new ControllerException( error, e );
}
}
-
+
String getPathForLogger( DefaultComponentHandler handler )
{
String path = handler.getPath();
@@ -575,13 +576,18 @@
try
{
ComponentModel model = handler.getComponentModel();
+ ContextModel context = model.getContextModel();
+
+ // check for an overriding locally assigned value
+
Map map = handler.getContextMap();
if( map.containsKey( key ) )
{
- return map.get( key );
- // TODO: validation of values mapping to return type
prerequisies
+ return map.get( key );
}
- ContextModel context = model.getContextModel();
+
+ // resolve using defaults
+
Directive directive = context.getEntryDirective( key );
if( null == directive )
{

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -42,6 +42,8 @@
import net.dpml.metro.data.CategoryDirective;
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.logging.Logger;

@@ -105,7 +107,8 @@
* @see ComponentModel
* @see Provider
*/
-public class DefaultComponentHandler extends UnicastEventSource implements
Component, ComponentHandler, Disposable, ModelListener
+public class DefaultComponentHandler extends UnicastEventSource
+ implements Component, ComponentHandler, Disposable, ModelListener
{

//--------------------------------------------------------------------------
// immutable state
@@ -124,11 +127,9 @@
private final Holder m_holder;
private final Component m_parent;
private final PropertyChangeSupport m_support;
-
+ private final Map m_cache = new Hashtable(); // context overloading
entry/value cache
private final Map m_map = new Hashtable(); // symbolic value map
- private final Map m_cache = new Hashtable(); // context entry/value cache
-
- private final DefaultComponentManager m_parts;
+ private final DefaultPartsManager m_parts;
private final boolean m_flag;


//--------------------------------------------------------------------------
@@ -244,7 +245,7 @@
// need to establish all of the component parts that are children of
this
// component.

- m_parts = new DefaultComponentManager( control, this, logger );
+ m_parts = new DefaultPartsManager( control, this, logger );

getLogger().debug( "component controller [" + this + "] established"
);
}
@@ -270,16 +271,6 @@

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

/**
- * Return a mutable context map.
- *
- * @return the context map
- */
- public Map getContextMap()
- {
- return m_cache;
- }
-
- /**
* Return an <tt>Provider</tt> holder. The value returned will be a
function
* of the lifestyle policy implemented by the component.
*
@@ -304,6 +295,34 @@
return m_model;
}

+ /**
+ * Return the component model assiged to the handler.
+ * @return the component model
+ */
+ public ComponentModelManager getComponentModelManager()
+ {
+ if( m_model instanceof ComponentModelManager )
+ {
+ return (ComponentModelManager) m_model;
+ }
+ else
+ {
+ final String error =
+ "Cannot cast componet model to the manager interface.";
+ throw new IllegalStateException( error );
+ }
+ }
+
+ /**
+ * Return a mutible context map.
+ *
+ * @return the context map
+ */
+ public Map getContextMap()
+ {
+ return m_cache;
+ }
+

//--------------------------------------------------------------------------
// Component

//--------------------------------------------------------------------------
@@ -559,7 +578,7 @@
// DefaultComponentHandler

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

- DefaultComponentManager getComponentManager()
+ public PartsManager getPartsManager()
{
return m_parts;
}

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -34,6 +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.part.Directive;
import net.dpml.part.ActivationPolicy;
@@ -59,7 +61,8 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-class DefaultComponentModel extends UnicastEventSource implements
ComponentModel, Configurable
+class DefaultComponentModel extends UnicastEventSource
+ implements ComponentModel, ComponentModelManager, Configurable
{
//
------------------------------------------------------------------------
// state
@@ -309,6 +312,24 @@
}

/**
+ * Return the context manager.
+ * @return the context manager
+ */
+ public ContextModelManager getContextModelManager()
+ {
+ if( m_context instanceof ContextModelManager )
+ {
+ return (ContextModelManager) m_context;
+ }
+ else
+ {
+ final String error =
+ "Cannot cast context model to the manager interface.";
+ throw new IllegalStateException( error );
+ }
+ }
+
+ /**
* Return the set of component model keys.
* @return the component part keys
*/

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -25,6 +25,7 @@
import java.util.EventObject;
import java.util.EventListener;
import java.util.Map;
+import java.util.Hashtable;

import net.dpml.metro.data.ContextDirective;
import net.dpml.metro.info.EntryDescriptor;
@@ -34,6 +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.logging.Logger;

@@ -50,7 +52,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-class DefaultContextModel extends UnicastEventSource implements ContextModel
+class DefaultContextModel extends UnicastEventSource implements
ContextModel, ContextModelManager
{
//
------------------------------------------------------------------------
// immutable state
@@ -62,7 +64,7 @@
private final Map m_contextTable =
Collections.synchronizedMap( new HashMap() ); // (key,directive)
private final DefaultComponentModel m_parent;
-
+
//
------------------------------------------------------------------------
// mutable state
//
------------------------------------------------------------------------
@@ -164,7 +166,7 @@
//
------------------------------------------------------------------------
// ContextModel
//
------------------------------------------------------------------------
-
+
/**
* Validate the model.
* @exception ValidationException if one or more issues exist within the
model

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-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -30,7 +30,7 @@
import net.dpml.part.ControlException;
import net.dpml.part.remote.Component;
import net.dpml.part.remote.Model;
-import net.dpml.metro.control.ComponentManager;
+import net.dpml.metro.control.PartsManager;
import net.dpml.metro.control.ComponentHandler;

import net.dpml.lang.UnknownKeyException;
@@ -41,7 +41,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-class DefaultComponentManager implements ComponentManager
+class DefaultPartsManager implements PartsManager
{
//-------------------------------------------------------------------
// state
@@ -74,7 +74,7 @@
* @param handler the component handler
* @param logger the logging channel
*/
- DefaultComponentManager( ComponentController control,
DefaultComponentHandler handler, Logger logger )
+ DefaultPartsManager( ComponentController control,
DefaultComponentHandler handler, Logger logger )
throws ControlException, RemoteException
{
m_handler = handler;
@@ -121,7 +121,7 @@
}

//-------------------------------------------------------------------
- // ComponentManager
+ // PartsManager
//-------------------------------------------------------------------

/**

Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/PartsInvocationHandler.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -23,8 +23,8 @@
import java.lang.reflect.Method;

import net.dpml.metro.control.ComponentHandler;
+import net.dpml.metro.control.PartsManager;
import net.dpml.part.remote.Component;
-import net.dpml.metro.control.ComponentManager;

/**
* Invoication handler for the Context inner class. The invocation handler
is
@@ -43,18 +43,18 @@
/**
* The component.
*/
- private final DefaultComponentManager m_manager;
+ private final PartsManager m_manager;

//-------------------------------------------------------------------
// constructor
//-------------------------------------------------------------------

/**
- * Create a context invocation handler.
+ * Create a parts invocation handler.
*
* @param handler the component handler
*/
- PartsInvocationHandler( DefaultComponentManager manager )
+ PartsInvocationHandler( PartsManager manager )
{
m_manager = manager;
}
@@ -75,21 +75,21 @@
*/
public Object invoke( final Object proxy, final Method method, final
Object[] args ) throws Throwable
{
- Class source = method.getDeclaringClass();
+ final Class source = method.getDeclaringClass();
if( Object.class == source )
{
return method.invoke( this, args );
}
- else if( ComponentManager.class == source )
+ else if( PartsManager.class == source )
{
return method.invoke( m_manager, args );
}

- int semantic = getPartSemantic( method );
- String postfix = getPartPostfix( method );
- String key = getPartKey( method, semantic );
+ final int semantic = getPartSemantic( method );
+ final String postfix = getPartPostfix( method );
+ final String key = getPartKey( method, semantic );

- ComponentHandler handler = m_manager.getComponentHandler( key );
+ final ComponentHandler handler = m_manager.getComponentHandler( key
);

if( GET == semantic )
{
@@ -232,14 +232,18 @@
{
return COMPONENT_KEY;
}
- if( name.endsWith( MAP_KEY ) )
+ else if( name.endsWith( HANDLER_KEY ) )
{
- return MAP_KEY;
+ return HANDLER_KEY;
}
- if( name.endsWith( PROVIDER_KEY ) )
+ else if( name.endsWith( PROVIDER_KEY ) )
{
return PROVIDER_KEY;
}
+ else if( name.endsWith( MAP_KEY ) )
+ {
+ return MAP_KEY;
+ }
else
{
return null;
@@ -258,23 +262,23 @@
String substring = name.substring( 0, j );
return formatKey( substring, 3 );
}
- else if( name.endsWith( MAP_KEY ) )
+ else if( name.endsWith( PROVIDER_KEY ) )
{
- int n = MAP_KEY.length();
+ int n = PROVIDER_KEY.length();
int j = name.length() - n;
String substring = name.substring( 0, j );
return formatKey( substring, 3 );
}
- else if( name.endsWith( PROVIDER_KEY ) )
+ else if( name.endsWith( HANDLER_KEY ) )
{
- int n = PROVIDER_KEY.length();
+ int n = HANDLER_KEY.length();
int j = name.length() - n;
String substring = name.substring( 0, j );
return formatKey( substring, 3 );
}
- else if( name.endsWith( HANDLER_KEY ) )
+ else if( name.endsWith( MAP_KEY ) )
{
- int n = HANDLER_KEY.length();
+ int n = MAP_KEY.length();
int j = name.length() - n;
String substring = name.substring( 0, j );
return formatKey( substring, 3 );
@@ -335,7 +339,7 @@
public static final String GET_KEY = "get";
public static final String RELEASE_KEY = "release";
public static final String COMPONENT_KEY = "Component";
- public static final String MAP_KEY = "Map";
public static final String PROVIDER_KEY = "Provider";
public static final String HANDLER_KEY = "Handler";
+ public static final String MAP_KEY = "Map";
}
\ No newline at end of file

Modified: trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java
===================================================================
--- trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java 2006-01-25
01:02:47 UTC (rev 972)
+++ trunk/main/metro/test/src/main/net/dpml/test/app/Demo.java 2006-01-25
11:14:50 UTC (rev 973)
@@ -20,7 +20,7 @@

import net.dpml.logging.Logger;

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

/**
@@ -32,7 +32,7 @@
*/
public class Demo
{
- private final ComponentManager m_parts;
+ private final PartsManager m_parts;
private final Logger m_logger;

/**
@@ -40,7 +40,7 @@
* @param logger a logging channel
* @param parts the internal parts
*/
- public Demo( Logger logger, ComponentManager parts )
+ public Demo( Logger logger, PartsManager parts )
{
m_logger = logger;
m_parts = parts;

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/test/src/main/net/dpml/test/composite/PartsComponent.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -25,8 +25,10 @@

import net.dpml.test.ColorManager;

-import net.dpml.metro.control.ComponentManager;
+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.lang.UnknownKeyException;

@@ -74,7 +76,7 @@
/**
* The assigned part manager.
*/
- private final ComponentManager m_parts;
+ private final PartsManager m_parts;

//------------------------------------------------------------------
// constructor
@@ -88,7 +90,7 @@
* @exception UnknownKeyException if the implementation uses a bad
reference
*/
public PartsComponent(
- final Logger logger, final Context context, final ComponentManager
parts )
+ final Logger logger, final Context context, final PartsManager parts )
throws UnknownKeyException
{
logger.debug( "instantiation" );
@@ -98,8 +100,7 @@
m_parts = parts;

ComponentHandler handler = parts.getComponentHandler( "child" );
- Map map = handler.getContextMap();
- map.put( "color", context.getColor() );
+ handler.getContextMap().put( "color", context.getColor() );
}

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

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ComponentModelTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -95,8 +95,10 @@
{
assertEquals( "initial-activation", ActivationPolicy.STARTUP,
m_model.getActivationPolicy() );
ActivationPolicy policy = ActivationPolicy.DEMAND;
- m_model.setActivationPolicy( policy );
- assertEquals( "mutated-activation", policy,
m_model.getActivationPolicy() );
+
+ // uncomment remainder as this is under the ComponentModelManager
+ //m_model.setActivationPolicy( policy );
+ //assertEquals( "mutated-activation", policy,
m_model.getActivationPolicy() );
}

/**
@@ -116,34 +118,36 @@
{
assertEquals( "initial-collection", CollectionPolicy.SYSTEM,
m_model.getCollectionPolicy() );
CollectionPolicy policy = CollectionPolicy.SOFT;
- m_model.setCollectionPolicy( policy );
- assertEquals( "mutated-collection", policy,
m_model.getCollectionPolicy() );
+
+ // uncomment remainder as this is under the ComponentModelManager
+ //m_model.setCollectionPolicy( policy );
+ //assertEquals( "mutated-collection", policy,
m_model.getCollectionPolicy() );
}

/**
* Test the component part keys.
* @exception Exception if an unexpected error occurs
*/
- public void testPartKeys() throws Exception
- {
- String[] keys = m_model.getPartKeys();
- assertEquals( "parts-length", 0, keys.length );
- }
+ //public void testPartKeys() throws Exception
+ //{
+ // String[] keys = m_model.getPartKeys();
+ // assertEquals( "parts-length", 0, keys.length );
+ //}

/**
* Test an unknown part request failure.
* @exception Exception if an unexpected error occurs
*/
- public void testUnknownPart() throws Exception
- {
- try
- {
- ComponentModel child = m_model.getComponentModel( "xyz" );
- }
- catch( UnknownKeyException e )
- {
- // correct
- }
- }
+ //public void testUnknownPart() throws Exception
+ //{
+ // try
+ // {
+ // ComponentModel child = m_model.getComponentModel( "xyz" );
+ // }
+ // catch( UnknownKeyException e )
+ // {
+ // // correct
+ // }
+ //}

}

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/CompositeTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -80,8 +80,8 @@
public void testOverloadedComposite() throws Exception
{
Component component = CONTROLLER.createComponent( m_uri );
- ComponentHandler manager = (ComponentHandler) component;
- manager.getContextMap().put( "color", Color.YELLOW );
+ ComponentHandler handler = (ComponentHandler) component;
+ handler.getContextMap().put( "color", Color.YELLOW );
Provider instance = component.getProvider();
CompositeComponent parent = (CompositeComponent) instance.getValue(
false );
Color color = parent.getColor();

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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ContextModelTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -27,7 +27,8 @@
import net.dpml.part.local.Controller;
import net.dpml.metro.data.ValueDirective;
import net.dpml.metro.info.EntryDescriptor;
-import net.dpml.metro.model.ComponentModel;
+import net.dpml.metro.control.ComponentModelManager;
+import net.dpml.metro.control.ContextModelManager;
import net.dpml.metro.model.ContextModel;
import net.dpml.metro.model.ValidationException;
import net.dpml.metro.model.ValidationException.Issue;
@@ -39,7 +40,7 @@
*/
public class ContextModelTestCase extends TestCase
{
- private ComponentModel m_model;
+ private ComponentModelManager m_model;

/**
* Testcase setup during which the part definition 'example.part'
@@ -51,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 = (ComponentModel) Controller.STANDARD.createModel( uri );
+ m_model = (ComponentModelManager) Controller.STANDARD.createModel(
uri );
}

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

@@ -92,7 +93,7 @@
*/
public void testValidationWithCause() throws Exception
{
- ContextModel context = m_model.getContextModel();
+ ContextModelManager context = m_model.getContextModelManager();
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 01:02:47 UTC (rev 972)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ObserverTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -30,6 +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;

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

/**
* Test case setup.
@@ -49,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 = (ComponentModel) Controller.STANDARD.createModel( uri );
+ m_model = (ComponentModelManager) Controller.STANDARD.createModel(
uri );
}

/**
@@ -58,8 +60,8 @@
*/
public void testContextModel() throws Exception
{
- ContextModel context = (ContextModel) m_model.getContextModel();
- Component component = Controller.STANDARD.createComponent( m_model );
+ ContextModelManager context = (ContextModelManager)
m_model.getContextModelManager();
+ Component component = Controller.STANDARD.createComponent(
(ComponentModel) m_model );
Provider provider = component.getProvider();
Object instance = provider.getValue( false );
String key = "color";

Modified:
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
===================================================================
---
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
2006-01-25 01:02:47 UTC (rev 972)
+++
trunk/main/metro/test/src/test/net/dpml/metro/runtime/test/ProviderTestCase.java
2006-01-25 11:14:50 UTC (rev 973)
@@ -220,33 +220,6 @@
}
}

- /**
- * Test provider context mutation.
- * @exception Exception if an error occurs
- */
- public void testContextMutation() throws Exception
- {
- ComponentModel model = (ComponentModel) CONTROLLER.createModel(
m_uri );
- Component component = Controller.STANDARD.createComponent( model );
- component.activate();
- try
- {
- Provider instance = component.getProvider();
- ColorManager manager = (ColorManager) instance.getValue( true );
- Color color = manager.getColor();
- assertEquals( "initial-color", Color.RED, color );
- ValueDirective newDirective = new ValueDirective(
Color.class.getName(), "BLUE", (String) null );
- ContextModel context = (ContextModel) model.getContextModel();
- context.setEntryDirective( "color", newDirective );
- color = manager.getColor();
- assertEquals( "mutated-color", Color.BLUE, color );
- }
- finally
- {
- component.deactivate();
- }
- }
-
static
{
System.setProperty(

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-01-25 01:02:47 UTC (rev 972)
+++ trunk/main/planet/http/module.xml 2006-01-25 11:14:50 UTC (rev 973)
@@ -57,6 +57,7 @@
<property name="project.test.halt-on-failure" value="true"/>
</properties>
<dependencies>
+ <include ref="dpml/metro/dpml-metro-model"/>
<include urn="artifact:jar:servletapi/servletapi#2.3" tag="public"/>
<include key="dpml-http-impl"/>
</dependencies>




  • r973 - in trunk/main: central/src/docs/about/notepad/freight metro metro/exec/src/main/net/dpml/metro/exec metro/model/src/main/net/dpml/metro/control metro/model/src/main/net/dpml/metro/model metro/runtime/src/main/net/dpml/metro/runtime metro/test/src/main/net/dpml/test/app metro/test/src/main/net/dpml/test/composite metro/test/src/test/net/dpml/metro/runtime/test planet/http, mcconnell at BerliOS, 01/25/2006

Archive powered by MHonArc 2.6.24.

Top of Page