From: <jer...@us...> - 2008-10-05 04:07:08
|
Revision: 175 http://structuremap.svn.sourceforge.net/structuremap/?rev=175&view=rev Author: jeremydmiller Date: 2008-10-05 04:04:34 +0000 (Sun, 05 Oct 2008) Log Message: ----------- Incorporating patches for Mono support. That's right, I said Mono support Modified Paths: -------------- trunk/Source/HTML/ConstructorAndSetterInjection.htm trunk/Source/StructureMap/Graph/AssemblyScanner.cs trunk/Source/StructureMap/Source/DirectoryXmlMementoSource.cs trunk/Source/StructureMap/Source/XmlFileMementoSource.cs trunk/Source/StructureMap/StructureMapConfiguration.cs trunk/Source/StructureMap.Testing/Graph/SetterInjectionEmittingTester.cs trunk/Source/StructureMap.Testing/Graph/SetterInjectionTester.cs trunk/Source/StructureMap.Testing/Graph/Source/DirectoryXmlMementoSourceTester.cs trunk/Source/StructureMap.Testing/Graph/Source/XmlMementoSourceTester.cs trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj trunk/Source/StructureMap.Testing/TestData/SetterInjectionTesting.xml trunk/Source/StructureMap.sln Modified: trunk/Source/HTML/ConstructorAndSetterInjection.htm =================================================================== --- trunk/Source/HTML/ConstructorAndSetterInjection.htm 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/HTML/ConstructorAndSetterInjection.htm 2008-10-05 04:04:34 UTC (rev 175) @@ -328,7 +328,7 @@ <p>I can direct StructureMap to use these properties in a <Plugin> node for OtherGridColumn.</p> <!-- -{\rtf1\ansi\ansicpg\lang1024\noproof65001\uc1 \deff0{\fonttbl{\f0\fnil\fcharset0\fprq1 Courier New;}}{\colortbl;??\red0\green0\blue255;\red255\green255\blue255;\red163\green21\blue21;\red255\green0\blue0;\red0\green0\blue0;}??\fs20 \cf1 \tab <\cf3 PluginFamily\cf1 \cf4 Type\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5.IGridColumn\cf0 "\cf1 \cf4 Assembly\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5\cf0 "\cf1 \cf4 DefaultKey\cf1 =\cf0 ""\cf1 >\par ??\tab \tab <\cf3 Source\cf1 \cf4 Type\cf1 =\cf0 "\cf1 XmlFile\cf0 "\cf1 \cf4 FilePath\cf1 =\cf0 "\cf1 GridColumnInstances.XML\cf0 "\cf1 \cf4 XPath\cf1 =\cf0 "\cf1 //GridColumns\cf0 "\cf1 \cf4 NodeName\cf1 =\cf0 "\cf1 GridColumn\cf0 "\cf1 />\par ??\tab \tab <\cf3 Plugin\cf1 \cf4 Assembly\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5\cf0 "\cf1 \cf4 Type\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5.OtherGridColumn\cf0 "\cf1 \cf4 ConcreteKey\cf1 =\cf0 "\cf1 Other\cf0 "\cf1 >\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 ColumnName\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 FontStyle\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 Rules\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 Widget\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 WrapLines\cf0 "\cf1 />\par ??\tab \tab </\cf3 Plugin\cf1 >\par ??\tab </\cf3 PluginFamily\cf1 >} +{\rtf1\ansi\ansicpg\lang1024\noproof65001\uc1 \deff0{\fonttbl{\f0\fnil\fcharset0\fprq1 Courier New;}}{\colortbl;??\red0\green0\blue255;\red255\green255\blue255;\red163\green21\blue21;\red255\green0\blue0;\red0\green0\blue0;}??\fs20 \cf1 \tab <\cf3 PluginFamily\cf1 \cf4 Type\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5.IGridColumn\cf0 "\cf1 \cf4 Assembly\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5\cf0 "\cf1 \cf4 DefaultKey\cf1 =\cf0 ""\cf1 >\par ??\tab \tab <\cf3 Source\cf1 \cf4 Type\cf1 =\cf0 "\cf1 XmlFile\cf0 "\cf1 \cf4 FilePath\cf1 =\cf0 "\cf1 GridColumnInstances.xml\cf0 "\cf1 \cf4 XPath\cf1 =\cf0 "\cf1 //GridColumns\cf0 "\cf1 \cf4 NodeName\cf1 =\cf0 "\cf1 GridColumn\cf0 "\cf1 />\par ??\tab \tab <\cf3 Plugin\cf1 \cf4 Assembly\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5\cf0 "\cf1 \cf4 Type\cf1 =\cf0 "\cf1 StructureMap.Testing.Widget5.OtherGridColumn\cf0 "\cf1 \cf4 ConcreteKey\cf1 =\cf0 "\cf1 Other\cf0 "\cf1 >\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 ColumnName\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 FontStyle\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 Rules\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 Widget\cf0 "\cf1 />\par ??\tab \tab \tab <\cf3 Setter\cf1 \cf4 Name\cf1 =\cf0 "\cf1 WrapLines\cf0 "\cf1 />\par ??\tab \tab </\cf3 Plugin\cf1 >\par ??\tab </\cf3 PluginFamily\cf1 >} --> <div style="font-family: Courier New; font-size: 10pt; color: black; background: white;"> <p style="margin: 0px;"> Modified: trunk/Source/StructureMap/Graph/AssemblyScanner.cs =================================================================== --- trunk/Source/StructureMap/Graph/AssemblyScanner.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap/Graph/AssemblyScanner.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -149,7 +149,7 @@ private static Assembly findTheCallingAssembly() { - var trace = new StackTrace(Thread.CurrentThread, false); + var trace = new StackTrace(false); Assembly thisAssembly = System.Reflection.Assembly.GetExecutingAssembly(); Assembly callingAssembly = null; Modified: trunk/Source/StructureMap/Source/DirectoryXmlMementoSource.cs =================================================================== --- trunk/Source/StructureMap/Source/DirectoryXmlMementoSource.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap/Source/DirectoryXmlMementoSource.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -65,20 +65,12 @@ private string resolvePath(string directory) { - string returnValue = string.Empty; - if (!Path.IsPathRooted(directory)) { - returnValue = AppDomain.CurrentDomain.SetupInformation.ApplicationBase; - returnValue += "\\" + directory; - returnValue = returnValue.Replace("\\\\", "\\"); + return Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, directory); } - else - { - returnValue = Path.GetFullPath(directory); - } - return returnValue; + return Path.GetFullPath(directory); } @@ -104,7 +96,7 @@ private string getFilePath(string instanceKey) { - return string.Format("{0}\\{1}.{2}", _directory, instanceKey, _extension); + return Path.Combine(_directory, string.Format("{0}.{1}", instanceKey, _extension)); } protected override InstanceMemento retrieveMemento(string instanceKey) Modified: trunk/Source/StructureMap/Source/XmlFileMementoSource.cs =================================================================== --- trunk/Source/StructureMap/Source/XmlFileMementoSource.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap/Source/XmlFileMementoSource.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -81,16 +81,10 @@ // crude work-around for web application problems if (!Path.IsPathRooted(_filePath)) { - string relativePath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase; - relativePath += "\\" + _filePath; - relativePath = relativePath.Replace("\\\\", "\\"); - - return relativePath; + return Path.Combine(AppDomain.CurrentDomain.SetupInformation.ApplicationBase, _filePath); } - else - { - return _filePath; - } + + return _filePath; } } } \ No newline at end of file Modified: trunk/Source/StructureMap/StructureMapConfiguration.cs =================================================================== --- trunk/Source/StructureMap/StructureMapConfiguration.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap/StructureMapConfiguration.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -105,7 +105,8 @@ if (!File.Exists(configPath)) { - configPath = Path.Combine(basePath, @"..\" + CONFIG_FILE_NAME); + configPath = Path.Combine(basePath, ".."); + configPath = Path.Combine(configPath, CONFIG_FILE_NAME); } } Modified: trunk/Source/StructureMap.Testing/Graph/SetterInjectionEmittingTester.cs =================================================================== --- trunk/Source/StructureMap.Testing/Graph/SetterInjectionEmittingTester.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.Testing/Graph/SetterInjectionEmittingTester.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -49,7 +49,7 @@ </PluginFamily> <PluginFamily Type='StructureMap.Testing.Widget5.IGridColumn' Assembly='StructureMap.Testing.Widget5' DefaultKey=''> - <Source Type='XmlFile' FilePath='GridColumnInstances.XML' XPath='//GridColumns' NodeName='GridColumn'/> + <Source Type='XmlFile' FilePath='GridColumnInstances.xml' XPath='//GridColumns' NodeName='GridColumn'/> <Plugin Assembly='StructureMap.Testing.Widget5' Type='StructureMap.Testing.Widget5.OtherGridColumn' ConcreteKey='Other'> <Setter Name='ColumnName' /> <Setter Name='FontStyle' /> Modified: trunk/Source/StructureMap.Testing/Graph/SetterInjectionTester.cs =================================================================== --- trunk/Source/StructureMap.Testing/Graph/SetterInjectionTester.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.Testing/Graph/SetterInjectionTester.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -47,7 +47,7 @@ </PluginFamily> <PluginFamily Type='StructureMap.Testing.Widget5.IGridColumn' Assembly='StructureMap.Testing.Widget5' DefaultKey=''> - <Source Type='XmlFile' FilePath='GridColumnInstances.XML' XPath='//GridColumns' NodeName='GridColumn'/> + <Source Type='XmlFile' FilePath='GridColumnInstances.xml' XPath='//GridColumns' NodeName='GridColumn'/> <Plugin Assembly='StructureMap.Testing.Widget5' Type='StructureMap.Testing.Widget5.OtherGridColumn' ConcreteKey='Other'> <Setter Name='ColumnName' /> <Setter Name='FontStyle' /> Modified: trunk/Source/StructureMap.Testing/Graph/Source/DirectoryXmlMementoSourceTester.cs =================================================================== --- trunk/Source/StructureMap.Testing/Graph/Source/DirectoryXmlMementoSourceTester.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.Testing/Graph/Source/DirectoryXmlMementoSourceTester.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -23,9 +23,9 @@ string instance3 = "<Instance Key=\"Bigger\" Type=\"GreaterThan\"><Property Name=\"Attribute\" Value=\"MyDad\" /><Property Name=\"Value\" Value=\"10\" /></Instance>"; - writeFile(instance1, @"MementoDirectory\Red.xml"); - writeFile(instance2, @"MementoDirectory\Blue.xml"); - writeFile(instance3, @"MementoDirectory\Bigger.xml"); + writeFile(instance1, Path.Combine("MementoDirectory", "Red.xml")); + writeFile(instance2, Path.Combine("MementoDirectory", "Blue.xml")); + writeFile(instance3, Path.Combine("MementoDirectory", "Bigger.xml")); _source = new DirectoryXmlMementoSource("MementoDirectory", "xml", XmlMementoStyle.NodeNormalized); } Modified: trunk/Source/StructureMap.Testing/Graph/Source/XmlMementoSourceTester.cs =================================================================== --- trunk/Source/StructureMap.Testing/Graph/Source/XmlMementoSourceTester.cs 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.Testing/Graph/Source/XmlMementoSourceTester.cs 2008-10-05 04:04:34 UTC (rev 175) @@ -12,8 +12,9 @@ [SetUp] public void SetUp() { - DataMother.WriteDocument("RuleSource.xml"); - source = new XmlFileMementoSource("RuleSource.XML", "", "Rule"); + var theFileName = "RuleSource.xml"; + DataMother.WriteDocument(theFileName); + source = new XmlFileMementoSource(theFileName, "", "Rule"); } #endregion Modified: trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj =================================================================== --- trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.Testing/StructureMap.Testing.csproj 2008-10-05 04:04:34 UTC (rev 175) @@ -121,10 +121,6 @@ <Project>{0ED1B206-A1C9-4A52-BA87-3BA416C8725C}</Project> <Name>StructureMap.AutoMocking</Name> </ProjectReference> - <ProjectReference Include="..\StructureMap.DataAccess\StructureMap.DataAccess.csproj"> - <Project>{DB798C07-0C82-4298-8BAA-D702CF96C28E}</Project> - <Name>StructureMap.DataAccess</Name> - </ProjectReference> <ProjectReference Include="..\StructureMap.Testing.GenericWidgets\StructureMap.Testing.GenericWidgets.csproj"> <Project>{C205EA4C-4CD0-4221-A3CB-AFD835F0B263}</Project> <Name>StructureMap.Testing.GenericWidgets</Name> @@ -284,38 +280,6 @@ <SubType>Code</SubType> </Compile> <Compile Include="Graph\TypeFindingTester.cs" /> - <Compile Include="DataAccess\CommandCollectionTester.cs" /> - <Compile Include="DataAccess\CommandFactoryTester.cs" /> - <Compile Include="DataAccess\Commands\ParameterizedQueryFilterTester.cs" /> - <Compile Include="DataAccess\Commands\StoredProcedureCommandTester.cs" /> - <Compile Include="DataAccess\Commands\TemplatedQueryFilterTester.cs" /> - <Compile Include="DataAccess\Commands\TemplatedQueryTester.cs" /> - <Compile Include="DataAccess\DataSessionTester.cs" /> - <Compile Include="DataAccess\DataSetMapping\ReaderToColumnMapTester.cs" /> - <Compile Include="DataAccess\DataSetMapping\ReaderToTableMapperTester.cs" /> - <Compile Include="DataAccess\DataSetMapping\YesNoReaderToColumnMapTester.cs" /> - <Compile Include="DataAccess\Debugging.cs" /> - <Compile Include="DataAccess\ExecutionStates\AutoCommitExecutionStateTester.cs" /> - <Compile Include="DataAccess\ExecutionStates\TransactionalExecutionStateTester.cs" /> - <Compile Include="DataAccess\JSON\ArrayTester.cs" /> - <Compile Include="DataAccess\JSON\FieldTester.cs" /> - <Compile Include="DataAccess\JSON\ObjectTester.cs" /> - <Compile Include="DataAccess\JSON\PropertyTester.cs" /> - <Compile Include="DataAccess\MSSQL\MSSQLDatabaseEngineTester.cs" /> - <Compile Include="DataAccess\ObjectMother.cs" /> - <Compile Include="DataAccess\Parameterization\ParameterizedCommandBuilderTester.cs" /> - <Compile Include="DataAccess\Parameterization\ParameterTemplateTester.cs" /> - <Compile Include="DataAccess\Parameters\TemplateParameterTester.cs" /> - <Compile Include="DataAccess\ReaderSourceCollectionTester.cs" /> - <Compile Include="DataAccess\StubbedCommand.cs" /> - <Compile Include="DataAccess\StubbedReaderSource.cs" /> - <Compile Include="DataAccess\TemplatedCommandTester.cs" /> - <Compile Include="DataAccess\Tools\Mocks\CommandExpectationTester.cs" /> - <Compile Include="DataAccess\Tools\Mocks\MockCommandTester.cs" /> - <Compile Include="DataAccess\Tools\Mocks\MockDataSessionTester.cs" /> - <Compile Include="DataAccess\Tools\Mocks\MockReaderSourceTester.cs" /> - <Compile Include="DataAccess\Tools\Mocks\ParameterListTester.cs" /> - <Compile Include="DataAccess\Tools\TableDataReaderTester.cs" /> <Compile Include="Diagnostics\IntegrationTester.cs" /> <Compile Include="Diagnostics\TextReportWriterSmokeTester.cs" /> <Compile Include="GenericsAcceptanceTester.cs" /> Modified: trunk/Source/StructureMap.Testing/TestData/SetterInjectionTesting.xml =================================================================== --- trunk/Source/StructureMap.Testing/TestData/SetterInjectionTesting.xml 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.Testing/TestData/SetterInjectionTesting.xml 2008-10-05 04:04:34 UTC (rev 175) @@ -22,7 +22,7 @@ </PluginFamily> <PluginFamily Type="StructureMap.Testing.Widget5.IGridColumn" Assembly="StructureMap.Testing.Widget5" DefaultKey=""> - <Source Type="XmlFile" FilePath="GridColumnInstances.XML" XPath="//GridColumns" NodeName="GridColumn"/> + <Source Type="XmlFile" FilePath="GridColumnInstances.xml" XPath="//GridColumns" NodeName="GridColumn"/> <Plugin Assembly="StructureMap.Testing.Widget5" Type="StructureMap.Testing.Widget5.OtherGridColumn" ConcreteKey="Other"> <Setter Name="ColumnName" /> <Setter Name="FontStyle" /> Modified: trunk/Source/StructureMap.sln =================================================================== --- trunk/Source/StructureMap.sln 2008-10-05 03:29:12 UTC (rev 174) +++ trunk/Source/StructureMap.sln 2008-10-05 04:04:34 UTC (rev 175) @@ -46,8 +46,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureMap.Testing.GenericWidgets", "StructureMap.Testing.GenericWidgets\StructureMap.Testing.GenericWidgets.csproj", "{C205EA4C-4CD0-4221-A3CB-AFD835F0B263}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureMap.DataAccess", "StructureMap.DataAccess\StructureMap.DataAccess.csproj", "{DB798C07-0C82-4298-8BAA-D702CF96C28E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureMap.AutoMocking", "StructureMap.AutoMocking\StructureMap.AutoMocking.csproj", "{0ED1B206-A1C9-4A52-BA87-3BA416C8725C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureMapDoctor", "StructureMapDoctor\StructureMapDoctor.csproj", "{9048635D-A2CE-4387-A4F5-9BB1CFF04703}" @@ -202,21 +200,6 @@ {C205EA4C-4CD0-4221-A3CB-AFD835F0B263}.Release|Any CPU.Build.0 = Release|Any CPU {C205EA4C-4CD0-4221-A3CB-AFD835F0B263}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {C205EA4C-4CD0-4221-A3CB-AFD835F0B263}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Build|.NET.ActiveCfg = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Build|Any CPU.ActiveCfg = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Build|Any CPU.Build.0 = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Build|Mixed Platforms.ActiveCfg = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Build|Mixed Platforms.Build.0 = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Debug|.NET.ActiveCfg = Debug|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Release|.NET.ActiveCfg = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Release|Any CPU.Build.0 = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DB798C07-0C82-4298-8BAA-D702CF96C28E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {0ED1B206-A1C9-4A52-BA87-3BA416C8725C}.Build|.NET.ActiveCfg = Release|Any CPU {0ED1B206-A1C9-4A52-BA87-3BA416C8725C}.Build|Any CPU.ActiveCfg = Release|Any CPU {0ED1B206-A1C9-4A52-BA87-3BA416C8725C}.Build|Any CPU.Build.0 = Release|Any CPU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |