Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap: [85] trunk/Source/StructureMap
|
From: <jer...@us...> - 2008-05-03 03:25:11
|
Revision: 85
http://structuremap.svn.sourceforge.net/structuremap/?rev=85&view=rev
Author: jeremydmiller
Date: 2008-05-02 20:24:24 -0700 (Fri, 02 May 2008)
Log Message:
-----------
refactoring PluginGraph and FamilyParser, deleting Caching
Modified Paths:
--------------
trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs
trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Expressions/ScanAssembliesExpression.cs
trunk/Source/StructureMap/Configuration/DSL/Registry.cs
trunk/Source/StructureMap/Configuration/FamilyParser.cs
trunk/Source/StructureMap/Configuration/IGraphBuilder.cs
trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs
trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs
trunk/Source/StructureMap/Graph/AssemblyGraph.cs
trunk/Source/StructureMap/Graph/AssemblyGraphCollection.cs
trunk/Source/StructureMap/Graph/Plugin.cs
trunk/Source/StructureMap/Graph/PluginGraph.cs
trunk/Source/StructureMap/ObjectFactory.cs
trunk/Source/StructureMap/Pipeline/ConfiguredInstance.cs
trunk/Source/StructureMap/Pipeline/Profile.cs
trunk/Source/StructureMap/Source/XmlMementoCreator.cs
trunk/Source/StructureMap/StructureMap.csproj
trunk/Source/StructureMap.Testing/Configuration/FamilyParserTester.cs
trunk/Source/StructureMap.Testing/Container/IntegratedTester.cs
trunk/Source/StructureMap.Testing/Graph/AssemblyGraphTester.cs
trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs
trunk/Source/StructureMap.Testing/ObjectFactoryTester.cs
trunk/Source/StructureMap.Testing/Pipeline/ProfileManagerTester.cs
trunk/Source/StructureMap.Testing/Pipeline/ProfileTester.cs
trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj
Removed Paths:
-------------
trunk/Source/StructureMap/Caching/
trunk/Source/StructureMap/Configuration/Problem.cs
trunk/Source/StructureMap/ObjectFactoryCacheCallback.cs
trunk/Source/StructureMap.Testing/Caching/
Modified: trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/ConfigurationConstants.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,6 +1,6 @@
namespace StructureMap.Configuration
{
- public class ConfigurationConstants
+ public static class ConfigurationConstants
{
public const string CONFIGURED_DEFAULT_KEY_CANNOT_BE_FOUND =
"The default instance key configured for this PluginFamily cannot be found";
@@ -45,9 +45,5 @@
public const string UNKNOWN_PLUGIN_PROBLEM = "Exception occured while attaching a Plugin to a PluginFamily";
public const string VALIDATION_METHOD_FAILURE = "A Validation Method Failed";
-
- private ConfigurationConstants()
- {
- }
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParser.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,5 +1,6 @@
using System;
using System.Collections;
+using System.Collections.Generic;
using System.IO;
using System.Xml;
using StructureMap.Graph;
@@ -14,15 +15,15 @@
public static ConfigurationParser[] GetParsers(XmlDocument document, string includePath)
{
XmlElement node = document.DocumentElement;
-
return GetParsers(node, includePath);
}
+ // TODO -- Clean up. Maybe use some Lambda magic with .Net 3.5?
public static ConfigurationParser[] GetParsers(XmlNode node, string includePath)
{
string folder = string.IsNullOrEmpty(includePath) ? string.Empty : Path.GetDirectoryName(includePath);
- ArrayList list = new ArrayList();
+ List<ConfigurationParser> list = new List<ConfigurationParser>();
list.Add(new ConfigurationParser(node));
@@ -38,6 +39,7 @@
if (fileName == string.Empty)
{
+ // TODO: get rid of throw, put on PluginGraph here
throw new ApplicationException("The File attribute on the Include node is required");
}
@@ -46,6 +48,7 @@
includedPath = Path.Combine(folder, fileName);
includedDoc.Load(includedPath);
+ // TODO: get rid of throw, put on PluginGraph here
ConfigurationParser parser = new ConfigurationParser(includedDoc.DocumentElement);
list.Add(parser);
}
@@ -57,10 +60,11 @@
}
catch (Exception ex)
{
+ // TODO: get rid of throw, put on PluginGraph here
throw new StructureMapException(100, includedPath, ex);
}
- return (ConfigurationParser[]) list.ToArray(typeof (ConfigurationParser));
+ return list.ToArray();
}
@@ -81,6 +85,8 @@
public ConfigurationParser(XmlNode structureMapNode)
{
_structureMapNode = structureMapNode;
+
+ // TODO: 3.5 cleanup with extension method
XmlMementoStyle mementoStyle = XmlMementoStyle.NodeNormalized;
@@ -121,7 +127,11 @@
foreach (XmlElement familyElement in familyNodes)
{
TypePath typePath = TypePath.CreateFromXmlNode(familyElement);
- attachInstances(typePath, familyElement, builder);
+
+ // TODO: Edge case if the PluginType cannot be found
+ Type pluginType = typePath.FindType();
+
+ attachInstances(pluginType, familyElement, builder);
}
}
@@ -166,7 +176,7 @@
}
- private void attachInstances(TypePath pluginTypePath, XmlElement familyElement, IGraphBuilder builder)
+ private void attachInstances(Type pluginType, XmlElement familyElement, IGraphBuilder builder)
{
foreach (XmlNode instanceNode in familyElement.ChildNodes)
{
@@ -176,7 +186,7 @@
}
InstanceMemento memento = _mementoCreator.CreateMemento(instanceNode);
- builder.RegisterMemento(pluginTypePath, memento);
+ builder.RegisterMemento(pluginType, memento);
}
}
Modified: trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/ConfigurationParserCollection.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -5,19 +5,20 @@
namespace StructureMap.Configuration
{
+ // TODO: 3.5 cleanup here
public delegate XmlNode FetchNodeDelegate();
public class ConfigurationParserCollection
{
- private List<FetchNodeDelegate> _fetchers = new List<FetchNodeDelegate>();
+ private readonly List<FetchNodeDelegate> _fetchers = new List<FetchNodeDelegate>();
private bool _ignoreDefaultFile = false;
- private List<string> _otherFiles = new List<string>();
- private bool _UseAndEnforceExistenceOfDefaultFile = false;
+ private readonly List<string> _otherFiles = new List<string>();
+ private bool _useAndEnforceExistenceOfDefaultFile = false;
public bool UseAndEnforceExistenceOfDefaultFile
{
- get { return _UseAndEnforceExistenceOfDefaultFile; }
- set { _UseAndEnforceExistenceOfDefaultFile = value; }
+ get { return _useAndEnforceExistenceOfDefaultFile; }
+ set { _useAndEnforceExistenceOfDefaultFile = value; }
}
@@ -33,7 +34,7 @@
// Pick up the configuration in the default StructureMap.config
string pathToStructureMapConfig = StructureMapConfiguration.GetStructureMapConfigurationPath();
- if ((_UseAndEnforceExistenceOfDefaultFile || File.Exists(pathToStructureMapConfig)) && !_ignoreDefaultFile)
+ if (shouldUseStructureMapConfigFile(pathToStructureMapConfig))
{
addParsersFromFile(pathToStructureMapConfig, list);
}
@@ -52,6 +53,11 @@
return list.ToArray();
}
+ private bool shouldUseStructureMapConfigFile(string pathToStructureMapConfig)
+ {
+ return (_useAndEnforceExistenceOfDefaultFile || File.Exists(pathToStructureMapConfig)) && !_ignoreDefaultFile;
+ }
+
private static void addParsersFromFile(string filename, List<ConfigurationParser> list)
{
try
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/CreatePluginFamilyExpression.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -28,7 +28,7 @@
void IExpression.Configure(PluginGraph graph)
{
- PluginFamily family = graph.LocateOrCreateFamilyForType(_pluginType);
+ PluginFamily family = graph.FindFamily(_pluginType);
family.SetScopeTo(_scope);
foreach (IExpression child in _children)
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/InstanceDefaultExpression.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -37,7 +37,7 @@
{
_instanceKey = Profile.InstanceKeyForProfile(profileName);
_instance.Name = _instanceKey;
- pluginGraph.LocateOrCreateFamilyForType(_pluginType).AddInstance(_instance);
+ pluginGraph.FindFamily(_pluginType).AddInstance(_instance);
}
else if (!string.IsNullOrEmpty(_instanceKey))
{
Modified: trunk/Source/StructureMap/Configuration/DSL/Expressions/ScanAssembliesExpression.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Expressions/ScanAssembliesExpression.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/DSL/Expressions/ScanAssembliesExpression.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -75,7 +75,7 @@
_registry.addExpression(delegate(PluginGraph pluginGraph)
{
PluginFamily family =
- pluginGraph.LocateOrCreateFamilyForType(typeof (PLUGINTYPE));
+ pluginGraph.FindFamily(typeof (PLUGINTYPE));
family.CanUseUnMarkedPlugins = true;
});
Modified: trunk/Source/StructureMap/Configuration/DSL/Registry.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Registry.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/DSL/Registry.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -108,7 +108,7 @@
addExpression(delegate (PluginGraph pluginGraph)
{
- pluginGraph.LocateOrCreateFamilyForType(typeof(PLUGINTYPE)).AddInstance(instance);
+ pluginGraph.FindFamily(typeof(PLUGINTYPE)).AddInstance(instance);
});
return instance;
@@ -159,7 +159,7 @@
public LiteralInstance AddInstanceOf<PLUGINTYPE>(PLUGINTYPE target)
{
LiteralInstance literal = new LiteralInstance(target);
- _graph.LocateOrCreateFamilyForType(typeof(PLUGINTYPE)).AddInstance(literal);
+ _graph.FindFamily(typeof(PLUGINTYPE)).AddInstance(literal);
return literal;
}
@@ -173,7 +173,7 @@
public PrototypeInstance AddPrototypeInstanceOf<PLUGINTYPE>(PLUGINTYPE prototype)
{
PrototypeInstance expression = new PrototypeInstance((ICloneable) prototype);
- _graph.LocateOrCreateFamilyForType(typeof(PLUGINTYPE)).AddInstance(expression);
+ _graph.FindFamily(typeof(PLUGINTYPE)).AddInstance(expression);
return expression;
}
@@ -227,7 +227,7 @@
{
UserControlInstance instance = new UserControlInstance(url);
- PluginFamily family = _graph.LocateOrCreateFamilyForType(typeof (PLUGINTYPE));
+ PluginFamily family = _graph.FindFamily(typeof (PLUGINTYPE));
family.AddInstance(instance);
return instance;
Modified: trunk/Source/StructureMap/Configuration/FamilyParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/FamilyParser.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/FamilyParser.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -17,24 +17,43 @@
_mementoCreator = mementoCreator;
}
+ // TODO: Standard way in this class to get a PluginType, Maybe more into IGraphBuilder
public void ParseFamily(XmlElement familyElement)
{
TypePath typePath = TypePath.CreateFromXmlNode(familyElement);
+
+ // TODO: throw error if PluginType cannot be found. Right here!
+ Type pluginType;
+ try
+ {
+ pluginType = typePath.FindType();
+ }
+ catch (Exception ex)
+ {
+ // TODO: put error in PluginGraph
+ throw new StructureMapException(103, ex, typePath.ClassName, typePath.AssemblyName);
+ }
+
+
string defaultKey = familyElement.GetAttribute(XmlConstants.DEFAULT_KEY_ATTRIBUTE);
-
InstanceScope scope = findScope(familyElement);
- _builder.AddPluginFamily(typePath, defaultKey, scope);
+ _builder.AddPluginFamily(pluginType, defaultKey, scope);
- attachMementoSource(familyElement, typePath);
- attachPlugins(typePath, familyElement);
- attachInterceptors(typePath, familyElement);
+ attachMementoSource(pluginType, familyElement);
+ attachPlugins(pluginType, familyElement);
+ attachInterceptors(pluginType, familyElement);
}
public void ParseDefaultElement(XmlElement element)
{
TypePath pluginTypePath = new TypePath(element.GetAttribute(XmlConstants.PLUGIN_TYPE));
+ // TODO: Gotta throw exception if the type cannot be found
+
+ Type pluginType = pluginTypePath.FindType();
+
+
InstanceScope scope = findScope(element);
string name = element.GetAttribute(XmlConstants.NAME);
if (string.IsNullOrEmpty(name))
@@ -45,18 +64,21 @@
InstanceMemento memento = _mementoCreator.CreateMemento(element);
memento.InstanceKey = name;
- _builder.AddPluginFamily(pluginTypePath, name, scope);
- _builder.RegisterMemento(pluginTypePath, memento);
+ _builder.AddPluginFamily(pluginType, name, scope);
+ _builder.RegisterMemento(pluginType, memento);
}
public void ParseInstanceElement(XmlElement element)
{
TypePath pluginTypePath = new TypePath(element.GetAttribute(XmlConstants.PLUGIN_TYPE));
+ // TODO: gotta throw if type cannot be found
+ Type pluginType = pluginTypePath.FindType();
+
InstanceScope scope = findScope(element);
InstanceMemento memento = _mementoCreator.CreateMemento(element);
- _builder.RegisterMemento(pluginTypePath, memento);
+ _builder.RegisterMemento(pluginType, memento);
}
private InstanceScope findScope(XmlElement familyElement)
@@ -72,35 +94,38 @@
return returnValue;
}
- private void attachMementoSource(XmlElement familyElement, TypePath pluginTypePath)
+ // TODO: change to many
+ private void attachMementoSource(Type pluginType, XmlElement familyElement)
{
XmlNode sourceNode = familyElement[XmlConstants.MEMENTO_SOURCE_NODE];
if (sourceNode != null)
{
InstanceMemento sourceMemento = new XmlAttributeInstanceMemento(sourceNode);
- _builder.AttachSource(pluginTypePath, sourceMemento);
+ _builder.AttachSource(pluginType, sourceMemento);
}
}
- private void attachPlugins(TypePath pluginTypePath, XmlElement familyElement)
+ private void attachPlugins(Type pluginType, XmlElement familyElement)
{
+ // TODO: 3.5 lambda cleanup
XmlNodeList pluginNodes = familyElement.SelectNodes(XmlConstants.PLUGIN_NODE);
foreach (XmlElement pluginElement in pluginNodes)
{
TypePath pluginPath = TypePath.CreateFromXmlNode(pluginElement);
string concreteKey = pluginElement.GetAttribute(XmlConstants.CONCRETE_KEY_ATTRIBUTE);
- _builder.AddPlugin(pluginTypePath, pluginPath, concreteKey);
+ _builder.AddPlugin(pluginType, pluginPath, concreteKey);
foreach (XmlElement setterElement in pluginElement.ChildNodes)
{
string setterName = setterElement.GetAttribute("Name");
- _builder.AddSetter(pluginTypePath, concreteKey, setterName);
+ _builder.AddSetter(pluginType, concreteKey, setterName);
}
}
}
- private void attachInterceptors(TypePath pluginTypePath, XmlElement familyElement)
+ // TODO: 3.5 lambda cleanup
+ private void attachInterceptors(Type pluginType, XmlElement familyElement)
{
XmlNode interceptorChainNode = familyElement[XmlConstants.INTERCEPTORS_NODE];
if (interceptorChainNode == null)
@@ -111,7 +136,7 @@
foreach (XmlNode interceptorNode in interceptorChainNode.ChildNodes)
{
XmlAttributeInstanceMemento interceptorMemento = new XmlAttributeInstanceMemento(interceptorNode);
- _builder.AddInterceptor(pluginTypePath, interceptorMemento);
+ _builder.AddInterceptor(pluginType, interceptorMemento);
}
}
}
Modified: trunk/Source/StructureMap/Configuration/IGraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/IGraphBuilder.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/IGraphBuilder.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -24,14 +24,14 @@
void FinishFamilies();
PluginGraph CreatePluginGraph();
- void AddPluginFamily(TypePath typePath, string defaultKey, InstanceScope scope);
- void AttachSource(TypePath pluginTypePath, InstanceMemento sourceMemento);
- void AttachSource(TypePath pluginTypePath, MementoSource source);
- Plugin AddPlugin(TypePath pluginTypePath, TypePath pluginPath, string concreteKey);
- SetterProperty AddSetter(TypePath pluginTypePath, string concreteKey, string setterName);
- void AddInterceptor(TypePath pluginTypePath, InstanceMemento interceptorMemento);
+ void AddPluginFamily(Type pluginType, string defaultKey, InstanceScope scope);
+ void AttachSource(Type pluginType, InstanceMemento sourceMemento);
+ void AttachSource(Type pluginType, MementoSource source);
+ Plugin AddPlugin(Type pluginType, TypePath pluginPath, string concreteKey);
+ SetterProperty AddSetter(Type pluginType, string concreteKey, string setterName);
+ void AddInterceptor(Type pluginType, InstanceMemento interceptorMemento);
- void RegisterMemento(TypePath pluginTypePath, InstanceMemento memento);
+ void RegisterMemento(Type pluginType, InstanceMemento memento);
IProfileBuilder GetProfileBuilder();
}
Modified: trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/NormalGraphBuilder.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -65,52 +65,45 @@
_systemInstanceManager = new InstanceManager(_systemGraph);
}
- public void AddPluginFamily(TypePath typePath, string defaultKey, InstanceScope scope)
+ public void AddPluginFamily(Type pluginType, string defaultKey, InstanceScope scope)
{
- Type pluginType;
- try
- {
- pluginType = typePath.FindType();
- }
- catch (Exception ex)
- {
- throw new StructureMapException(103, ex, typePath.ClassName, typePath.AssemblyName);
- }
+ PluginFamily family = _pluginGraph.FindFamily(pluginType);
-
- PluginFamily family = _pluginGraph.LocateOrCreateFamilyForType(pluginType);
-
// Xml configuration wins
family.DefaultInstanceKey = defaultKey;
family.SetScopeTo(scope);
}
- public virtual void AttachSource(TypePath pluginTypePath, InstanceMemento sourceMemento)
+ public virtual void AttachSource(Type pluginType, InstanceMemento sourceMemento)
{
try
{
MementoSource source = (MementoSource) buildSystemObject(typeof (MementoSource), sourceMemento);
- AttachSource(pluginTypePath, source);
+ AttachSource(pluginType, source);
}
catch (Exception ex)
{
- throw new StructureMapException(120, ex, pluginTypePath);
+ // TODO: put error in PluginGraph
+ throw new StructureMapException(120, ex, TypePath.GetAssemblyQualifiedName(pluginType));
}
}
- public void AttachSource(TypePath pluginTypePath, MementoSource source)
+ public void AttachSource(Type pluginType, MementoSource source)
{
- PluginFamily family = _pluginGraph.PluginFamilies[pluginTypePath.FindType()];
+ PluginFamily family = _pluginGraph.PluginFamilies[pluginType];
family.AddMementoSource(source);
}
- public Plugin AddPlugin(TypePath pluginTypePath, TypePath pluginPath, string concreteKey)
+ public Plugin AddPlugin(Type pluginType, TypePath pluginPath, string concreteKey)
{
- PluginFamily family = _pluginGraph.PluginFamilies[pluginTypePath.FindType()];
+ // TODO: Make this go through PluginGraph.FindFamily()
+ PluginFamily family = _pluginGraph.PluginFamilies[pluginType];
if (family == null)
{
string message =
- string.Format("Could not find a PluginFamily for {0}", pluginTypePath.AssemblyQualifiedName);
+ string.Format("Could not find a PluginFamily for {0}", pluginType.AssemblyQualifiedName);
+
+ // TODO: put error in PluginGraph
throw new ApplicationException(message);
}
@@ -120,16 +113,17 @@
return plugin;
}
- public SetterProperty AddSetter(TypePath pluginTypePath, string concreteKey, string setterName)
+ public SetterProperty AddSetter(Type pluginType, string concreteKey, string setterName)
{
- PluginFamily family = _pluginGraph.PluginFamilies[pluginTypePath.FindType()];
+ // TODO: Make this go through PluginGraph.FindFamily()
+ PluginFamily family = _pluginGraph.PluginFamilies[pluginType];
Plugin plugin = family.Plugins[concreteKey];
return plugin.Setters.Add(setterName);
}
- public virtual void AddInterceptor(TypePath pluginTypePath, InstanceMemento interceptorMemento)
+ public virtual void AddInterceptor(Type pluginType, InstanceMemento interceptorMemento)
{
- PluginFamily family = _pluginGraph.PluginFamilies[pluginTypePath.FindType()];
+ PluginFamily family = _pluginGraph.PluginFamilies[pluginType];
try
{
IInstanceInterceptor interceptor =
@@ -140,13 +134,14 @@
}
catch (Exception ex)
{
- throw new StructureMapException(121, ex, pluginTypePath);
+ // TODO: put error in PluginGraph
+ throw new StructureMapException(121, ex, TypePath.GetAssemblyQualifiedName(pluginType));
}
}
- public void RegisterMemento(TypePath pluginTypePath, InstanceMemento memento)
+ public void RegisterMemento(Type pluginType, InstanceMemento memento)
{
- PluginFamily family = _pluginGraph.LocateOrCreateFamilyForType(pluginTypePath.FindType());
+ PluginFamily family = _pluginGraph.FindFamily(pluginType);
family.AddInstance(memento);
}
Deleted: trunk/Source/StructureMap/Configuration/Problem.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/Problem.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/Problem.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,88 +0,0 @@
-using System;
-using System.Text;
-
-namespace StructureMap.Configuration
-{
- [Serializable]
- public class Problem
- {
- private string _message;
- private Guid _objectId = Guid.Empty;
- private string _path = string.Empty;
- private string _title;
-
- public Problem()
- {
- }
-
- public Problem(string title, string message)
- {
- _title = title;
- _message = message;
- }
-
- public Problem(string title, Exception ex)
- {
- _title = title;
-
- StringBuilder sb = new StringBuilder();
- Exception exception = ex;
- while (exception != null)
- {
- sb.Append("\n");
- sb.Append(exception.Message);
- sb.Append("\n");
- sb.Append(exception.StackTrace);
-
- exception = exception.InnerException;
- }
-
- _message = sb.ToString();
- }
-
- public string Path
- {
- get { return _path; }
- set { _path = value; }
- }
-
- public string Title
- {
- get { return _title; }
- set { _title = value; }
- }
-
- public string Message
- {
- get { return _message; }
- set { _message = value; }
- }
-
- public Guid ObjectId
- {
- get { return _objectId; }
- set { _objectId = value; }
- }
-
- public override string ToString()
- {
- return string.Format("Problem: {0}\n{1}", Title, Message);
- }
-
- public override bool Equals(object obj)
- {
- Problem peer = obj as Problem;
- if (peer == null)
- {
- return false;
- }
-
- return Title == peer.Title;
- }
-
- public override int GetHashCode()
- {
- return base.GetHashCode();
- }
- }
-}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Configuration/ProfileAndMachineParser.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -6,6 +6,7 @@
namespace StructureMap.Configuration
{
+ // TODO: 3.5 cleanup
public class ProfileAndMachineParser
{
private readonly IProfileBuilder _profileBuilder;
@@ -23,6 +24,7 @@
public void Parse()
{
+ // TODO: 3.5 cleanup
XmlNode defaultProfileNode = _structureMapNode.Attributes.GetNamedItem(XmlConstants.DEFAULT_PROFILE);
if (defaultProfileNode != null)
{
@@ -83,8 +85,11 @@
memento.InstanceKey = key;
TypePath familyPath = new TypePath(fullName);
- _graphBuilder.RegisterMemento(familyPath, memento);
+ // TODO: failure point
+ Type pluginType = familyPath.FindType();
+ _graphBuilder.RegisterMemento(pluginType, memento);
+
function(fullName, key);
}
Modified: trunk/Source/StructureMap/Graph/AssemblyGraph.cs
===================================================================
--- trunk/Source/StructureMap/Graph/AssemblyGraph.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Graph/AssemblyGraph.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,8 +1,5 @@
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
using System.Reflection;
using StructureMap.Configuration.DSL;
@@ -11,39 +8,9 @@
/// <summary>
/// Models an assembly reference in a PluginGraph
/// </summary>
+ [Obsolete("Kill!")]
public class AssemblyGraph : IComparable
{
- #region statics
-
- /// <summary>
- /// Finds a string array of all the assembly files in a path. Used
- /// by the UI
- /// </summary>
- /// <param name="folderPath"></param>
- /// <returns></returns>
- public static string[] GetAllAssembliesAtPath(string folderPath)
- {
- ArrayList list = new ArrayList();
-
- string[] files = Directory.GetFiles(folderPath, "*dll");
- foreach (string fileName in files)
- {
- try
- {
- Assembly assembly = Assembly.LoadFrom(fileName);
- list.Add(assembly.GetName().Name);
- }
- catch (Exception ex)
- {
- Debug.WriteLine(ex.Message);
- }
- }
-
- return (string[]) list.ToArray(typeof (string));
- }
-
- #endregion
-
private readonly Assembly _assembly;
private readonly string _assemblyName;
private bool _lookForPluginFamilies = true;
@@ -63,6 +30,7 @@
}
catch (Exception ex)
{
+ // TODO: Register error with PluginGraph. Maybe do this at configuration time
throw new StructureMapException(101, ex, assemblyName);
}
}
@@ -114,6 +82,7 @@
/// [PluginFamily]
/// </summary>
/// <returns></returns>
+ // TODO: Move into the new TypeScanner
public PluginFamily[] FindPluginFamilies()
{
if (_assembly == null || !LookForPluginFamilies)
@@ -137,6 +106,7 @@
return list.ToArray();
}
+ // TODO: Move to TypeScanner
private Type[] getExportedTypes()
{
Type[] exportedTypes;
@@ -170,6 +140,8 @@
return _assembly.GetType(fullName, false);
}
+
+ // TODO: Move into the new TypeScanner
public List<Registry> FindRegistries()
{
Type[] exportedTypes = getExportedTypes();
Modified: trunk/Source/StructureMap/Graph/AssemblyGraphCollection.cs
===================================================================
--- trunk/Source/StructureMap/Graph/AssemblyGraphCollection.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Graph/AssemblyGraphCollection.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
@@ -7,7 +8,7 @@
/// <summary>
/// Custom collection for AssemblyGraph's
/// </summary>
- public class AssemblyGraphCollection : IEnumerable<AssemblyGraph>
+ [Obsolete("Kill!")] public class AssemblyGraphCollection : IEnumerable<AssemblyGraph>
{
private Dictionary<string, AssemblyGraph> _assemblies;
Modified: trunk/Source/StructureMap/Graph/Plugin.cs
===================================================================
--- trunk/Source/StructureMap/Graph/Plugin.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Graph/Plugin.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -422,17 +422,26 @@
public void VisitArguments(IPluginArgumentVisitor visitor)
{
- foreach (ParameterInfo parameter in GetConstructor().GetParameters())
- {
- visitMember(parameter.ParameterType, parameter.Name, visitor);
- }
+ VisitConstructorArguments(visitor);
+ VisitSetterArguments(visitor);
+ }
+ private void VisitSetterArguments(IPluginArgumentVisitor visitor)
+ {
foreach (SetterProperty setter in _setters)
{
visitMember(setter.Property.PropertyType, setter.Property.Name, visitor);
}
}
+ private void VisitConstructorArguments(IPluginArgumentVisitor visitor)
+ {
+ foreach (ParameterInfo parameter in GetConstructor().GetParameters())
+ {
+ visitMember(parameter.ParameterType, parameter.Name, visitor);
+ }
+ }
+
private static void visitMember(Type type, string name, IPluginArgumentVisitor visitor)
{
if (TypeIsPrimitive(type))
Modified: trunk/Source/StructureMap/Graph/PluginGraph.cs
===================================================================
--- trunk/Source/StructureMap/Graph/PluginGraph.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Graph/PluginGraph.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,7 +1,5 @@
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Reflection;
using StructureMap.Configuration.DSL;
using StructureMap.Diagnostics;
@@ -20,11 +18,11 @@
{
private readonly AssemblyGraphCollection _assemblies;
private readonly InterceptorLibrary _interceptorLibrary = new InterceptorLibrary();
- private readonly PluginFamilyCollection _pluginFamilies;
- private bool _sealed = false;
- private readonly bool _useExternalRegistries = true;
private readonly GraphLog _log = new GraphLog();
+ private readonly PluginFamilyCollection _pluginFamilies;
private readonly ProfileManager _profileManager = new ProfileManager();
+ private readonly bool _useExternalRegistries = true;
+ private bool _sealed = false;
/// <summary>
/// Default constructor
@@ -171,11 +169,10 @@
}
}
- public PluginFamily LocateOrCreateFamilyForType(Type pluginType)
+ public PluginFamily FindFamily(Type pluginType)
{
buildFamilyIfMissing(pluginType);
return PluginFamilies[pluginType];
}
-
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap/ObjectFactory.cs
===================================================================
--- trunk/Source/StructureMap/ObjectFactory.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/ObjectFactory.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -20,12 +20,6 @@
private static IInstanceManager _manager;
private static string _profile = string.Empty;
-
- static ObjectFactory()
- {
- ObjectFactoryCacheCallback callback = new ObjectFactoryCacheCallback();
- }
-
private static event Notify _notify;
/// <summary>
Deleted: trunk/Source/StructureMap/ObjectFactoryCacheCallback.cs
===================================================================
--- trunk/Source/StructureMap/ObjectFactoryCacheCallback.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/ObjectFactoryCacheCallback.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -1,43 +0,0 @@
-using System;
-using StructureMap.Caching;
-
-namespace StructureMap
-{
- internal class ObjectFactoryCacheCallback : IManagedCache
- {
- public ObjectFactoryCacheCallback()
- {
- try
- {
- CacheManager.CurrentManager.WatchFile(StructureMapConfiguration.GetStructureMapConfigurationPath(), this);
- }
- catch (Exception exception)
- {
- Console.Write(exception);
- }
- }
-
- #region IManagedCache Members
-
- public string CacheName
- {
- get { return "ObjectFactory"; }
- }
-
- public void Clear()
- {
- ObjectFactory.Reset();
- }
-
- //no-op for interface implementation
- public void Prune(DateTime currentTime)
- {
- }
-
- public void AddWatches(CacheManager Manager)
- {
- }
-
- #endregion
- }
-}
\ No newline at end of file
Modified: trunk/Source/StructureMap/Pipeline/ConfiguredInstance.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/ConfiguredInstance.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Pipeline/ConfiguredInstance.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -136,7 +136,7 @@
public void Read(InstanceMemento memento, PluginGraph graph, Type pluginType)
{
- PluginFamily family = graph.LocateOrCreateFamilyForType(pluginType);
+ PluginFamily family = graph.FindFamily(pluginType);
Plugin plugin = memento.FindPlugin(family);
Modified: trunk/Source/StructureMap/Pipeline/Profile.cs
===================================================================
--- trunk/Source/StructureMap/Pipeline/Profile.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Pipeline/Profile.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -64,7 +64,7 @@
foreach (KeyValuePair<Type, Instance> pair in _instances)
{
- PluginFamily family = graph.LocateOrCreateFamilyForType(pair.Key);
+ PluginFamily family = graph.FindFamily(pair.Key);
Instance masterInstance = ((IDiagnosticInstance) pair.Value).FindMasterInstance(family);
master.Add(pair.Key, masterInstance);
}
Modified: trunk/Source/StructureMap/Source/XmlMementoCreator.cs
===================================================================
--- trunk/Source/StructureMap/Source/XmlMementoCreator.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/Source/XmlMementoCreator.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -4,6 +4,7 @@
{
public delegate InstanceMemento CreateXmlMementoDelegate(XmlNode node);
+ // TODO: 3.5, eliminate this with lambdas in ConfigurationParser
public class XmlMementoCreator
{
private readonly string _keyAttribute;
Modified: trunk/Source/StructureMap/StructureMap.csproj
===================================================================
--- trunk/Source/StructureMap/StructureMap.csproj 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap/StructureMap.csproj 2008-05-03 03:24:24 UTC (rev 85)
@@ -117,6 +117,7 @@
</Compile>
<Compile Include="Configuration\ProfileBuilder.cs" />
<Compile Include="Diagnostics\Tokens.cs" />
+ <Compile Include="Emitting\ConstructorEmitter.cs" />
<Compile Include="InstanceBuilderList.cs" />
<Compile Include="InstanceFamily.cs" />
<Compile Include="Pipeline\BuildStrategies.cs" />
@@ -157,69 +158,6 @@
<Compile Include="Attributes\ValidationMethodAttribute.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="Caching\CacheItem.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\CacheManager.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\ClearEventDispatcher.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\CloneCacheItem.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\CloneStorageStrategy.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\EagerInstanceCache.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\EventDispatcher.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\Expirations\AbsoluteTimeExpirationPolicy.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\Expirations\SlidingTimeExpirationPolicy.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\FileModificationWatcher.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\ICacheItem.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\IExpirationPolicy.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\IManagedCache.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\IStorageStrategy.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\IValueSource.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\LazyCache.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\PruneEventDispatcher.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\SerializationCacheItem.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\SerializationStorageStrategy.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\SharedCacheItem.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\SharedStorageStrategy.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="Configuration\ConfigurationConstants.cs">
<SubType>Code</SubType>
</Compile>
@@ -246,9 +184,6 @@
<Compile Include="Configuration\NormalGraphBuilder.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="Configuration\Problem.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="Configuration\ProfileAndMachineParser.cs" />
<Compile Include="Configuration\StructureMapConfigurationSection.cs" />
<Compile Include="Configuration\Mementos\UserControlMemento.cs" />
@@ -362,9 +297,6 @@
<Compile Include="ObjectFactory.cs">
<SubType>Code</SubType>
</Compile>
- <Compile Include="ObjectFactoryCacheCallback.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="PluginGraphBuilder.cs">
<SubType>Code</SubType>
</Compile>
Modified: trunk/Source/StructureMap.Testing/Configuration/FamilyParserTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Configuration/FamilyParserTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/Configuration/FamilyParserTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -28,10 +28,9 @@
_document.LoadXml("<PluginFamily />");
_familyElement = _document.DocumentElement;
- Type type = typeof (IGateway);
- _typePath = new TypePath(type);
+ thePluginType = typeof (IGateway);
- TypePath.WriteTypePathToXmlElement(type, _familyElement);
+ TypePath.WriteTypePathToXmlElement(thePluginType, _familyElement);
}
#endregion
@@ -40,13 +39,13 @@
private FamilyParser _parser;
private XmlDocument _document;
private XmlElement _familyElement;
- private TypePath _typePath;
+ private Type thePluginType;
[Test]
public void ScopeIsBlank()
{
- _builderMock.Expect("AddPluginFamily", _typePath, string.Empty, InstanceScope.PerRequest);
+ _builderMock.Expect("AddPluginFamily", thePluginType, string.Empty, InstanceScope.PerRequest);
_parser.ParseFamily(_familyElement);
@@ -58,7 +57,7 @@
public void ScopeIsBlank2()
{
_familyElement.SetAttribute(XmlConstants.SCOPE_ATTRIBUTE, "");
- _builderMock.Expect("AddPluginFamily", _typePath, string.Empty, InstanceScope.PerRequest);
+ _builderMock.Expect("AddPluginFamily", thePluginType, string.Empty, InstanceScope.PerRequest);
_parser.ParseFamily(_familyElement);
@@ -70,7 +69,7 @@
public void ScopeIsSingleton()
{
_familyElement.SetAttribute(XmlConstants.SCOPE_ATTRIBUTE, InstanceScope.Singleton.ToString());
- _builderMock.Expect("AddPluginFamily", _typePath, string.Empty, InstanceScope.Singleton);
+ _builderMock.Expect("AddPluginFamily", thePluginType, string.Empty, InstanceScope.Singleton);
_parser.ParseFamily(_familyElement);
@@ -82,7 +81,7 @@
public void ScopeIsThreadLocal()
{
_familyElement.SetAttribute(XmlConstants.SCOPE_ATTRIBUTE, InstanceScope.ThreadLocal.ToString());
- _builderMock.Expect("AddPluginFamily", _typePath, string.Empty, InstanceScope.ThreadLocal);
+ _builderMock.Expect("AddPluginFamily", thePluginType, string.Empty, InstanceScope.ThreadLocal);
_parser.ParseFamily(_familyElement);
Modified: trunk/Source/StructureMap.Testing/Container/IntegratedTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/IntegratedTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/Container/IntegratedTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -24,9 +24,9 @@
MementoSource source2 = new XmlFileMementoSource("IntegratedTest.XML", "Children", "Child");
MementoSource source3 = new XmlFileMementoSource("IntegratedTest.XML", "Parents", "Parent");
- graph.LocateOrCreateFamilyForType(typeof(GrandChild)).AddMementoSource(source1);
- graph.LocateOrCreateFamilyForType(typeof(Child)).AddMementoSource(source2);
- graph.LocateOrCreateFamilyForType(typeof(Parent)).AddMementoSource(source3);
+ graph.FindFamily(typeof(GrandChild)).AddMementoSource(source1);
+ graph.FindFamily(typeof(Child)).AddMementoSource(source2);
+ graph.FindFamily(typeof(Parent)).AddMementoSource(source3);
manager = new InstanceManager(graph);
}
Modified: trunk/Source/StructureMap.Testing/Graph/AssemblyGraphTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Graph/AssemblyGraphTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/Graph/AssemblyGraphTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -64,18 +64,5 @@
Assert.AreEqual(type, actualType);
}
- [Test]
- public void GetAllAssembliesAtPath()
- {
- string[] assemblies = AssemblyGraph.GetAllAssembliesAtPath(".");
- ArrayList list = new ArrayList(assemblies);
-
- Assert.IsTrue(list.Contains("StructureMap.Testing"));
- Assert.IsTrue(list.Contains("StructureMap"));
- Assert.IsTrue(list.Contains("StructureMap.Testing.Widget"));
- Assert.IsTrue(list.Contains("StructureMap.Testing.Widget2"));
- Assert.IsTrue(list.Contains("StructureMap.Testing.Widget3"));
- Assert.IsTrue(list.Contains("StructureMap.Testing.Widget4"));
- }
}
}
\ No newline at end of file
Modified: trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/ImplicitPluginFromPluggedTypeAttributeTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -38,10 +38,10 @@
public void CanBuildTheInstance()
{
NormalGraphBuilder builder = new NormalGraphBuilder(new Registry[0]);
- TypePath pluginTypePath = new TypePath(typeof (IGateway));
- builder.AddPluginFamily(pluginTypePath, _memento.InstanceKey, InstanceScope.PerRequest);
+ Type thePluginType = typeof (IGateway);
+ builder.AddPluginFamily(thePluginType, _memento.InstanceKey, InstanceScope.PerRequest);
- builder.RegisterMemento(pluginTypePath, _memento);
+ builder.RegisterMemento(thePluginType, _memento);
PluginGraph graph = builder.CreatePluginGraph();
InstanceManager manager = new InstanceManager(graph);
Modified: trunk/Source/StructureMap.Testing/ObjectFactoryTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/ObjectFactoryTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/ObjectFactoryTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -3,12 +3,11 @@
using System.Threading;
using System.Xml;
using NUnit.Framework;
-using StructureMap.Caching;
using StructureMap.Testing.TestData;
using StructureMap.Testing.Widget;
using IList=System.Collections.IList;
-namespace StructureMap.Testing.Caching
+namespace StructureMap.Testing
{
[TestFixture]
public class ObjectFactoryTester
@@ -19,14 +18,12 @@
public void SetUp()
{
_event = new ManualResetEvent(false);
- _watcher = new FileModificationWatcher("StructureMap.config");
DataMother.WriteDocument("FullTesting.XML");
}
#endregion
private ManualResetEvent _event;
- private FileModificationWatcher _watcher;
private void markDone()
{
Modified: trunk/Source/StructureMap.Testing/Pipeline/ProfileManagerTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Pipeline/ProfileManagerTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/Pipeline/ProfileManagerTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -24,7 +24,7 @@
private void addDefaultToPluginFamily<T>(string name)
{
LiteralInstance instance = new LiteralInstance(null).WithName(name);
- PluginFamily family = _pluginGraph.LocateOrCreateFamilyForType(typeof (T));
+ PluginFamily family = _pluginGraph.FindFamily(typeof (T));
family.AddInstance(instance);
family.DefaultInstanceKey = instance.Name;
}
@@ -32,14 +32,14 @@
private void addDefaultToProfile<T>(string profile, string name)
{
_manager.SetDefault(profile, typeof (T), new ReferencedInstance(name));
- PluginFamily family = _pluginGraph.LocateOrCreateFamilyForType(typeof (T));
+ PluginFamily family = _pluginGraph.FindFamily(typeof (T));
family.AddInstance(new LiteralInstance(null).WithName(name));
}
private void addDefaultToMachine<T>(string name)
{
LiteralInstance instance = new LiteralInstance(null).WithName(name);
- PluginFamily family = _pluginGraph.LocateOrCreateFamilyForType(typeof (T));
+ PluginFamily family = _pluginGraph.FindFamily(typeof (T));
family.AddInstance(instance);
_manager.SetMachineDefault(typeof (T), new ReferencedInstance(name));
Modified: trunk/Source/StructureMap.Testing/Pipeline/ProfileTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Pipeline/ProfileTester.cs 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/Pipeline/ProfileTester.cs 2008-05-03 03:24:24 UTC (rev 85)
@@ -21,7 +21,7 @@
private void setDefault<T>(string key)
{
- PluginFamily family = _pluginGraph.LocateOrCreateFamilyForType(typeof (T));
+ PluginFamily family = _pluginGraph.FindFamily(typeof (T));
family.AddInstance(new LiteralInstance(null).WithName(key));
_profile.SetDefault(typeof(T), new ReferencedInstance(key));
Modified: trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj
===================================================================
--- trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj 2008-04-29 04:19:20 UTC (rev 84)
+++ trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj 2008-05-03 03:24:24 UTC (rev 85)
@@ -156,18 +156,6 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="AutoMocking\RhinoAutoMockerTester.cs" />
- <Compile Include="Caching\ExpirationTester.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\FileModificationWatcherTester.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\MockManagedCache.cs">
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="Caching\StorageAndCacheItemTester.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="Configuration\ConfigurationParserCollectionTester.cs" />
<Compile Include="Configuration\ConfigurationParserTester.cs" />
<Compile Include="Configuration\DefaultInstanceNodeTester.cs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
