Menu
▾
▴
castleproject-commits — To register modifications on the SVN trunk
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(73) |
Nov
(127) |
Dec
(130) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(106) |
Feb
(74) |
Mar
(87) |
Apr
(61) |
May
(81) |
Jun
(121) |
Jul
(181) |
Aug
(210) |
Sep
(292) |
Oct
(156) |
Nov
(25) |
Dec
|
|
From: <sv...@ca...> - 2005-10-31 21:06:51
|
User: hammett
Date: 2005/10/31 04:01 PM
Added:
/trunk/InversionOfControl/Castle.Model.Tests/Resources/
UncResourceFactoryTestCase.cs
Modified:
/trunk/InversionOfControl/Castle.MicroKernel.Tests/
Castle.MicroKernel.Tests.csproj
/trunk/InversionOfControl/Castle.MicroKernel/SubSystems/Configuration/
DefaultConfigurationStore.cs
/trunk/InversionOfControl/Castle.Model.Tests/
Castle.Model.Tests.csproj
/trunk/InversionOfControl/Castle.Model.Tests/Resources/
FileResourceFactoryTestCase.cs
/trunk/InversionOfControl/Castle.Model/Resource/
FileResource.cs, UncResource.cs, UncResourceFactory.cs
/trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/
config_with_include.xml
/trunk/InversionOfControl/Castle.Windsor/
WindsorContainer.cs
/trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/
XmlInterpreter.cs
Log:
UncResource completed.
File Changes:
Directory: /trunk/InversionOfControl/Castle.MicroKernel.Tests/
==============================================================
File [modified]: Castle.MicroKernel.Tests.csproj
Delta lines: +1 -1
===================================================================
--- trunk/InversionOfControl/Castle.MicroKernel.Tests/Castle.MicroKernel.Tests.csproj 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.MicroKernel.Tests/Castle.MicroKernel.Tests.csproj 2005-10-31 21:01:58 UTC (rev 1277)
@@ -260,7 +260,7 @@
BuildAction = "Compile"
/>
<File
- RelPath = "Facilities\Startable\Componets\StartableComponent.cs"
+ RelPath = "Facilities\Startable\Components\StartableComponent.cs"
SubType = "Code"
BuildAction = "Compile"
/>
Directory: /trunk/InversionOfControl/Castle.Model.Tests/
========================================================
File [modified]: Castle.Model.Tests.csproj
Delta lines: +5 -0
===================================================================
--- trunk/InversionOfControl/Castle.Model.Tests/Castle.Model.Tests.csproj 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Model.Tests/Castle.Model.Tests.csproj 2005-10-31 21:01:58 UTC (rev 1277)
@@ -124,6 +124,11 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "Resources\UncResourceFactoryTestCase.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Resources\MoreRes\file2.txt"
BuildAction = "EmbeddedResource"
/>
Directory: /trunk/InversionOfControl/Castle.Windsor/
====================================================
File [modified]: WindsorContainer.cs
Delta lines: +2 -2
===================================================================
--- trunk/InversionOfControl/Castle.Windsor/WindsorContainer.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Windsor/WindsorContainer.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -72,13 +72,13 @@
RunInstaller();
}
- [Obsolete()]
+ [Obsolete("Use includes instead of cascade configurations")]
public WindsorContainer(IConfigurationInterpreter parent, IConfigurationInterpreter child) : this()
{
if (parent == null) throw new ArgumentNullException("parent");
if (child == null) throw new ArgumentNullException("child");
- // Kernel.ConfigurationStore = new CascadeConfigurationStore(parent, child);
+ Kernel.ConfigurationStore = new CascadeConfigurationStore(parent, child);
RunInstaller();
}
Directory: /trunk/InversionOfControl/Castle.MicroKernel/SubSystems/Configuration/
=================================================================================
File [modified]: DefaultConfigurationStore.cs
Delta lines: +5 -0
===================================================================
--- trunk/InversionOfControl/Castle.MicroKernel/SubSystems/Configuration/DefaultConfigurationStore.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.MicroKernel/SubSystems/Configuration/DefaultConfigurationStore.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -81,6 +81,11 @@
public IResource GetResource(String resourceUri, IResource resource)
{
+ if (resourceUri.IndexOf(Uri.SchemeDelimiter) == -1)
+ {
+ return resource.CreateRelative(resourceUri);
+ }
+
IResourceSubSystem subSystem = (IResourceSubSystem)
Kernel.GetSubSystem( SubSystemConstants.ResourceKey );
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/
=========================================================================
File [modified]: config_with_include.xml
Delta lines: +1 -1
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/config_with_include.xml 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/config_with_include.xml 2005-10-31 21:01:58 UTC (rev 1277)
@@ -1,6 +1,6 @@
<configuration>
- <include uri="file://include1.xml"/>
+ <include uri="include1.xml"/> <!-- this is also valid -->
<include uri="file://include2.xml"/>
</configuration>
\ No newline at end of file
Directory: /trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/
===============================================================================
File [modified]: XmlInterpreter.cs
Delta lines: +1 -14
===================================================================
--- trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -125,8 +125,7 @@
// Note that new properties values override old ones!
// properties values can reference another properties
- String value = EvalProperty(
- GetPreserveSpaceValue(node) ? node.InnerText : node.InnerText.Trim() );
+ String value = EvalProperty( node.InnerText.Trim() );
properties[node.Name] = value;
}
@@ -285,18 +284,6 @@
return att.Value;
}
- private bool GetPreserveSpaceValue(XmlNode node)
- {
- XmlAttribute att = node.Attributes["preserve_spaces"];
-
- if (att == null)
- {
- return false;
- }
-
- return att.Value.ToLower() == "true";
- }
-
private void ProcessInclude(XmlNode includeNode, IConfigurationStore store)
{
XmlAttribute resourceUriAtt = includeNode.Attributes["uri"];
Directory: /trunk/InversionOfControl/Castle.Model/Resource/
===========================================================
File [modified]: FileResource.cs
Delta lines: +4 -8
===================================================================
--- trunk/InversionOfControl/Castle.Model/Resource/FileResource.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Model/Resource/FileResource.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -86,15 +86,11 @@
private Stream CreateStreamFromPath(String filePath, String basePath)
{
- if (filePath == null) throw new ArgumentNullException("filePath");
- if (basePath == null) throw new ArgumentNullException("basePath");
+ if (filePath == null)
+ throw new ArgumentNullException("filePath");
+ if (basePath == null)
+ throw new ArgumentNullException("basePath");
- if (filePath.StartsWith(Uri.UriSchemeFile + Uri.SchemeDelimiter) )
- {
- return CreateStreamFromUri(
- new Uri(Uri.UriSchemeFile + Uri.SchemeDelimiter + filePath), basePath );
- }
-
if (!Path.IsPathRooted(filePath) || !File.Exists(filePath))
{
// For a relative path, we use the basePath to
File [modified]: UncResource.cs
Delta lines: +59 -3
===================================================================
--- trunk/InversionOfControl/Castle.Model/Resource/UncResource.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Model/Resource/UncResource.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -22,18 +22,74 @@
/// </summary>
public class UncResource : AbstractStreamResource
{
- public UncResource()
+ private readonly Stream stream;
+ private String basePath;
+
+ public UncResource(Uri resource)
{
+ stream = CreateStreamFromUri(resource, DefaultBasePath);
}
+ public UncResource(Uri resource, String basePath)
+ {
+ stream = CreateStreamFromUri(resource, basePath);
+ }
+
+ public UncResource(String resourceName) : this(new Uri(resourceName))
+ {
+ }
+
+ public UncResource(String resourceName, String basePath) : this(new Uri(resourceName), basePath)
+ {
+ }
+
protected override Stream Stream
{
- get { throw new NotImplementedException(); }
+ get { return stream; }
}
+ public override String FileBasePath
+ {
+ get { return basePath; }
+ }
+
public override IResource CreateRelative(String resourceName)
{
- throw new NotImplementedException();
+ return new UncResource( Path.Combine(basePath, resourceName) );
}
+
+ private Stream CreateStreamFromUri(Uri resource, String basePath)
+ {
+ if (resource == null)
+ throw new ArgumentNullException("resource");
+ if (!resource.IsUnc)
+ throw new ArgumentException("Resource must be an Unc", "resource");
+ if (!resource.IsFile)
+ throw new ArgumentException("The specified resource is not a file", "resource");
+
+ int count = Uri.UriSchemeFile.Length + Uri.SchemeDelimiter.Length;
+
+ String filePath = @"\\" + resource.AbsoluteUri.Substring(count);
+
+ if (!File.Exists(filePath) && basePath != null)
+ {
+ filePath = Path.Combine( basePath, filePath );
+ }
+
+ this.basePath = Path.GetDirectoryName(filePath);
+
+ CheckFileExists(filePath);
+
+ return File.OpenRead(filePath);
+ }
+
+ private void CheckFileExists(String path)
+ {
+ if (!File.Exists(path))
+ {
+ String message = String.Format("File {0} could not be found", path);
+ throw new ResourceException(message);
+ }
+ }
}
}
File [modified]: UncResourceFactory.cs
Delta lines: +2 -2
===================================================================
--- trunk/InversionOfControl/Castle.Model/Resource/UncResourceFactory.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Model/Resource/UncResourceFactory.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -30,12 +30,12 @@
public IResource Create(Uri uri)
{
- throw new NotImplementedException();
+ return new UncResource(uri);
}
public IResource Create(Uri uri, String basePath)
{
- throw new NotImplementedException();
+ return new UncResource(uri, basePath);
}
}
}
Directory: /trunk/InversionOfControl/Castle.Model.Tests/Resources/
==================================================================
File [modified]: FileResourceFactoryTestCase.cs
Delta lines: +0 -6
===================================================================
--- trunk/InversionOfControl/Castle.Model.Tests/Resources/FileResourceFactoryTestCase.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Model.Tests/Resources/FileResourceFactoryTestCase.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -50,7 +50,6 @@
Uri uri = new Uri(fileInfo.FullName);
- // IResource resource = resFactory.Create( new Uri("file://" + fileInfo.FullName), null );
IResource resource = resFactory.Create( uri, null );
Assert.IsNotNull(resource);
@@ -61,7 +60,6 @@
[Test]
public void CreateWithRelativePath()
{
- // IResource resource = resFactory.Create( new Uri("file://" + basePath + "/file1.txt") );
IResource resource = resFactory.Create( new Uri(basePath + "/file1.txt") );
Assert.IsNotNull(resource);
@@ -73,10 +71,7 @@
public void CreateWithRelativePathAndContext()
{
Uri uri = new Uri("file://file1.txt");
- Console.WriteLine(uri.ToString());
- Console.WriteLine(uri.IsFile);
- // IResource resource = resFactory.Create( new Uri("file://file1.txt"), basePath );
IResource resource = resFactory.Create( uri, basePath );
Assert.IsNotNull(resource);
@@ -88,7 +83,6 @@
[ExpectedException(typeof(ResourceException))]
public void NonExistingResource()
{
- // resFactory.Create( new Uri("file://" + basePath + "/Something/file1.txt") );
resFactory.Create( new Uri(basePath + "/Something/file1.txt") );
}
}
File [added]: UncResourceFactoryTestCase.cs
Delta lines: +69 -0
===================================================================
--- trunk/InversionOfControl/Castle.Model.Tests/Resources/UncResourceFactoryTestCase.cs 2005-10-31 20:29:18 UTC (rev 1276)
+++ trunk/InversionOfControl/Castle.Model.Tests/Resources/UncResourceFactoryTestCase.cs 2005-10-31 21:01:58 UTC (rev 1277)
@@ -0,0 +1,69 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Model.Tests.Resources
+{
+ using System;
+
+ using NUnit.Framework;
+
+ using Castle.Model.Resource;
+
+
+ [TestFixture]
+ public class UncResourceFactoryTestCase
+ {
+ private UncResourceFactory resFactory = new UncResourceFactory();
+
+ [Test]
+ public void Accept()
+ {
+ Assert.IsTrue( resFactory.Accept( new Uri(@"\\server\something") ) );
+ Assert.IsFalse( resFactory.Accept( new Uri("http://www.castleproject.org") ) );
+ }
+
+ [Test, Ignore("Requires network share")]
+ public void CreateWithAbsolutePath()
+ {
+ Uri uri = new Uri(@"\\hammet\C$\file1.txt");
+
+ IResource resource = resFactory.Create( uri, null );
+
+ Assert.IsNotNull(resource);
+ String line = resource.GetStreamReader().ReadLine();
+ Assert.AreEqual("The long and winding road", line);
+ }
+
+ [Test, Ignore("Requires network share")]
+ public void CreateRelative()
+ {
+ Uri uri = new Uri(@"\\hammet\C$\file1.txt");
+
+ IResource resource = resFactory.Create( uri, null );
+
+ resource = resource.CreateRelative("file2.txt");
+
+ Assert.IsNotNull(resource);
+ String line = resource.GetStreamReader().ReadLine();
+ Assert.AreEqual("Something", line);
+ }
+
+ [Test]
+ [ExpectedException(typeof(ResourceException))]
+ public void NonExistingResource()
+ {
+ resFactory.Create( new Uri(@"\\hammettz\C$\file1.txt") );
+ }
+ }
+}
|
|
From: <sv...@ca...> - 2005-10-31 20:33:55
|
User: hammett
Date: 2005/10/31 03:29 PM
Added:
/trunk/MonoRail/TestSiteNVelocity/views/rescues/
appException.vm, argException.vm, methodDefaultException.vm
Modified:
/trunk/MonoRail/Castle.MonoRail.Framework.Tests/
DescriptorBuilderMultiThreadedTestCase.cs
/trunk/MonoRail/Castle.MonoRail.Framework.Views.NVelocity.Tests/
NVelocityRescueTestCase.cs
/trunk/MonoRail/Castle.MonoRail.Framework/
Controller.cs
/trunk/MonoRail/Castle.MonoRail.Framework/Attributes/
RescueAttribute.cs
/trunk/MonoRail/Castle.MonoRail.Framework/Internal/
ControllerDescriptorBuilder.cs, ControllerMetaDescriptor.cs
/trunk/MonoRail/Castle.MonoRail.TestSupport/
AbstractMRTestCase.cs
/trunk/MonoRail/TestSiteNVelocity/
TestSiteNVelocity.csproj
/trunk/MonoRail/TestSiteNVelocity/Controllers/
RescueController.cs
Log:
Applied Ahmed Ghandour's <agh...@ry...> patch to MR-43
File Changes:
Directory: /trunk/MonoRail/Castle.MonoRail.Framework/Attributes/
================================================================
File [modified]: RescueAttribute.cs
Delta lines: +22 -6
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Framework/Attributes/RescueAttribute.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.Framework/Attributes/RescueAttribute.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -21,29 +21,45 @@
/// or an action (method). The rescue is invoked in
/// response to some exception during the action processing.
/// </summary>
- [AttributeUsage(AttributeTargets.Class|AttributeTargets.Method, AllowMultiple=false), Serializable]
+ [AttributeUsage(AttributeTargets.Class|AttributeTargets.Method, AllowMultiple=true), Serializable]
public class RescueAttribute : Attribute
{
- private String _viewName;
+ private String viewName;
+ private Type exceptionType;
/// <summary>
/// Constructs a RescueAttribute with the template name.
/// </summary>
/// <param name="viewName"></param>
- public RescueAttribute(String viewName)
+ public RescueAttribute(String viewName) : this( viewName, typeof(Exception) )
+ {
+ }
+
+ public RescueAttribute(String viewName, Type exceptionType)
{
if (viewName == null || viewName.Length == 0)
{
throw new ArgumentNullException("viewName");
}
-
- _viewName = viewName;
+
+ if (exceptionType != null && !typeof(Exception).IsAssignableFrom(exceptionType) )
+ {
+ throw new ArgumentException("exceptionType must be an type assignable from Exception");
+ }
+
+ this.viewName = viewName;
+ this.exceptionType = exceptionType;
}
public String ViewName
{
- get { return _viewName; }
+ get { return viewName; }
}
+
+ public Type ExceptionType
+ {
+ get { return exceptionType; }
+ }
}
/// <summary>
Directory: /trunk/MonoRail/Castle.MonoRail.Framework/
=====================================================
File [modified]: Controller.cs
Delta lines: +40 -31
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Framework/Controller.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.Framework/Controller.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -981,54 +981,63 @@
#region Rescue
protected virtual bool PerformRescue(MethodInfo method, Exception ex)
- {
- if (ex is TargetInvocationException)
- {
- _context.LastException = ex.InnerException;
- }
- else
- {
- _context.LastException = ex;
- }
-
+ {
+ _context.LastException = (ex is TargetInvocationException) ? ex.InnerException : ex;
+
// Dynamic action
if (method == null) return false;
+ Type exceptionType = _context.LastException.GetType();
+
ActionMetaDescriptor actionMeta = metaDescriptor.GetAction(method);
+
+ if (actionMeta.SkipRescue != null) return false;
+
+ RescueAttribute att = GetRescueAttributeFor(actionMeta.Rescues, exceptionType);
+
+ if (att == null)
+ {
+ att = GetRescueAttributeFor(metaDescriptor.Rescues, exceptionType);
- if (method != null && actionMeta.SkipRescue != null)
- {
- return false;
+ if (att == null) return false;
}
-
- RescueAttribute att = null;
-
- if (method != null && actionMeta.Rescue != null)
+
+ try
{
- att = actionMeta.Rescue;
+ _selectedViewName = String.Format("rescues\\{0}", att.ViewName);
+ ProcessView();
+ return true;
}
- else if (metaDescriptor.Rescue != null)
+ catch (Exception e)
{
- att = metaDescriptor.Rescue;
+ // In this situation, the rescue view could not be found
+ // So we're back to the default error exibition
+ Console.WriteLine(e);
}
- if (att != null)
+ return false;
+ }
+
+ protected virtual RescueAttribute GetRescueAttributeFor(IList rescues, Type exceptionType)
+ {
+ if (rescues == null || rescues.Count == 0) return null;
+
+ RescueAttribute bestCandidate = null;
+
+ foreach(RescueAttribute rescue in rescues)
{
- try
+ if (rescue.ExceptionType == exceptionType)
{
- _selectedViewName = String.Format("rescues\\{0}", att.ViewName);
- ProcessView();
- return true;
+ return rescue;
}
- catch (Exception e)
+ else if (rescue.ExceptionType != null &&
+ rescue.ExceptionType.IsAssignableFrom(exceptionType))
{
- // In this situation, the rescue view could not be found
- // So we're back to the default error exibition
- Console.WriteLine(e);
+ bestCandidate = rescue;
}
}
-
- return false;
+
+ return bestCandidate;
}
#endregion
Directory: /trunk/MonoRail/Castle.MonoRail.Framework.Tests/
===========================================================
File [modified]: DescriptorBuilderMultiThreadedTestCase.cs
Delta lines: +3 -3
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Framework.Tests/DescriptorBuilderMultiThreadedTestCase.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.Framework.Tests/DescriptorBuilderMultiThreadedTestCase.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -67,12 +67,12 @@
Assert.AreEqual( 0, desc1.ActionProviders.Count );
Assert.AreEqual( 1, desc1.Filters.Count );
Assert.IsNotNull( desc1.Layout );
- Assert.IsNotNull( desc1.Rescue );
+ Assert.IsNotNull( desc1.Rescues );
Assert.AreEqual( 0, desc2.ActionProviders.Count );
Assert.AreEqual( 1, desc2.Filters.Count );
Assert.IsNotNull( desc2.Layout );
- Assert.IsNotNull( desc2.Rescue );
+ Assert.IsNotNull( desc2.Rescues );
ActionMetaDescriptor ac1 = desc1.GetAction( typeof(Controller1).GetMethod("Index") );
Assert.IsNotNull( ac1.SkipRescue );
@@ -123,4 +123,4 @@
return true;
}
}
-}
\ No newline at end of file
+}
Directory: /trunk/MonoRail/Castle.MonoRail.Framework.Views.NVelocity.Tests/
===========================================================================
File [modified]: NVelocityRescueTestCase.cs
Delta lines: +56 -0
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Framework.Views.NVelocity.Tests/NVelocityRescueTestCase.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.Framework.Views.NVelocity.Tests/NVelocityRescueTestCase.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -24,5 +24,61 @@
[TestFixture]
public class NVelocityRescueTestCase : RescueTestCase
{
+ [Test]
+ public void RescueWithSkipRescue()
+ {
+ DoGet("rescuable/MethodWithSkipRescue.rails");
+ AssertStatusCode(500);
+ }
+
+ [Test]
+ public void RescueWithAppExceptionType()
+ {
+ DoGet("rescuable/RescueWithExceptionsByType.rails", "exceptionType=appException");
+
+ AssertSuccess();
+
+ AssertReplyEqualsTo( "appException" );
+ }
+
+ [Test]
+ public void RescueWithArgExceptionType()
+ {
+ DoGet("rescuable/RescueWithExceptionsByType.rails", "exceptionType=argException");
+
+ AssertSuccess();
+
+ AssertReplyEqualsTo( "argException" );
+ }
+
+ [Test]
+ public void RescueWithControllerDefaultExceptionType()
+ {
+ DoGet("rescuable/RescueWithExceptionsByType.rails");
+
+ AssertSuccess();
+
+ AssertReplyEqualsTo( "An error happened" );
+ }
+
+ [Test]
+ public void RescueWithMethodDefaultArgExceptionType()
+ {
+ DoGet("rescuable/RescueWithExceptionsByTypeWithDefaultException.rails", "exceptionType=argException");
+
+ AssertSuccess();
+
+ AssertReplyEqualsTo( "argException" );
+ }
+
+ [Test]
+ public void RescueWithMethodDefaultExceptionType()
+ {
+ DoGet("rescuable/RescueWithExceptionsByTypeWithDefaultException.rails");
+
+ AssertSuccess();
+
+ AssertReplyEqualsTo( "methodDefaultException" );
+ }
}
}
Directory: /trunk/MonoRail/Castle.MonoRail.TestSupport/
=======================================================
File [modified]: AbstractMRTestCase.cs
Delta lines: +7 -0
===================================================================
--- trunk/MonoRail/Castle.MonoRail.TestSupport/AbstractMRTestCase.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.TestSupport/AbstractMRTestCase.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -163,6 +163,13 @@
#region Available Asserts
+ protected void AssertStatusCode(int expectedCode)
+ {
+ Assert.IsNotNull(response, "No requests performed with DoGet or DoPost (?)");
+ Assert.IsTrue(response.StatusCode == expectedCode, "Expecting status code {0} when it was in fact {1} {2}",
+ response.StatusCode, response.StatusDescription);
+ }
+
/// <summary>
/// Asserts the return status code is less than 400
/// </summary>
Directory: /trunk/MonoRail/TestSiteNVelocity/Controllers/
=========================================================
File [modified]: RescueController.cs
Delta lines: +34 -1
===================================================================
--- trunk/MonoRail/TestSiteNVelocity/Controllers/RescueController.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/TestSiteNVelocity/Controllers/RescueController.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -20,13 +20,19 @@
[Rescue("general")]
[ControllerDetails("rescuable")]
- public class RescueController : Controller
+ public class RescueController : SmartDispatcherController
{
public void Index()
{
throw new ApplicationException();
}
+ [SkipRescue]
+ public void MethodWithSkipRescue()
+ {
+ throw new ApplicationException();
+ }
+
[Rescue("saveerror")]
public void Save()
{
@@ -46,5 +52,32 @@
{
throw new ApplicationException("custom msg");
}
+
+ [Rescue("appException",typeof(ApplicationException))]
+ [Rescue("argException",typeof(ArgumentException))]
+ public void RescueWithExceptionsByType(String exceptionType)
+ {
+ if( exceptionType == "appException" )
+ throw new ApplicationException("appException");
+
+ if( exceptionType == "argException" )
+ throw new ArgumentException("argException");
+
+ throw new Exception();
+ }
+
+ [Rescue("methodDefaultException")]
+ [Rescue("appException",typeof(ApplicationException))]
+ [Rescue("argException",typeof(ArgumentException))]
+ public void RescueWithExceptionsByTypeWithDefaultException(string exceptionType)
+ {
+ if( exceptionType == "appException" )
+ throw new ApplicationException("appException");
+
+ if( exceptionType == "argException" )
+ throw new ArgumentException("argException");
+
+ throw new Exception();
+ }
}
}
Directory: /trunk/MonoRail/Castle.MonoRail.Framework/Internal/
==============================================================
File [modified]: ControllerDescriptorBuilder.cs
Delta lines: +2 -2
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Framework/Internal/ControllerDescriptorBuilder.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.Framework/Internal/ControllerDescriptorBuilder.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -99,7 +99,7 @@
if (attributes.Length != 0)
{
- descriptor.GetAction(method).Rescue = (RescueAttribute) attributes[0];
+ descriptor.GetAction(method).Rescues = attributes;
}
attributes = method.GetCustomAttributes(typeof(SkipRescueAttribute), true);
@@ -175,7 +175,7 @@
if (attributes.Length != 0)
{
- descriptor.Rescue = (RescueAttribute) attributes[0];
+ descriptor.Rescues = attributes;
}
attributes = controllerType.GetCustomAttributes( typeof(ScaffoldingAttribute), false );
File [modified]: ControllerMetaDescriptor.cs
Delta lines: +4 -4
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Framework/Internal/ControllerMetaDescriptor.cs 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/Castle.MonoRail.Framework/Internal/ControllerMetaDescriptor.cs 2005-10-31 20:29:18 UTC (rev 1276)
@@ -21,7 +21,7 @@
public abstract class BaseMetaDescriptor
{
private LayoutAttribute layout;
- private RescueAttribute rescue;
+ private IList rescues;
private IList resources = new ArrayList();
public LayoutAttribute Layout
@@ -30,10 +30,10 @@
set { layout = value; }
}
- public RescueAttribute Rescue
+ public IList Rescues
{
- get { return rescue; }
- set { rescue = value; }
+ get { return rescues; }
+ set { rescues = value; }
}
public IList Resources
Directory: /trunk/MonoRail/TestSiteNVelocity/
=============================================
File [modified]: TestSiteNVelocity.csproj
Delta lines: +12 -0
===================================================================
--- trunk/MonoRail/TestSiteNVelocity/TestSiteNVelocity.csproj 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/TestSiteNVelocity/TestSiteNVelocity.csproj 2005-10-31 20:29:18 UTC (rev 1276)
@@ -381,10 +381,22 @@
BuildAction = "None"
/>
<File
+ RelPath = "views\rescues\appException.vm"
+ BuildAction = "None"
+ />
+ <File
+ RelPath = "views\rescues\argException.vm"
+ BuildAction = "None"
+ />
+ <File
RelPath = "views\rescues\general.vm"
BuildAction = "None"
/>
<File
+ RelPath = "views\rescues\methodDefaultException.vm"
+ BuildAction = "None"
+ />
+ <File
RelPath = "views\rescues\saveerror.vm"
BuildAction = "None"
/>
Directory: /trunk/MonoRail/TestSiteNVelocity/views/rescues/
===========================================================
File [added]: appException.vm
Delta lines: +1 -0
===================================================================
--- trunk/MonoRail/TestSiteNVelocity/views/rescues/appException.vm 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/TestSiteNVelocity/views/rescues/appException.vm 2005-10-31 20:29:18 UTC (rev 1276)
@@ -0,0 +1 @@
+appException
\ No newline at end of file
File [added]: argException.vm
Delta lines: +1 -0
===================================================================
--- trunk/MonoRail/TestSiteNVelocity/views/rescues/argException.vm 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/TestSiteNVelocity/views/rescues/argException.vm 2005-10-31 20:29:18 UTC (rev 1276)
@@ -0,0 +1 @@
+argException
\ No newline at end of file
File [added]: methodDefaultException.vm
Delta lines: +1 -0
===================================================================
--- trunk/MonoRail/TestSiteNVelocity/views/rescues/methodDefaultException.vm 2005-10-31 18:18:12 UTC (rev 1275)
+++ trunk/MonoRail/TestSiteNVelocity/views/rescues/methodDefaultException.vm 2005-10-31 20:29:18 UTC (rev 1276)
@@ -0,0 +1 @@
+methodDefaultException
\ No newline at end of file
|
|
From: <sv...@ca...> - 2005-10-31 18:22:59
|
User: hammett
Date: 2005/10/31 01:18 PM
Added:
/trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/
properties_using_properties.xml
Modified:
/trunk/InversionOfControl/Castle.Windsor.Tests/
Castle.Windsor.Tests.csproj
/trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/
PropertiesTestCase.cs
/trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/
XmlInterpreter.cs
Log:
More tests.
File Changes:
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/
==========================================================
File [modified]: Castle.Windsor.Tests.csproj
Delta lines: +4 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-31 17:12:19 UTC (rev 1274)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-31 18:18:12 UTC (rev 1275)
@@ -319,6 +319,10 @@
BuildAction = "Content"
/>
<File
+ RelPath = "Configuration2\Properties\properties_using_properties.xml"
+ BuildAction = "Content"
+ />
+ <File
RelPath = "Configuration2\Properties\PropertiesTestCase.cs"
SubType = "Code"
BuildAction = "Compile"
Directory: /trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/
===============================================================================
File [modified]: XmlInterpreter.cs
Delta lines: +1 -1
===================================================================
--- trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs 2005-10-31 17:12:19 UTC (rev 1274)
+++ trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs 2005-10-31 18:18:12 UTC (rev 1275)
@@ -52,7 +52,7 @@
/// i.e. #{my_node_name} || #{ my.node.name }
/// spaces are trimmed
/// </summary>
- private static Regex PropertyValidationRegExp = new Regex( @"(\#\{\s*((?:\w|\.)+)\s*\})", RegexOptions.Compiled);
+ private static readonly Regex PropertyValidationRegExp = new Regex( @"(\#\{\s*((?:\w|\.)+)\s*\})", RegexOptions.Compiled);
private IDictionary properties = new HybridDictionary();
#region Constructors
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/
====================================================================================
File [modified]: PropertiesTestCase.cs
Delta lines: +11 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/PropertiesTestCase.cs 2005-10-31 17:12:19 UTC (rev 1274)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/PropertiesTestCase.cs 2005-10-31 18:18:12 UTC (rev 1275)
@@ -41,6 +41,17 @@
}
[Test]
+ public void PropertiesWithinProperties()
+ {
+ String file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dir +
+ "properties_using_properties.xml");
+
+ container = new WindsorContainer(file);
+
+ AssertConfiguration();
+ }
+
+ [Test]
public void PropertiesAndIncludes()
{
String file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dir +
File [added]: properties_using_properties.xml
Delta lines: +34 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/properties_using_properties.xml 2005-10-31 17:12:19 UTC (rev 1274)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/properties_using_properties.xml 2005-10-31 18:18:12 UTC (rev 1275)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <properties>
+ <prop>value</prop>
+ <prop1>prop1 #{prop}</prop1>
+ <prop2>prop2 #{prop}</prop2>
+ </properties>
+
+ <facilities>
+
+ <facility id="testidengine" >
+ <item>#{prop1}</item>
+ </facility>
+
+ <facility id="testidengine2" >
+ <item value="#{prop2}"/>
+ </facility>
+
+ </facilities>
+
+ <components>
+
+ <component id="testidcomponent1">
+ <item>#{prop1}</item>
+ </component>
+
+ <component id="testidcomponent2">
+ <item value="#{prop2}"/>
+ </component>
+
+ </components>
+
+</configuration>
|
|
From: hammett <ha...@uo...> - 2005-10-31 17:55:44
|
1.1 and 2.0 The build is running with 1.1 Even after your last commit the build fails. ----- Original Message ----- From: Ayende Rahien To: cas...@li... Sent: Monday, October 31, 2005 2:54 PM Subject: RE: [castle-commits] castle Build Failed WTF? Why is it doing this? What runtime does the build machine has? From: cas...@li... [mailto:cas...@li...] On Behalf Of bui...@ca... Sent: Monday, October 31, 2005 6:49 PM To: cas...@li... Subject: [castle-commits] castle Build Failed CruiseControl.NET Build Results for project castle (web page) BUILD FAILED Project:castle Date of build:31/10/2005 14:41:34 Running time:00:06:55 Build condition:Modifications Detected Last changed:2005-10-31 14:36:28 Last log entry:Enabling brail build again. Errors: (4) Failure scanning "E:\dev\others\ccnet\castlebuild\MonoRail\bin\Boo.NAnt.Tasks.dll" for extensions. Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. Nested build failed. Refer to build log for exact reason. Nested build failed. Refer to build log for exact reason. Warnings: (19) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Builder\CodeBuilder\Utils\OpCodeUtil.cs(52,22): warning CS1573: Parameter 'type' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Builder\CodeGenerators\BaseCodeGenerator.cs(636,26): warning CS1573: Parameter 'method' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\ProxyGenerator.cs(126,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\ProxyGenerator.cs(138,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but othe r parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\ProxyGenerator.cs(155,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\ProxyGenerator.cs(168,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Builder\CodeGenerators\ClassProxyGenerator.cs(60,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Builder\CodeGenerators\InterfaceProxyGenerator.cs(56,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\ castlebuild\InversionOfControl\Castle.MicroKernel\IKernelEvents.cs(44,2): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\InversionOfControl\Castle.Windsor\Configuration\CascadeConfigurationStore.cs(32,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Services\Logging\Castle.Services.Logging.Web\WebLogger.cs(205,9): warning CS1570: XML comment on 'Castle.Services.Logging.Web.WebLogger.Error(string, params object[])' has badly formed XML -- 'End tag 'summary' does not match the start tag 'member'. e:\dev\others\ccnet\castlebuild\ActiveRecord\Castle.ActiveRecord.Framework.Internal.Tests\Model\ClassWithMappedField.cs(25,18): warning CS0169: The private field 'Castle.ActiveRecord.Framework.Internal.Tests.Model.ClassWithMappedField.name1' is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Controller.cs(776,29): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\AjaxHelper.cs(109,17): warning CS1573: Parameter 'url' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\AjaxHelper.cs(109,17): warning CS1573: Parameter 'options' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\HtmlHelper.cs(386,54): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.MapToVirtual(string)' has cref attribute 'target' that could not be found e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\HtmlHelper.cs(763,4): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.InputText(string, string, System.Collections.IDictionary)' has badly formed XML -- 'End tag 'member' does not match the start tag 'summary'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\HtmlHelper.cs(1770,9): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.BuildListItem(string, string)' has badly formed XML -- 'End tag 'remarks' does not match the start tag 'para'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\ValidationHelper.cs(51,42): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.ValidationHelper.VirtualDir' has cref attribute 'Controller.Context.ApplicationPath' that could not be found < table class="section-table" cellpadding="2" cellspacing="0" border="0" width="98%"> Tests run: 459, Failures: 0, Not run: 10, Time: NaN seconds All Tests PassedWarningCastle.DynamicProxy.Test.SerializableClassTestCase.XmlSerializationWarningCastle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphsWarningCastle.MicroKernel.Tests.SerializationTestCase.KernelSerializationWarningCastle.MicroKernel.Tests.SerializationTestCase.RemoteAccessWarningCastle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRelativeIncludes2WarningCastle.Components.Common.TemplateEngine.NVel ocityTemplateEngine.Tests.NVelocityTestCase.SimpleTemplateProcessingWithinResourceWarningCastle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverComponentTestCase.LoadWindsorAssemblyWarningCastle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMapWarningCastle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCacheWarningCastle.ActiveRecord.Tests.TableHierarchyTestCase.ManyToManyUsingIDBag Warning Details (10) Test:Castle.DynamicProxy.Test.SerializableClassTestCase.XmlSerializationType:WarningMessage:XmlSerializer does not respect the ObjectReference protocol so it wont work Test:Castle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphsType:WarningMessage:Since the modification for hierarchy of dependencies, cycles are not supported Test:Cas tle.MicroKernel.Tests.SerializationTestCase.KernelSerializationType:WarningMessage:For some reason the deserialization of kernel members is resulting in null values Test:Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccessType:WarningMessage:To compile on Mono Test:Castle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRelativeIncludes2Type:WarningMessage:.net 2.0 problems Test:Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.Tests.NVelocityTestCase.SimpleTemplateProcessingWithinResourceType:WarningMessage:Not working with NAnt/command line Test:Castle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverComponentTestCase.LoadWindsorAssemblyType:WarningMessage:Requires h uman interaction Test:Castle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMapType:WarningMessage:Need to complete this test case! Test:Castle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCacheType:WarningMessage:Jira issue for NH team Test:Castle.ActiveRecord.Tests.TableHi erarchyTestCase.ManyToManyUsingIDBagType:WarningMessage:Create schema does not create all necessary tables for this test case Modifications since last build (1) Modifiedhammett/trunk/MonoRail/monorail.buildEnabling brail build again.2005-10-31 14:36:28 |
|
From: <sv...@ca...> - 2005-10-31 17:17:31
|
User: ayende
Date: 2005/10/31 12:12 PM
Modified:
/trunk/MonoRail/Castle.MonoRail.Views.Brail/
Default.build
Log:
Fixing some problems with the build script for Brail
File Changes:
Directory: /trunk/MonoRail/Castle.MonoRail.Views.Brail/
=======================================================
File [modified]: Default.build
Delta lines: +5 -3
===================================================================
--- trunk/MonoRail/Castle.MonoRail.Views.Brail/Default.build 2005-10-31 16:36:28 UTC (rev 1273)
+++ trunk/MonoRail/Castle.MonoRail.Views.Brail/Default.build 2005-10-31 17:12:19 UTC (rev 1274)
@@ -3,6 +3,7 @@
<property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/../bin" />
+ <property name="sample.dir" value="${base.dir}/../TestSiteBrail" />
<include buildfile="../../common.inc" />
@@ -27,8 +28,8 @@
<references basedir="${bin.dir}">
<include name="System.Xml.dll"/>
<include name="System.Web.dll"/>
- <include name="${library.dir}\anrControls.Markdown.NET.dll"/>
- <include name="${library.dir}\WSABoo.Parser.dll"/>
+ <include name="${bin.dir}\anrControls.Markdown.NET.dll"/>
+ <include name="${bin.dir}\WSABoo.Parser.dll"/>
<include name="${bin.dir}\Castle.MonoRail.Framework.dll"/>
</references>
</booc>
@@ -44,7 +45,8 @@
</sources>
<references basedir="${bin.dir}">
<include name="${bin.dir}\${assembly.name}" />
- <include name="${bin.dir}\nunit.framework.dll" />
+ <!-- get NUnit from the GAC -->
+ <include name="nunit.framework.dll" />
<include name="${bin.dir}\Castle.MonoRail.TestSupport.dll"/>
<include name="${bin.dir}\Castle.MonoRail.Framework.Dll"/>
<include name="${bin.dir}\Castle.MonoRail.Framework.Tests.Dll"/>
|
|
From: Ayende R. <Ay...@ay...> - 2005-10-31 16:55:23
|
WTF? Why is it doing this? What runtime does the build machine has? _____ From: cas...@li... [mailto:cas...@li...] On Behalf Of bui...@ca... Sent: Monday, October 31, 2005 6:49 PM To: cas...@li... Subject: [castle-commits] castle Build Failed CruiseControl.NET Build Results for project castle (web page <http://localhost/ccnet/castle> ) _____ BUILD FAILED Project: castle Date of build: 31/10/2005 14:41:34 Running time: 00:06:55 Build condition: Modifications Detected Last changed: 2005-10-31 14:36:28 Last log entry: Enabling brail build again. Errors: (4) Failure scanning "E:\dev\others\ccnet\castlebuild\MonoRail\bin\Boo.NAnt.Tasks.dll" for extensions. Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. Nested build failed. Refer to build log for exact reason. Nested build failed. Refer to build log for exact reason. Warnings: (19) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Build er\CodeBuilder\Utils\OpCodeUtil.cs(52,22): warning CS1573: Parameter 'type' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Build er\CodeGenerators\BaseCodeGenerator.cs(636,26): warning CS1573: Parameter 'method' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Proxy Generator.cs(126,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Proxy Generator.cs(138,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but othe r parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Proxy Generator.cs(155,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Proxy Generator.cs(168,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Build er\CodeGenerators\ClassProxyGenerator.cs(60,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\Build er\CodeGenerators\InterfaceProxyGenerator.cs(56,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\ castlebuild\InversionOfControl\Castle.MicroKernel\IKernelEvents.cs(44,2): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\InversionOfControl\Castle.Windsor\Configurat ion\CascadeConfigurationStore.cs(32,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Services\Logging\Castle.Services.Logging.Web \WebLogger.cs(205,9): warning CS1570: XML comment on 'Castle.Services.Logging.Web.WebLogger.Error(string, params object[])' has badly formed XML -- 'End tag 'summary' does not match the start tag 'member'. e:\dev\others\ccnet\castlebuild\ActiveRecord\Castle.ActiveRecord.Framework.I nternal.Tests\Model\ClassWithMappedField.cs(25,18): warning CS0169: The private field 'Castle.ActiveRecord.Framework.Internal.Tests.Model.ClassWithMappedField.nam e1' is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Controlle r.cs(776,29): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\A jaxHelper.cs(109,17): warning CS1573: Parameter 'url' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\A jaxHelper.cs(109,17): warning CS1573: Parameter 'options' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\H tmlHelper.cs(386,54): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.MapToVirtual(string)' has cref attribute 'target' that could not be found e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\H tmlHelper.cs(763,4): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.InputText(string, string, System.Collections.IDictionary)' has badly formed XML -- 'End tag 'member' does not match the start tag 'summary'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\H tmlHelper.cs(1770,9): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.BuildListItem(string, string)' has badly formed XML -- 'End tag 'remarks' does not match the start tag 'para'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpers\V alidationHelper.cs(51,42): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.ValidationHelper.VirtualDir' has cref attribute 'Controller.Context.ApplicationPath' that could not be found < table class="section-table" cellpadding="2" cellspacing="0" border="0" width="98%"> Tests run: 459, Failures: 0, Not run: 10, Time: NaN seconds All Tests PassedWarningCastle.DynamicProxy.Test.SerializableClassTestCase.XmlSerializa tionWarningCastle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphsWarn ingCastle.MicroKernel.Tests.SerializationTestCase.KernelSerializationWarning Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccessWarningCastle.Win dsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRelativeIncludes2W arningCastle.Components.Common.TemplateEngine.NVel ocityTemplateEngine.Tests.NVelocityTestCase.SimpleTemplateProcessingWithinRe sourceWarningCastle.Components.Winforms.AssemblyResolver.Tests.AssemblyResol verComponentTestCase.LoadWindsorAssemblyWarningCastle.ActiveRecord.Tests.Act iveRecordTestCase.RelationMapWarningCastle.ActiveRecord.Tests.TableHierarchy TestCase.InvalidSessionCacheWarningCastle.ActiveRecord.Tests.TableHierarchyT estCase.ManyToManyUsingIDBag Warning Details (10) Test:Castle.DynamicProxy.Test.SerializableClassTestCase.XmlSerializationType :WarningMessage:XmlSerializer does not respect the ObjectReference protocol so it wont work _____ Test:Castle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphsType:Warni ngMessage:Since the modification for hierarchy of dependencies, cycles are not supported _____ Test:Cas tle.MicroKernel.Tests.SerializationTestCase.KernelSerializationType:WarningM essage:For some reason the deserialization of kernel members is resulting in null values _____ Test:Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccessType:Warning Message:To compile on Mono _____ Test:Castle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRel ativeIncludes2Type:WarningMessage:.net 2.0 problems _____ Test:Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.Tests.N VelocityTestCase.SimpleTemplateProcessingWithinResourceType:WarningMessage:N ot working with NAnt/command line _____ Test:Castle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverCompo nentTestCase.LoadWindsorAssemblyType:WarningMessage:Requires h uman interaction _____ Test:Castle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMapType:WarningM essage:Need to complete this test case! _____ Test:Castle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCacheTyp e:WarningMessage:Jira issue for NH team _____ Test:Castle.ActiveRecord.Tests.TableHi erarchyTestCase.ManyToManyUsingIDBagType:WarningMessage:Create schema does not create all necessary tables for this test case Modifications since last build (1) Modified hammett /trunk/MonoRail/monorail.build Enabling brail build again. 2005-10-31 14:36:28 |
|
From: <bui...@ca...> - 2005-10-31 16:49:29
|
CruiseControl.NET Build Results for project castle (web page <http://localhost/ccnet/castle> ) _____ BUILD FAILED Project: castle Date of build: 31/10/2005 14:41:34 Running time: 00:06:55 Build condition: Modifications Detected Last changed: 2005-10-31 14:36:28 Last log entry: Enabling brail build again. Errors: (4) Failure scanning "E:\dev\others\ccnet\castlebuild\MonoRail\bin\Boo.NAnt.Tasks.dll" for extensions. Unable to load one or more of the requested types. Retrieve the LoaderExceptions property for more information. Nested build failed. Refer to build log for exact reason. Nested build failed. Refer to build log for exact reason. Warnings: (19) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeBuilder\Utils\OpCodeUtil.cs(52,22): warning CS1573: Parameter 'type' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeGenerators\BaseCodeGenerator.cs(636,26): warning CS1573: Parameter 'method' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(126,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(138,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(155,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(168,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeGenerators\ClassProxyGenerator.cs(60,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeGenerators\InterfaceProxyGenerator.cs(56,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\InversionOfControl\Castle.MicroKernel\IK ernelEvents.cs(44,2): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\InversionOfControl\Castle.Windsor\Config uration\CascadeConfigurationStore.cs(32,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Services\Logging\Castle.Services.Logging .Web\WebLogger.cs(205,9): warning CS1570: XML comment on 'Castle.Services.Logging.Web.WebLogger.Error(string, params object[])' has badly formed XML -- 'End tag 'summary' does not match the start tag 'member'. e:\dev\others\ccnet\castlebuild\ActiveRecord\Castle.ActiveRecord.Framewo rk.Internal.Tests\Model\ClassWithMappedField.cs(25,18): warning CS0169: The private field 'Castle.ActiveRecord.Framework.Internal.Tests.Model.ClassWithMappedField .name1' is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Contr oller.cs(776,29): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\AjaxHelper.cs(109,17): warning CS1573: Parameter 'url' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\AjaxHelper.cs(109,17): warning CS1573: Parameter 'options' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\HtmlHelper.cs(386,54): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.MapToVirtual(string)' has cref attribute 'target' that could not be found e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\HtmlHelper.cs(763,4): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.InputText(string, string, System.Collections.IDictionary)' has badly formed XML -- 'End tag 'member' does not match the start tag 'summary'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\HtmlHelper.cs(1770,9): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.BuildListItem(string, string)' has badly formed XML -- 'End tag 'remarks' does not match the start tag 'para'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\ValidationHelper.cs(51,42): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.ValidationHelper.VirtualDir' has cref attribute 'Controller.Context.ApplicationPath' that could not be found Tests run: 459, Failures: 0, Not run: 10, Time: NaN seconds All Tests Passed Warning Castle.DynamicProxy.Test.SerializableClassTestCase.XmlSerialization Warning Castle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphs Warning Castle.MicroKernel.Tests.SerializationTestCase.KernelSerialization Warning Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccess Warning Castle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRela tiveIncludes2 Warning Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.Tests.NV elocityTestCase.SimpleTemplateProcessingWithinResource Warning Castle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverCompon entTestCase.LoadWindsorAssembly Warning Castle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMap Warning Castle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCache Warning Castle.ActiveRecord.Tests.TableHierarchyTestCase.ManyToManyUsingIDBag Warning Details (10) Test: Castle.DynamicProxy.Test.SerializableClassTestCase.XmlSerialization Type: Warning Message: XmlSerializer does not respect the ObjectReference protocol so it wont work _____ Test: Castle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphs Type: Warning Message: Since the modification for hierarchy of dependencies, cycles are not supported _____ Test: Castle.MicroKernel.Tests.SerializationTestCase.KernelSerialization Type: Warning Message: For some reason the deserialization of kernel members is resulting in null values _____ Test: Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccess Type: Warning Message: To compile on Mono _____ Test: Castle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRela tiveIncludes2 Type: Warning Message: .net 2.0 problems _____ Test: Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.Tests.NV elocityTestCase.SimpleTemplateProcessingWithinResource Type: Warning Message: Not working with NAnt/command line _____ Test: Castle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverCompon entTestCase.LoadWindsorAssembly Type: Warning Message: Requires human interaction _____ Test: Castle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMap Type: Warning Message: Need to complete this test case! _____ Test: Castle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCache Type: Warning Message: Jira issue for NH team _____ Test: Castle.ActiveRecord.Tests.TableHierarchyTestCase.ManyToManyUsingIDBag Type: Warning Message: Create schema does not create all necessary tables for this test case Modifications since last build (1) Modified hammett /trunk/MonoRail/monorail.build Enabling brail build again. 2005-10-31 14:36:28 |
|
From: Ayende R. <Ay...@ay...> - 2005-10-31 16:47:25
|
:-D > -----Original Message----- > From: cas...@li... > [mailto:cas...@li...] On Behalf Of > sv...@ca... > Sent: Monday, October 31, 2005 6:36 PM > To: cas...@li... > Subject: [castle-commits] [hammett commit: 1273]: /trunk/MonoRail/ > > User: hammett > Date: 2005/10/31 11:36 AM > > Modified: > /trunk/MonoRail/ > monorail.build > > Log: > Enabling brail build again. |
|
From: <sv...@ca...> - 2005-10-31 16:41:37
|
User: hammett
Date: 2005/10/31 11:36 AM
Modified:
/trunk/MonoRail/
monorail.build
Log:
Enabling brail build again.
File Changes:
Directory: /trunk/MonoRail/
===========================
File [modified]: monorail.build
Delta lines: +2 -5
===================================================================
--- trunk/MonoRail/monorail.build 2005-10-31 15:27:42 UTC (rev 1272)
+++ trunk/MonoRail/monorail.build 2005-10-31 16:36:28 UTC (rev 1273)
@@ -16,8 +16,7 @@
<property name="version" value="beta-5" />
- <!-- brail removed just for a moment -->
- <target name="build" depends="clean, init, framework, integration, nvelocity, composite, arscaffold, testsupport, arsupport, samples, tests, generator" />
+ <target name="build" depends="clean, init, framework, integration, nvelocity, composite, arscaffold, brail, testsupport, arsupport, samples, tests, generator" />
<target name="clean">
<delete>
@@ -99,15 +98,13 @@
<nant buildfile="TestSite/sample.build" inheritall="true" target="compile" />
<nant buildfile="TestSiteWindsor/sample.build" inheritall="true" target="compile" />
<nant buildfile="TestSiteNVelocity/sample.build" inheritall="true" target="compile" />
- <!--
<nant buildfile="TestSiteBrail/sample.build" inheritall="true" target="compile" />
- -->
<nant buildfile="TestScaffolding/sample.build" inheritall="true" target="compile" />
</target>
<target name="tests" depends="init" if="${monorail.test}">
<nant buildfile="Castle.MonoRail.Framework/default.build" inheritall="true" target="test" />
- <!-- <nant buildfile="Castle.MonoRail.Views.Brail/default.build" inheritall="true" target="test" /> -->
+ <nant buildfile="Castle.MonoRail.Views.Brail/default.build" inheritall="true" target="test" />
<nant buildfile="Castle.MonoRail.Framework.Views.NVelocity/default.build" inheritall="true" target="test"/>
<nant buildfile="Castle.MonoRail.WindsorExtension/default.build" inheritall="true" target="test" />
<nant buildfile="Castle.MonoRail.ActiveRecordScaffold/default.build" inheritall="true" target="test" />
|
|
From: <sv...@ca...> - 2005-10-31 15:32:39
|
User: hammett
Date: 2005/10/31 10:27 AM
Modified:
/trunk/Facilities/
facilities.build
/trunk/Facilities/FactorySupport/
configaccessor.xml, configfactory.xml, configfactorywithparameters.xml, configfactorywithparameters2.xml, default.build
/trunk/Facilities/Remoting/
default.build
/trunk/Facilities/TypedFactory/
default.build
Log:
facility build changes.
File Changes:
Directory: /trunk/Facilities/
=============================
File [modified]: facilities.build
Delta lines: +2 -20
===================================================================
--- trunk/Facilities/facilities.build 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/facilities.build 2005-10-31 15:27:42 UTC (rev 1272)
@@ -8,8 +8,8 @@
<target name="build" depends="init, buildlist1, buildlist2, buildlist3" />
<target name="buildlist1" depends="autotransaction,arintegration,aspectsharp,batchregistration,cache,db4o" />
- <target name="buildlist2" depends="eventwiring,factorysupport,nhibernate,ibatis,logging" />
- <target name="buildlist3" depends="prevalence,remoting,startable,securitymanagement,typedfactory" />
+ <target name="buildlist2" depends="factorysupport,nhibernate,ibatis,logging" />
+ <target name="buildlist3" depends="prevalence,remoting,securitymanagement,typedfactory" />
<!-- entlib,x is/are out -->
@@ -45,16 +45,8 @@
<nant buildfile="EnterpriseLibrary/default.build" inheritall="true" target="build" />
</target>
- <target name="eventwiring">
- <!--
- <nant buildfile="EventWiring/default.build" inheritall="true" target="build" />
- -->
- </target>
-
<target name="factorysupport">
- <!--
<nant buildfile="FactorySupport/default.build" inheritall="true" target="build" />
- -->
</target>
<target name="ibatis">
@@ -74,25 +66,15 @@
</target>
<target name="remoting">
- <!--
<nant buildfile="Remoting/default.build" inheritall="true" target="build" />
- -->
</target>
- <target name="startable">
- <!--
- <nant buildfile="Startable/default.build" inheritall="true" target="build" />
- -->
- </target>
-
<target name="securitymanagement">
<nant buildfile="Security/default.build" inheritall="true" target="build" />
</target>
<target name="typedfactory">
- <!--
<nant buildfile="TypedFactory/default.build" inheritall="true" target="build" />
- -->
</target>
<target name="dist">
Directory: /trunk/Facilities/FactorySupport/
============================================
File [modified]: configaccessor.xml
Delta lines: +2 -2
===================================================================
--- trunk/Facilities/FactorySupport/configaccessor.xml 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/FactorySupport/configaccessor.xml 2005-10-31 15:27:42 UTC (rev 1272)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
<configuration>
@@ -6,7 +6,7 @@
<facility
id="factorysupport"
- type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.Facilities.FactorySupport" />
+ type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.MicroKernel" />
</facilities>
File [modified]: configfactory.xml
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/FactorySupport/configfactory.xml 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/FactorySupport/configfactory.xml 2005-10-31 15:27:42 UTC (rev 1272)
@@ -6,7 +6,7 @@
<facility
id="factorysupport"
- type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.Facilities.FactorySupport" />
+ type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.MicroKernel" />
</facilities>
File [modified]: configfactorywithparameters.xml
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/FactorySupport/configfactorywithparameters.xml 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/FactorySupport/configfactorywithparameters.xml 2005-10-31 15:27:42 UTC (rev 1272)
@@ -6,7 +6,7 @@
<facility
id="factorysupport"
- type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.Facilities.FactorySupport" />
+ type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.MicroKernel" />
</facilities>
File [modified]: configfactorywithparameters2.xml
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/FactorySupport/configfactorywithparameters2.xml 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/FactorySupport/configfactorywithparameters2.xml 2005-10-31 15:27:42 UTC (rev 1272)
@@ -6,7 +6,7 @@
<facility
id="factorysupport"
- type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.Facilities.FactorySupport" />
+ type="Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.MicroKernel" />
</facilities>
File [modified]: default.build
Delta lines: +15 -108
===================================================================
--- trunk/Facilities/FactorySupport/default.build 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/FactorySupport/default.build 2005-10-31 15:27:42 UTC (rev 1272)
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="factorysupport-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.FactorySupport" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.FactorySupport.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.FactorySupport" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
- <property name="version" value="alpha" />
+ <property name="version" value="beta-1" />
<target name="clean">
<delete failonerror="false">
@@ -25,39 +26,14 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- </target>
- <target name="build" depends="init,tests.run" />
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
- <target name="compile" depends="init">
- <csc
- define="${strong}"
- target="library"
- debug="${debug}"
- optimize="${optimize}"
- output="${bin.dir}/${assembly.name}"
- doc="${bin.dir}/${name}.xml">
-
- <nowarn>
- <warning number="1591" />
- <warning number="1572" />
- </nowarn>
-
- <sources basedir="${src.dir}" defaultexcludes="true">
- <include name="**/*.cs" />
- </sources>
-
- <references>
- <include name="${bin.dir}/*.dll" />
- </references>
- </csc>
</target>
- <target name="tests.compile" depends="compile">
+ <target name="build" depends="tests.run" />
+
+ <target name="tests.compile" depends="init">
<csc
target="library"
debug="${debug}"
@@ -75,79 +51,10 @@
</target>
<target name="tests.run" depends="tests.compile">
- <nunit2 >
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
</target>
-
- <target name="docs">
- <ndoc failonerror="true">
- <assemblies basedir="${bin.dir}">
- <include name="${assembly.name}" />
- </assemblies>
- <documenters>
- <documenter name="MSDN">
- <property name="OutputTarget" value="HTMLHelp" />
- <property name="Preliminary" value="true" />
- <property name="CleanIntermediates" value="true" />
- <property name="SdkLinksOnWeb" value="true" />
- <property name="AutoPropertyBackerSummaries" value="true" />
- <property name="AutoDocumentConstructors" value="true" />
- <property name="OutputDirectory" value="${doc.dir}" />
- <property name="HtmlHelpName" value="${name}" />
- <property name="IncludeFavorites" value="False" />
- <property name="Title" value="Facility - ${name}" />
- <property name="SplitTOCs" value="False" />
- <property name="DefaulTOC" value="Windsor" />
- <property name="ShowVisualBasic" value="True" />
- <property name="ShowMissingSummaries" value="False" />
- <property name="ShowMissingRemarks" value="False" />
- <property name="ShowMissingParams" value="False" />
- <property name="ShowMissingReturns" value="False" />
- <property name="ShowMissingValues" value="False" />
- <property name="DocumentInternals" value="False" />
- <property name="DocumentProtected" value="True" />
- <property name="DocumentPrivates" value="False" />
- <property name="DocumentEmptyNamespaces" value="False" />
- <property name="IncludeAssemblyVersion" value="True" />
- <property name="CopyrightText" value="Copyright 2004,2005 - Castle Project (original author or authors)" />
- <property name="CopyrightHref" value="http://www.castleproject.org" />
- </documenter>
- </documenters>
- </ndoc>
- </target>
- <target name="dist" depends="docs">
- <zip zipfile="${name}.src.zip">
- <fileset basedir="${base.dir}">
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="*.build" />
- <include name="*.sln" />
- <include name="${src.dir}/**/*.*" />
- <include name="${test.src.dir}/**/*.*" />
- <include name="${library.dir}/**/*.*" />
-
- <exclude name="**/Debug/*" />
- <exclude name="**/obj/*" />
- <exclude name="**/*.user" />
- <exclude name="**/*.suo" />
- </fileset>
- </zip>
- <zip zipfile="${name}.${version}.zip">
- <fileset basedir="${base.dir}">
- <include name="${bin.dir}/${assembly.name}" />
- <include name="${library.dir}/**/*.*" />
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="${name}.src.zip" />
- <include name="${doc.dir}/${name}.chm" />
- </fileset>
- </zip>
- <delete file="${name}.src.zip" />
- </target>
-
</project>
Directory: /trunk/Facilities/Remoting/
======================================
File [modified]: default.build
Delta lines: +2 -96
===================================================================
--- trunk/Facilities/Remoting/default.build 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/Remoting/default.build 2005-10-31 15:27:42 UTC (rev 1272)
@@ -18,7 +18,7 @@
<property name="test.components.src.dir" value="${base.dir}/${name}.TestComponents" />
<property name="test.components.name" value="${name}.TestComponents.dll" />
- <property name="version" value="alpha" />
+ <property name="version" value="beta-1" />
<target name="clean">
<delete failonerror="false">
@@ -33,32 +33,8 @@
</target>
<target name="build" depends="init,tests.run" />
-
- <target name="compile" depends="init">
- <csc
- define="${strong}"
- target="library"
- debug="${debug}"
- optimize="${optimize}"
- output="${bin.dir}/${assembly.name}"
- doc="${bin.dir}/${name}.xml">
-
- <nowarn>
- <warning number="1591" />
- <warning number="1572" />
- </nowarn>
-
- <sources basedir="${src.dir}" defaultexcludes="true">
- <include name="**/*.cs" />
- </sources>
-
- <references>
- <include name="${bin.dir}/*.dll" />
- </references>
- </csc>
- </target>
- <target name="compilecomponents" depends="compile">
+ <target name="compilecomponents" depends="init">
<csc
target="library"
debug="${debug}"
@@ -99,75 +75,5 @@
</nunit2>
-->
</target>
-
- <target name="docs">
- <ndoc failonerror="true">
- <assemblies basedir="${bin.dir}">
- <include name="${assembly.name}" />
- </assemblies>
- <documenters>
- <documenter name="MSDN">
- <property name="OutputTarget" value="HTMLHelp" />
- <property name="Preliminary" value="true" />
- <property name="CleanIntermediates" value="true" />
- <property name="SdkLinksOnWeb" value="true" />
- <property name="AutoPropertyBackerSummaries" value="true" />
- <property name="AutoDocumentConstructors" value="true" />
- <property name="OutputDirectory" value="${doc.dir}" />
- <property name="HtmlHelpName" value="${name}" />
- <property name="IncludeFavorites" value="False" />
- <property name="Title" value="Facility - ${name}" />
- <property name="SplitTOCs" value="False" />
- <property name="DefaulTOC" value="Windsor" />
- <property name="ShowVisualBasic" value="True" />
- <property name="ShowMissingSummaries" value="False" />
- <property name="ShowMissingRemarks" value="False" />
- <property name="ShowMissingParams" value="False" />
- <property name="ShowMissingReturns" value="False" />
- <property name="ShowMissingValues" value="False" />
- <property name="DocumentInternals" value="False" />
- <property name="DocumentProtected" value="True" />
- <property name="DocumentPrivates" value="False" />
- <property name="DocumentEmptyNamespaces" value="False" />
- <property name="IncludeAssemblyVersion" value="True" />
- <property name="CopyrightText" value="Copyright 2004,2005 - Castle Project (original author or authors)" />
- <property name="CopyrightHref" value="http://www.castleproject.org" />
- </documenter>
- </documenters>
- </ndoc>
- </target>
- <target name="dist" depends="docs">
- <zip zipfile="${name}.src.zip">
- <fileset basedir="${base.dir}">
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="*.build" />
- <include name="*.sln" />
- <include name="${src.dir}/**/*.*" />
- <include name="${test.src.dir}/**/*.*" />
- <include name="${test.components.src.dir}/**/*.*" />
- <include name="${library.dir}/**/*.*" />
-
- <exclude name="**/Debug/*" />
- <exclude name="**/obj/*" />
- <exclude name="**/*.user" />
- <exclude name="**/*.suo" />
- </fileset>
- </zip>
- <zip zipfile="${name}.${version}.zip">
- <fileset basedir="${base.dir}">
- <include name="${bin.dir}/${assembly.name}" />
- <include name="${library.dir}/**/*.*" />
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="${name}.src.zip" />
- <include name="${doc.dir}/${name}.chm" />
- </fileset>
- </zip>
- <delete file="${name}.src.zip" />
- </target>
-
</project>
Directory: /trunk/Facilities/TypedFactory/
==========================================
File [modified]: default.build
Delta lines: +12 -107
===================================================================
--- trunk/Facilities/TypedFactory/default.build 2005-10-31 14:51:41 UTC (rev 1271)
+++ trunk/Facilities/TypedFactory/default.build 2005-10-31 15:27:42 UTC (rev 1272)
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="typedfactory-facility" default="build">
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.TypedFactory" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.TypedFactory.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.TypedFactory" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
@@ -25,41 +26,14 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
</target>
<target name="build" depends="init,tests.run" />
- <target name="compile" depends="init">
+ <target name="tests.compile" depends="init">
<csc
- define="${strong}"
target="library"
- debug="${debug}"
- optimize="${optimize}"
- output="${bin.dir}/${assembly.name}"
- doc="${bin.dir}/${name}.xml">
-
- <nowarn>
- <warning number="1591" />
- <warning number="1572" />
- </nowarn>
-
- <sources basedir="${src.dir}" defaultexcludes="true">
- <include name="**/*.cs" />
- </sources>
-
- <references>
- <include name="${bin.dir}/*.dll" />
- </references>
- </csc>
- </target>
-
- <target name="tests.compile" depends="compile">
- <csc
- target="library"
debug="${debug}"
output="${bin.dir}/${test.assembly.name}">
@@ -75,79 +49,10 @@
</target>
<target name="tests.run" depends="tests.compile">
- <nunit2 >
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
</target>
-
- <target name="docs">
- <ndoc failonerror="true">
- <assemblies basedir="${bin.dir}">
- <include name="${assembly.name}" />
- </assemblies>
- <documenters>
- <documenter name="MSDN">
- <property name="OutputTarget" value="HTMLHelp" />
- <property name="Preliminary" value="true" />
- <property name="CleanIntermediates" value="true" />
- <property name="SdkLinksOnWeb" value="true" />
- <property name="AutoPropertyBackerSummaries" value="true" />
- <property name="AutoDocumentConstructors" value="true" />
- <property name="OutputDirectory" value="${doc.dir}" />
- <property name="HtmlHelpName" value="${name}" />
- <property name="IncludeFavorites" value="False" />
- <property name="Title" value="Facility - ${name}" />
- <property name="SplitTOCs" value="False" />
- <property name="DefaulTOC" value="Windsor" />
- <property name="ShowVisualBasic" value="True" />
- <property name="ShowMissingSummaries" value="False" />
- <property name="ShowMissingRemarks" value="False" />
- <property name="ShowMissingParams" value="False" />
- <property name="ShowMissingReturns" value="False" />
- <property name="ShowMissingValues" value="False" />
- <property name="DocumentInternals" value="False" />
- <property name="DocumentProtected" value="True" />
- <property name="DocumentPrivates" value="False" />
- <property name="DocumentEmptyNamespaces" value="False" />
- <property name="IncludeAssemblyVersion" value="True" />
- <property name="CopyrightText" value="Copyright 2004,2005 - Castle Project (original author or authors)" />
- <property name="CopyrightHref" value="http://www.castleproject.org" />
- </documenter>
- </documenters>
- </ndoc>
- </target>
- <target name="dist" depends="docs">
- <zip zipfile="${name}.src.zip">
- <fileset basedir="${base.dir}">
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="*.build" />
- <include name="*.sln" />
- <include name="${src.dir}/**/*.*" />
- <include name="${test.src.dir}/**/*.*" />
- <include name="${library.dir}/**/*.*" />
-
- <exclude name="**/Debug/*" />
- <exclude name="**/obj/*" />
- <exclude name="**/*.user" />
- <exclude name="**/*.suo" />
- </fileset>
- </zip>
- <zip zipfile="${name}.${version}.zip">
- <fileset basedir="${base.dir}">
- <include name="${bin.dir}/${assembly.name}" />
- <include name="${library.dir}/**/*.*" />
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="${name}.src.zip" />
- <include name="${doc.dir}/${name}.chm" />
- </fileset>
- </zip>
- <delete file="${name}.src.zip" />
- </target>
-
</project>
|
|
From: <sv...@ca...> - 2005-10-31 14:56:43
|
User: hammett
Date: 2005/10/31 09:51 AM
Added:
/trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/
PropertiesTestCase.cs, config_with_properties.xml, config_with_properties_and_includes.xml, properties.xml
Modified:
/trunk/InversionOfControl/Castle.Windsor.Tests/
Castle.Windsor.Tests.csproj
/trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/
AbstractInterpreter.cs, XmlInterpreter.cs
Log:
Applied Ahmed Ghandour's <agh...@ry...> patch to IOC 16
File Changes:
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/
==========================================================
File [modified]: Castle.Windsor.Tests.csproj
Delta lines: +17 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-31 14:51:41 UTC (rev 1271)
@@ -307,6 +307,23 @@
BuildAction = "EmbeddedResource"
/>
<File
+ RelPath = "Configuration2\Properties\config_with_properties.xml"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Configuration2\Properties\config_with_properties_and_includes.xml"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Configuration2\Properties\properties.xml"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Configuration2\Properties\PropertiesTestCase.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Configuration2\RelativeTest\rel_include1.xml"
BuildAction = "EmbeddedResource"
/>
Directory: /trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/
===============================================================================
File [modified]: AbstractInterpreter.cs
Delta lines: +1 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/AbstractInterpreter.cs 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/AbstractInterpreter.cs 2005-10-31 14:51:41 UTC (rev 1271)
@@ -37,6 +37,7 @@
protected static readonly String ComponentsNodeName = "components";
protected static readonly String ComponentNodeName = "component";
protected static readonly String IncludeNodeName = "include";
+ protected static readonly String PropertiesNodeName = "properties";
private ImportDirectiveCollection imports = new ImportDirectiveCollection();
private IResource source;
File [modified]: XmlInterpreter.cs
Delta lines: +79 -6
===================================================================
--- trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor/Configuration/Interpreters/XmlInterpreter.cs 2005-10-31 14:51:41 UTC (rev 1271)
@@ -16,7 +16,11 @@
{
using System;
using System.Xml;
+ using System.Collections;
+ using System.Collections.Specialized;
using System.Configuration;
+ using System.Text;
+ using System.Text.RegularExpressions;
using Castle.Model.Resource;
using Castle.Model.Configuration;
@@ -43,6 +47,14 @@
/// </summary>
public class XmlInterpreter : AbstractInterpreter
{
+ /// <summary>
+ /// Properties names can contain a-zA-Z0-9_.
+ /// i.e. #{my_node_name} || #{ my.node.name }
+ /// spaces are trimmed
+ /// </summary>
+ private static Regex PropertyValidationRegExp = new Regex( @"(\#\{\s*((?:\w|\.)+)\s*\})", RegexOptions.Compiled);
+ private IDictionary properties = new HybridDictionary();
+
#region Constructors
public XmlInterpreter()
@@ -86,17 +98,40 @@
{
ProcessInclude(node, store);
}
+ else if (PropertiesNodeName.Equals(node.Name))
+ {
+ DeserializeProperties(node.ChildNodes);
+ }
else if (FacilitiesNodeName.Equals(node.Name))
{
- DeserializeFacilities( node.ChildNodes, store );
+ DeserializeFacilities(node.ChildNodes, store);
}
else if (ComponentsNodeName.Equals(node.Name))
{
- DeserializeComponents( node.ChildNodes, store );
+ DeserializeComponents(node.ChildNodes, store);
}
}
}
+ private void DeserializeProperties( XmlNodeList nodes)
+ {
+ foreach(XmlNode node in nodes)
+ {
+ if (node.NodeType != XmlNodeType.Element)
+ {
+ continue;
+ }
+
+ // Note that new properties values override old ones!
+ // properties values can reference another properties
+
+ String value = EvalProperty(
+ GetPreserveSpaceValue(node) ? node.InnerText : node.InnerText.Trim() );
+
+ properties[node.Name] = value;
+ }
+ }
+
private void DeserializeFacilities(XmlNodeList nodes, IConfigurationStore store)
{
foreach(XmlNode node in nodes)
@@ -165,7 +200,7 @@
{
if (child.NodeType == XmlNodeType.Text || child.NodeType == XmlNodeType.CDATA)
{
- config = new MutableConfiguration(node.Name, child.Value.Trim());
+ config = new MutableConfiguration(node.Name, EvalProperty(child.Value.Trim()) );
break;
}
}
@@ -178,7 +213,7 @@
foreach(XmlAttribute attribute in node.Attributes)
{
- config.Attributes.Add(attribute.Name, attribute.Value);
+ config.Attributes.Add(attribute.Name, EvalProperty( attribute.Value ) );
}
if (node.HasChildNodes)
@@ -197,6 +232,32 @@
return config;
}
+ private string EvalProperty(string value)
+ {
+ MatchCollection matches = PropertyValidationRegExp.Matches( value );
+
+ if(matches.Count > 0)
+ {
+ StringBuilder buffer = new StringBuilder(value);
+
+ foreach(Match match in matches)
+ {
+ string propRef = match.Groups[1].Value;
+ string propKey = match.Groups[2].Value;
+ string propValue = properties[propKey] as string;
+
+ // if a property is not found we replace its value with an empty string
+ if( propValue == null ) propValue = String.Empty;
+
+ buffer.Replace( propRef, propValue );
+ }
+
+ value = buffer.ToString();
+ }
+
+ return value;
+ }
+
private String GetRequiredAttributeValue(XmlNode node, String attName)
{
String value = GetAttributeValue(node);
@@ -224,8 +285,18 @@
return att.Value;
}
- #endregion
+ private bool GetPreserveSpaceValue(XmlNode node)
+ {
+ XmlAttribute att = node.Attributes["preserve_spaces"];
+ if (att == null)
+ {
+ return false;
+ }
+
+ return att.Value.ToLower() == "true";
+ }
+
private void ProcessInclude(XmlNode includeNode, IConfigurationStore store)
{
XmlAttribute resourceUriAtt = includeNode.Attributes["uri"];
@@ -237,5 +308,7 @@
ProcessInclude( resourceUriAtt.Value, store );
}
+
+ #endregion
}
-}
\ No newline at end of file
+}
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/
====================================================================================
File [added]: PropertiesTestCase.cs
Delta lines: +83 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/PropertiesTestCase.cs 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/PropertiesTestCase.cs 2005-10-31 14:51:41 UTC (rev 1271)
@@ -0,0 +1,83 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Windsor.Tests.Configuration2.Properties
+{
+ using System;
+ using System.IO;
+
+ using Castle.MicroKernel;
+ using Castle.Model.Configuration;
+
+ using NUnit.Framework;
+
+ [TestFixture]
+ public class PropertiesTestCase
+ {
+ String dir = "../Castle.Windsor.Tests/Configuration2/Properties/";
+
+ private IWindsorContainer container;
+
+ [Test]
+ public void CorrectEval()
+ {
+ String file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dir +
+ "config_with_properties.xml");
+
+ container = new WindsorContainer(file);
+
+ AssertConfiguration();
+ }
+
+ [Test]
+ public void PropertiesAndIncludes()
+ {
+ String file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dir +
+ "config_with_properties_and_includes.xml");
+
+ container = new WindsorContainer(file);
+
+ AssertConfiguration();
+ }
+
+ private void AssertConfiguration()
+ {
+ IConfigurationStore store = container.Kernel.ConfigurationStore;
+
+ Assert.AreEqual(2, store.GetFacilities().Length);
+ Assert.AreEqual(2, store.GetComponents().Length);
+
+ IConfiguration config = store.GetFacilityConfiguration("testidengine");
+ IConfiguration childItem = config.Children["item"];
+ Assert.IsNotNull(childItem);
+ Assert.AreEqual("prop1 value", childItem.Value);
+
+ config = store.GetFacilityConfiguration("testidengine2");
+ Assert.IsNotNull(config);
+ childItem = config.Children["item"];
+ Assert.IsNotNull(childItem);
+ Assert.AreEqual("prop2 value", childItem.Attributes["value"]);
+
+ config = store.GetComponentConfiguration("testidcomponent1");
+ childItem = config.Children["item"];
+ Assert.IsNotNull(childItem);
+ Assert.AreEqual("prop1 value", childItem.Value);
+
+ config = store.GetComponentConfiguration("testidcomponent2");
+ childItem = config.Children["item"];
+ Assert.IsNotNull(childItem);
+ Assert.AreEqual("prop2 value", childItem.Attributes["value"]);
+ }
+ }
+}
File [added]: config_with_properties.xml
Delta lines: +33 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/config_with_properties.xml 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/config_with_properties.xml 2005-10-31 14:51:41 UTC (rev 1271)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <properties>
+ <prop1>prop1 value</prop1>
+ <prop2>prop2 value</prop2>
+ </properties>
+
+ <facilities>
+
+ <facility id="testidengine" >
+ <item>#{prop1}</item>
+ </facility>
+
+ <facility id="testidengine2" >
+ <item value="#{prop2}"/>
+ </facility>
+
+ </facilities>
+
+ <components>
+
+ <component id="testidcomponent1">
+ <item>#{prop1}</item>
+ </component>
+
+ <component id="testidcomponent2">
+ <item value="#{prop2}"/>
+ </component>
+
+ </components>
+
+</configuration>
File [added]: config_with_properties_and_includes.xml
Delta lines: +30 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/config_with_properties_and_includes.xml 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/config_with_properties_and_includes.xml 2005-10-31 14:51:41 UTC (rev 1271)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <include uri="file://properties.xml"/>
+
+ <facilities>
+
+ <facility id="testidengine" >
+ <item>#{prop1}</item>
+ </facility>
+
+ <facility id="testidengine2" >
+ <item value="#{prop2}"/>
+ </facility>
+
+ </facilities>
+
+ <components>
+
+ <component id="testidcomponent1">
+ <item>#{prop1}</item>
+ </component>
+
+ <component id="testidcomponent2">
+ <item value="#{prop2}"/>
+ </component>
+
+ </components>
+
+</configuration>
File [added]: properties.xml
Delta lines: +9 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/properties.xml 2005-10-31 03:45:55 UTC (rev 1270)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/Properties/properties.xml 2005-10-31 14:51:41 UTC (rev 1271)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <properties>
+ <prop1>prop1 value</prop1>
+ <prop2>prop2 value</prop2>
+ </properties>
+
+</configuration>
|
|
From: <bui...@ca...> - 2005-10-31 14:03:58
|
CruiseControl.NET Build Results for project castle (web page <http://localhost/ccnet/castle> ) _____ BUILD SUCCESSFUL Project: castle Date of build: 31/10/2005 11:55:38 Running time: 00:07:34 Build condition: Forced Build Warnings: (92) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeBuilder\Utils\OpCodeUtil.cs(52,22): warning CS1573: Parameter 'type' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeGenerators\BaseCodeGenerator.cs(636,26): warning CS1573: Parameter 'method' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(126,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(138,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(155,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\P roxyGenerator.cs(168,25): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeGenerators\ClassProxyGenerator.cs(60,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Tools\DynamicProxy\Castle.DynamicProxy\B uilder\CodeGenerators\InterfaceProxyGenerator.cs(56,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\InversionOfControl\Castle.MicroKernel\IK ernelEvents.cs(44,2): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\InversionOfControl\Castle.Windsor\Config uration\CascadeConfigurationStore.cs(32,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Services\Logging\Castle.Services.Logging .Web\WebLogger.cs(205,9): warning CS1570: XML comment on 'Castle.Services.Logging.Web.WebLogger.Error(string, params object[])' has badly formed XML -- 'End tag 'summary' does not match the start tag 'member'. e:\dev\others\ccnet\castlebuild\ActiveRecord\Castle.ActiveRecord.Framewo rk.Internal.Tests\Model\ClassWithMappedField.cs(25,18): warning CS0169: The private field 'Castle.ActiveRecord.Framework.Internal.Tests.Model.ClassWithMappedField .name1' is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Contr oller.cs(776,29): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\AjaxHelper.cs(109,17): warning CS1573: Parameter 'url' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\AjaxHelper.cs(109,17): warning CS1573: Parameter 'options' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\HtmlHelper.cs(386,54): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.MapToVirtual(string)' has cref attribute 'target' that could not be found e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\HtmlHelper.cs(763,4): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.InputText(string, string, System.Collections.IDictionary)' has badly formed XML -- 'End tag 'member' does not match the start tag 'summary'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\HtmlHelper.cs(1770,9): warning CS1570: XML comment on 'Castle.MonoRail.Framework.Helpers.HtmlHelper.BuildListItem(string, string)' has badly formed XML -- 'End tag 'remarks' does not match the start tag 'para'. e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework\Helpe rs\ValidationHelper.cs(51,42): warning CS1574: XML comment on 'Castle.MonoRail.Framework.Helpers.ValidationHelper.VirtualDir' has cref attribute 'Controller.Context.ApplicationPath' that could not be found e:\dev\others\ccnet\castlebuild\MonoRail\TestSiteNVelocity\Controllers\A jaxController.cs(26,25): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\TestSiteNVelocity\Controllers\A jaxController.cs(28,4): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\TestSiteNVelocity\Controllers\A jaxController.cs(23,17): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\TestSiteNVelocity\Controllers\A jaxController.cs(28,18): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework.Tests \Helpers\AjaxHelperTestCase.cs(28,25): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.Framework.Tests \Helpers\AjaxHelperTestCase.cs(33,20): warning CS0618: 'Castle.MonoRail.Framework.Helpers.AjaxHelperOld' is obsolete: 'This helper was replaced by the new version of AjaxHelper' e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.ActiveRecordSca ffold.Tests\ListActionTestCase.cs(33,11): warning CS0219: The variable 'url' is assigned but its value is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.ActiveRecordSca ffold.Tests\ListActionTestCase.cs(46,11): warning CS0219: The variable 'url' is assigned but its value is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.ActiveRecordSca ffold.Tests\ListActionTestCase.cs(59,11): warning CS0219: The variable 'url' is assigned but its value is never used e:\dev\others\ccnet\castlebuild\MonoRail\Castle.MonoRail.ActiveRecordSca ffold.Tests\ListActionTestCase.cs(72,11): warning CS0219: The variable 'url' is assigned but its value is never used e:\dev\others\ccnet\castlebuild\AspectSharp\AspectSharp.Lang\AspectLangu ageLexer.cs(119,11): warning CS0219: The variable '_token' is assigned but its value is never used e:\dev\others\ccnet\castlebuild\AspectSharp\AspectSharp.Lang\AST\PointCu tDefinition.cs(80,4): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\AspectSharp\AspectSharp\Core\DynamicProx y\CustomProxyGenerator.cs(46,17): warning CS1573: Parameter 'target' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\AspectSharp\AspectSharp\Core\DynamicProx y\CustomProxyGenerator.cs(60,17): warning CS1573: Parameter 'constructorArgs' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\AspectSharp\AspectSharp\Core\IProxyFacto ry.cs(46,10): warning CS1573: Parameter 'constructorArgs' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\AspectSharp\AspectSharp\AspectEngine.cs( 99,25): warning CS1573: Parameter 'constructorArgs' has no matching param tag in XML comment (but other parameters do) e:\dev\others\ccnet\castlebuild\Facilities\AutomaticTransactionManagemen t\Castle.Facilities.AutomaticTransactionManagement.Tests\MockTransaction Manager.cs(35,48): warning CS0067: The event 'Castle.Facilities.AutomaticTransactionManagement.Tests.MockTransactionM anager.TransactionCreated' is never used e:\dev\others\ccnet\castlebuild\Facilities\AutomaticTransactionManagemen t\Castle.Facilities.AutomaticTransactionManagement.Tests\MockTransaction Manager.cs(37,48): warning CS0067: The event 'Castle.Facilities.AutomaticTransactionManagement.Tests.MockTransactionM anager.ChildTransactionCreated' is never used e:\dev\others\ccnet\castlebuild\Facilities\AutomaticTransactionManagemen t\Castle.Facilities.AutomaticTransactionManagement.Tests\MockTransaction Manager.cs(39,36): warning CS0067: The event 'Castle.Facilities.AutomaticTransactionManagement.Tests.MockTransactionM anager.TransactionCommitted' is never used e:\dev\others\ccnet\castlebuild\Facilities\AutomaticTransactionManagemen t\Castle.Facilities.AutomaticTransactionManagement.Tests\MockTransaction Manager.cs(41,36): warning CS0067: The event 'Castle.Facilities.AutomaticTransactionManagement.Tests.MockTransactionM anager.TransactionRolledback' is never used e:\dev\others\ccnet\castlebuild\Facilities\AutomaticTransactionManagemen t\Castle.Facilities.AutomaticTransactionManagement.Tests\MockTransaction Manager.cs(43,36): warning CS0067: The event 'Castle.Facilities.AutomaticTransactionManagement.Tests.MockTransactionM anager.TransactionDisposed' is never used e:\dev\others\ccnet\castlebuild\Facilities\ActiveRecordIntegration\Castl e.Facilities.ActiveRecordIntegration\SafeSessionProxy.cs(29,17): warning CS1574: XML comment on 'Castle.Facilities.ActiveRecordIntegration.SafeSessionProxy' has cref attribute 'ISession.Dispose' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\Cache\Castle.Facilities.Cache \CacheComponentInspector.cs(40,8): warning CS1570: XML comment on 'Castle.Facilities.Cache.CacheComponentInspector' has badly formed XML -- 'End tag 'example' does not match the start tag 'member'. e:\dev\others\ccnet\castlebuild\Facilities\Cache\Castle.Facilities.Cache \CacheComponentInspector.cs(28,2): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 506,21): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1288,32): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.Contai nsKey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1291,22): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.Contai nsKey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1302,25): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.Contai nsKey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1436,18): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.GetByK ey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1439,22): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.GetByK ey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1451,38): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.GetByK ey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1583,28): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.IndexO fKey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1587,22): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.IndexO fKey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\Util\FieldInfoCollection.cs( 1598,25): warning CS1574: XML comment on 'Castle.Facilities.NHibernateIntegration.Util.FieldInfoCollection.IndexO fKey(string)' has cref attribute 'FieldInfo.Name' that could not be found e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\DataException.cs(24,55): warning CS1570: XML comment on 'Castle.Facilities.NHibernateIntegration.DataException' has badly formed XML -- 'A name contained an invalid character. e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\IGenericDao.cs(23,55): warning CS1570: XML comment on 'Castle.Facilities.NHibernateIntegration.IGenericDao' has badly formed XML -- 'A name contained an invalid character. e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\INHibernateGenericDao.cs(25, 55): warning CS1570: XML comment on 'Castle.Facilities.NHibernateIntegration.INHibernateGenericDao' has badly formed XML -- 'A name contained an invalid character. e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\Components\NHibernateGenericDao.cs(31,5 5): warning CS1570: XML comment on 'Castle.Facilities.NHibernateIntegration.NHibernateGenericDao' has badly formed XML -- 'A name contained an invalid character. e:\dev\others\ccnet\castlebuild\Facilities\NHibernateIntegration\Castle. Facilities.NHibernateIntegration\NHibernateFacility.cs(50,7): warning CS1570: XML comment on 'Castle.Facilities.NHibernateIntegration.NHibernateFacility' has badly formed XML -- 'Whitespace is not allowed at this location. e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\AutomaticSessionInspector.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\AutomaticSessionInterceptor.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\DataMapperTransactionManager.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\IBatisNetFacility.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\NoSessionAttribute.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\ResourceSqlMapAdapter.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\SessionAttribute.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\SqlMapActivator.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\SqlMapKeeper.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\IBatisNet\Castle.Facilities.I BatisNetIntegration\UsesAutomaticSessionCreationAttribute.cs(2,1): warning CS1587: XML comment is not placed on a valid language element e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceActivatorOverrider.cs(30,10): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceActivatorOverriderModelInspector .PrevalenceActivatorOverriderModelInspector()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceActivatorOverrider.cs(34,15): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceActivatorOverriderModelInspector .ProcessModel(Castle.MicroKernel.IKernel, Castle.Model.ComponentModel)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceEngineComponentActivator.cs(33,10): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceEngineComponentActivator.Prevale nceEngineComponentActivator(Castle.Model.ComponentModel, Castle.MicroKernel.IKernel, Castle.MicroKernel.ComponentInstanceDelegate, Castle.MicroKernel.ComponentInstanceDelegate)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceEngineComponentActivator.cs(39,29): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceEngineComponentActivator.Instant iate()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceEngineComponentActivator.cs(89,22): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceEngineComponentActivator.Kernel_ ComponentDestroyed(Castle.Model.ComponentModel, object)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(36,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.SystemTypePropertyKey' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(37,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.StorageDirPropertyKey' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(38,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.AutoMigrationPropertyKe y' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(39,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.EngineIdPropertyKey' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(40,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.ResetStoragePropertyKey ' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(41,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.SnapshotPeriodPropertyK ey' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(43,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.CleanupPolicyComponentP ropertyKey' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(44,33): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.SnapShotTakerComponentP ropertyKey' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(46,10): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.PrevalenceFacility()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(52,27): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.Init()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(58,24): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.Dispose()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(76,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.RegisterEngines()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(86,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.RegisterExtensions()' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(92,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.RegisterEngine(Castle.M odel.Configuration.IConfiguration)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(153,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.ObtainSystemType(Castle .Model.Configuration.IConfiguration)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(172,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.RegisterSystem(string, string, System.Type)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(181,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.TakeSnapshotIfRequired( Castle.Model.Configuration.IConfiguration)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceFacility.cs(193,18): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceFacility.HandsOffFiles(Castle.Mo del.Configuration.IConfiguration)' e:\dev\others\ccnet\castlebuild\Facilities\Prevalence\Castle.Facilities. Prevalence\PrevalenceSystemComponentActivator.cs(31,10): warning CS1591: Missing XML comment for publicly visible type or member 'Castle.Facilities.Prevalence.PrevalenceSystemComponentActivator.Prevale nceSystemComponentActivator(Castle.Model.ComponentModel, Castle.MicroKernel.IKernel, Castle.MicroKernel.ComponentInstanceDelegate, Castle.MicroKernel.ComponentInstanceDelegate)' Tests run: 825, Failures: 0, Not run: 10, Time: NaN seconds All Tests Passed Warning Castle.DynamicProxy.Test.SerializableClassTestCase.XmlSerialization Warning Castle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphs Warning Castle.MicroKernel.Tests.SerializationTestCase.KernelSerialization Warning Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccess Warning Castle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRela tiveIncludes2 Warning Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.Tests.NV elocityTestCase.SimpleTemplateProcessingWithinResource Warning Castle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverCompon entTestCase.LoadWindsorAssembly Warning Castle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMap Warning Castle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCache Warning Castle.ActiveRecord.Tests.TableHierarchyTestCase.ManyToManyUsingIDBag Warning Details (10) Test: Castle.DynamicProxy.Test.SerializableClassTestCase.XmlSerialization Type: Warning Message: XmlSerializer does not respect the ObjectReference protocol so it wont work _____ Test: Castle.MicroKernel.Tests.DependencyGraph.CycleComponentGraphs Type: Warning Message: Since the modification for hierarchy of dependencies, cycles are not supported _____ Test: Castle.MicroKernel.Tests.SerializationTestCase.KernelSerialization Type: Warning Message: For some reason the deserialization of kernel members is resulting in null values _____ Test: Castle.MicroKernel.Tests.SerializationTestCase.RemoteAccess Type: Warning Message: To compile on Mono _____ Test: Castle.Windsor.Tests.Configuration2.IncludesTestCase.FileResourceAndRela tiveIncludes2 Type: Warning Message: .net 2.0 problems _____ Test: Castle.Components.Common.TemplateEngine.NVelocityTemplateEngine.Tests.NV elocityTestCase.SimpleTemplateProcessingWithinResource Type: Warning Message: Not working with NAnt/command line _____ Test: Castle.Components.Winforms.AssemblyResolver.Tests.AssemblyResolverCompon entTestCase.LoadWindsorAssembly Type: Warning Message: Requires human interaction _____ Test: Castle.ActiveRecord.Tests.ActiveRecordTestCase.RelationMap Type: Warning Message: Need to complete this test case! _____ Test: Castle.ActiveRecord.Tests.TableHierarchyTestCase.InvalidSessionCache Type: Warning Message: Jira issue for NH team _____ Test: Castle.ActiveRecord.Tests.TableHierarchyTestCase.ManyToManyUsingIDBag Type: Warning Message: Create schema does not create all necessary tables for this test case Modifications since last build (0) |
|
From: <bui...@ca...> - 2005-10-31 04:00:54
|
CruiseControl.NET Build Results for project castle (http://localhost/ccnet/castle) |
|
From: <bui...@ca...> - 2005-10-31 03:57:30
|
CruiseControl.NET Build Results for project castle (http://localhost/ccnet/castle) |
|
From: <sv...@ca...> - 2005-10-31 03:50:40
|
User: hammett Date: 2005/10/30 10:45 PM Added: /trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/Components/ StartableComponent.cs Modified: /trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/ StartableFacilityTestCase.cs Log: File Changes: Directory: /trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/Components/ ============================================================================================== File [added]: StartableComponent.cs Delta lines: +47 -0 =================================================================== --- trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/Components/StartableComponent.cs 2005-10-31 03:11:43 UTC (rev 1269) +++ trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/Components/StartableComponent.cs 2005-10-31 03:45:55 UTC (rev 1270) @@ -0,0 +1,47 @@ +// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ +// +// 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. + +namespace Castle.Facilities.Startable.Tests.Components +{ + using System; + + using Castle.Model; + + [Transient] + public class StartableComponent : IStartable + { + private bool _Started = false; + private bool _Stopped = false; + + public void Start() + { + _Started = true; + } + + public void Stop() + { + _Stopped = true; + } + + public bool Started + { + get { return _Started; } + } + + public bool Stopped + { + get { return _Stopped; } + } + } +} Directory: /trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/ =================================================================================== File [modified]: StartableFacilityTestCase.cs Delta lines: +1 -1 =================================================================== --- trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/StartableFacilityTestCase.cs 2005-10-31 03:11:43 UTC (rev 1269) +++ trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/StartableFacilityTestCase.cs 2005-10-31 03:45:55 UTC (rev 1270) @@ -20,7 +20,7 @@ using Castle.MicroKernel; - using Castle.Facilities.Startable.Tests.Componets; + using Castle.Facilities.Startable.Tests.Components; [TestFixture] |
|
From: <sv...@ca...> - 2005-10-31 03:17:05
|
User: hammett Date: 2005/10/30 10:11 PM Modified: /trunk/ all.build Log: File Changes: Directory: /trunk/ ================== File [modified]: all.build Delta lines: +9 -1 =================================================================== --- trunk/all.build 2005-10-30 22:31:43 UTC (rev 1268) +++ trunk/all.build 2005-10-31 03:11:43 UTC (rev 1269) @@ -246,5 +246,13 @@ </fileset> </zip> </target> - + + <target name="update-from-svn"> + <!-- + <exec program="C:\devtools\svn-win32-1.2.3\bin\svn.exe"> + <arg value=""/> + </exec> + --> + </target> + </project> |
|
From: <sv...@ca...> - 2005-10-30 22:36:38
|
User: hammett
Date: 2005/10/30 05:31 PM
Modified:
/trunk/ActiveRecord/Castle.ActiveRecord/Framework/
ActiveRecordBase.cs
Log:
Another Doh moment.
File Changes:
Directory: /trunk/ActiveRecord/Castle.ActiveRecord/Framework/
=============================================================
File [modified]: ActiveRecordBase.cs
Delta lines: +13 -13
===================================================================
--- trunk/ActiveRecord/Castle.ActiveRecord/Framework/ActiveRecordBase.cs 2005-10-30 20:19:25 UTC (rev 1267)
+++ trunk/ActiveRecord/Castle.ActiveRecord/Framework/ActiveRecordBase.cs 2005-10-30 22:31:43 UTC (rev 1268)
@@ -95,7 +95,7 @@
/// <param name="call">The delegate instance</param>
/// <param name="instance">The ActiveRecord instance</param>
/// <returns>Whatever is returned by the delegate invocation</returns>
- protected static object Execute(Type targetType, NHibernateDelegate call, object instance)
+ protected internal static object Execute(Type targetType, NHibernateDelegate call, object instance)
{
if (targetType == null) throw new ArgumentNullException("targetType", "Target type must be informed");
if (call == null) throw new ArgumentNullException("call", "Delegate must be passed");
@@ -128,7 +128,7 @@
/// <returns></returns>
/// <exception cref="ObjectNotFoundException">if <c>throwOnNotFound</c> is set to
/// <c>true</c> and the row is not found</exception>
- protected static object FindByPrimaryKey(Type targetType, object id, bool throwOnNotFound)
+ protected internal static object FindByPrimaryKey(Type targetType, object id, bool throwOnNotFound)
{
EnsureInitialized(targetType);
@@ -164,7 +164,7 @@
/// <param name="targetType">The AR subclass type</param>
/// <param name="id">ID value</param>
/// <returns></returns>
- protected static object FindByPrimaryKey(Type targetType, object id)
+ protected internal static object FindByPrimaryKey(Type targetType, object id)
{
return FindByPrimaryKey(targetType, id, true);
}
@@ -174,7 +174,7 @@
/// </summary>
/// <param name="targetType"></param>
/// <returns></returns>
- protected static Array FindAll(Type targetType)
+ protected internal static Array FindAll(Type targetType)
{
return FindAll(targetType, (Order[]) null);
}
@@ -182,7 +182,7 @@
/// <summary>
/// Returns a portion of the query results (sliced)
/// </summary>
- protected static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, Order[] orders, params ICriterion[] criterias)
+ protected internal static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, Order[] orders, params ICriterion[] criterias)
{
EnsureInitialized(targetType);
@@ -223,7 +223,7 @@
/// <summary>
/// Returns a portion of the query results (sliced)
/// </summary>
- protected static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, params ICriterion[] criterias)
+ protected internal static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, params ICriterion[] criterias)
{
return SlicedFindAll(targetType, firstResult, maxresults, null, criterias);
}
@@ -236,7 +236,7 @@
/// <param name="orders"></param>
/// <param name="criterias"></param>
/// <returns></returns>
- protected static Array FindAll(Type targetType, Order[] orders, params ICriterion[] criterias)
+ protected internal static Array FindAll(Type targetType, Order[] orders, params ICriterion[] criterias)
{
EnsureInitialized(targetType);
@@ -278,7 +278,7 @@
/// <param name="targetType"></param>
/// <param name="criterias"></param>
/// <returns></returns>
- protected static Array FindAll(Type targetType, params ICriterion[] criterias)
+ protected internal static Array FindAll(Type targetType, params ICriterion[] criterias)
{
return FindAll(targetType, null, criterias);
}
@@ -299,7 +299,7 @@
return array;
}
- protected static void DeleteAll(Type type)
+ protected internal static void DeleteAll(Type type)
{
EnsureInitialized(type);
@@ -325,7 +325,7 @@
/// Saves the instance to the database
/// </summary>
/// <param name="instance"></param>
- protected static void Save(object instance)
+ protected internal static void Save(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -353,7 +353,7 @@
/// Creates (Saves) a new instance to the database.
/// </summary>
/// <param name="instance"></param>
- protected static void Create(object instance)
+ protected internal static void Create(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -382,7 +382,7 @@
/// state to the database.
/// </summary>
/// <param name="instance"></param>
- protected static void Update(object instance)
+ protected internal static void Update(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -410,7 +410,7 @@
/// Deletes the instance from the database.
/// </summary>
/// <param name="instance"></param>
- protected static void Delete(object instance)
+ protected internal static void Delete(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
|
|
From: <sv...@ca...> - 2005-10-30 20:24:19
|
User: hammett
Date: 2005/10/30 03:19 PM
Modified:
/trunk/ActiveRecord/Castle.ActiveRecord.Tests/
AbstractActiveRecordTest.cs
/trunk/ActiveRecord/Castle.ActiveRecord/Framework/
ActiveRecordBase.cs
Log:
public to protected
File Changes:
Directory: /trunk/ActiveRecord/Castle.ActiveRecord.Tests/
=========================================================
File [modified]: AbstractActiveRecordTest.cs
Delta lines: +2 -2
===================================================================
--- trunk/ActiveRecord/Castle.ActiveRecord.Tests/AbstractActiveRecordTest.cs 2005-10-30 18:14:54 UTC (rev 1266)
+++ trunk/ActiveRecord/Castle.ActiveRecord.Tests/AbstractActiveRecordTest.cs 2005-10-30 20:19:25 UTC (rev 1267)
@@ -23,7 +23,7 @@
public abstract class AbstractActiveRecordTest
{
- protected bool disableDrop = false;
+ // protected bool disableDrop = false;
protected IConfigurationSource GetConfigSource()
{
@@ -38,7 +38,7 @@
[TearDown]
public void Drop()
{
- if (disableDrop) return;
+ // if (disableDrop) return;
try
{
ActiveRecordStarter.DropSchema();
Directory: /trunk/ActiveRecord/Castle.ActiveRecord/Framework/
=============================================================
File [modified]: ActiveRecordBase.cs
Delta lines: +13 -139
===================================================================
--- trunk/ActiveRecord/Castle.ActiveRecord/Framework/ActiveRecordBase.cs 2005-10-30 18:14:54 UTC (rev 1266)
+++ trunk/ActiveRecord/Castle.ActiveRecord/Framework/ActiveRecordBase.cs 2005-10-30 20:19:25 UTC (rev 1267)
@@ -95,7 +95,7 @@
/// <param name="call">The delegate instance</param>
/// <param name="instance">The ActiveRecord instance</param>
/// <returns>Whatever is returned by the delegate invocation</returns>
- public static object Execute(Type targetType, NHibernateDelegate call, object instance)
+ protected static object Execute(Type targetType, NHibernateDelegate call, object instance)
{
if (targetType == null) throw new ArgumentNullException("targetType", "Target type must be informed");
if (call == null) throw new ArgumentNullException("call", "Delegate must be passed");
@@ -128,7 +128,7 @@
/// <returns></returns>
/// <exception cref="ObjectNotFoundException">if <c>throwOnNotFound</c> is set to
/// <c>true</c> and the row is not found</exception>
- public static object FindByPrimaryKey(Type targetType, object id, bool throwOnNotFound)
+ protected static object FindByPrimaryKey(Type targetType, object id, bool throwOnNotFound)
{
EnsureInitialized(targetType);
@@ -164,7 +164,7 @@
/// <param name="targetType">The AR subclass type</param>
/// <param name="id">ID value</param>
/// <returns></returns>
- public static object FindByPrimaryKey(Type targetType, object id)
+ protected static object FindByPrimaryKey(Type targetType, object id)
{
return FindByPrimaryKey(targetType, id, true);
}
@@ -174,7 +174,7 @@
/// </summary>
/// <param name="targetType"></param>
/// <returns></returns>
- public static Array FindAll(Type targetType)
+ protected static Array FindAll(Type targetType)
{
return FindAll(targetType, (Order[]) null);
}
@@ -182,7 +182,7 @@
/// <summary>
/// Returns a portion of the query results (sliced)
/// </summary>
- public static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, Order[] orders, params ICriterion[] criterias)
+ protected static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, Order[] orders, params ICriterion[] criterias)
{
EnsureInitialized(targetType);
@@ -223,7 +223,7 @@
/// <summary>
/// Returns a portion of the query results (sliced)
/// </summary>
- public static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, params ICriterion[] criterias)
+ protected static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, params ICriterion[] criterias)
{
return SlicedFindAll(targetType, firstResult, maxresults, null, criterias);
}
@@ -236,7 +236,7 @@
/// <param name="orders"></param>
/// <param name="criterias"></param>
/// <returns></returns>
- public static Array FindAll(Type targetType, Order[] orders, params ICriterion[] criterias)
+ protected static Array FindAll(Type targetType, Order[] orders, params ICriterion[] criterias)
{
EnsureInitialized(targetType);
@@ -278,7 +278,7 @@
/// <param name="targetType"></param>
/// <param name="criterias"></param>
/// <returns></returns>
- public static Array FindAll(Type targetType, params ICriterion[] criterias)
+ protected static Array FindAll(Type targetType, params ICriterion[] criterias)
{
return FindAll(targetType, null, criterias);
}
@@ -299,7 +299,7 @@
return array;
}
- public static void DeleteAll(Type type)
+ protected static void DeleteAll(Type type)
{
EnsureInitialized(type);
@@ -325,7 +325,7 @@
/// Saves the instance to the database
/// </summary>
/// <param name="instance"></param>
- public static void Save(object instance)
+ protected static void Save(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -353,7 +353,7 @@
/// Creates (Saves) a new instance to the database.
/// </summary>
/// <param name="instance"></param>
- public static void Create(object instance)
+ protected static void Create(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -382,7 +382,7 @@
/// state to the database.
/// </summary>
/// <param name="instance"></param>
- public static void Update(object instance)
+ protected static void Update(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -410,7 +410,7 @@
/// Deletes the instance from the database.
/// </summary>
/// <param name="instance"></param>
- public static void Delete(object instance)
+ protected static void Delete(object instance)
{
if (instance == null) throw new ArgumentNullException("instance");
@@ -473,132 +473,6 @@
#endregion
-// #region Base static methods
-//
-// /// <summary>
-// /// Invokes the specified delegate passing a valid
-// /// NHibernate session. Used for custom NHibernate queries.
-// /// </summary>
-// /// <param name="targetType">The target ActiveRecordType</param>
-// /// <param name="call">The delegate instance</param>
-// /// <param name="instance">The ActiveRecord instance</param>
-// /// <returns>Whatever is returned by the delegate invocation</returns>
-// protected static object Execute(Type targetType, NHibernateDelegate call, object instance)
-// {
-// return DomainModel.Execute(targetType,call,instance);
-// }
-//
-// internal protected static object FindByPrimaryKey(Type targetType, object id, bool throwOnNotFound)
-// {
-// return DomainModel.FindByPrimaryKey(targetType,id, throwOnNotFound);
-// }
-//
-// /// <summary>
-// /// Finds an object instance by a unique ID
-// /// </summary>
-// /// <param name="targetType">The AR subclass type</param>
-// /// <param name="id">ID value</param>
-// /// <returns></returns>
-// protected static object FindByPrimaryKey(Type targetType, object id)
-// {
-// return FindByPrimaryKey(targetType, id, true);
-// }
-//
-// /// <summary>
-// /// Returns all instances found for the specified type.
-// /// </summary>
-// /// <param name="targetType"></param>
-// /// <returns></returns>
-// protected static Array FindAll(Type targetType)
-// {
-// return FindAll(targetType, (Order[]) null);
-// }
-//
-// /// <summary>
-// /// Returns a portion of the query results (sliced)
-// /// </summary>
-// internal protected static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, Order[] orders, params ICriterion[] criterias)
-// {
-// return DomainModel.SlicedFindAll(targetType,firstResult,maxresults,orders,criterias);
-// }
-//
-// /// <summary>
-// /// Returns a portion of the query results (sliced)
-// /// </summary>
-// internal protected static Array SlicedFindAll(Type targetType, int firstResult, int maxresults, params ICriterion[] criterias)
-// {
-// return SlicedFindAll(targetType, firstResult, maxresults, null, criterias);
-// }
-//
-// /// <summary>
-// /// Returns all instances found for the specified type
-// /// using sort orders and criterias.
-// /// </summary>
-// /// <param name="targetType"></param>
-// /// <param name="orders"></param>
-// /// <param name="criterias"></param>
-// /// <returns></returns>
-// internal protected static Array FindAll(Type targetType, Order[] orders, params ICriterion[] criterias)
-// {
-// return DomainModel.FindAll(targetType,orders,criterias);
-// }
-//
-// /// <summary>
-// /// Returns all instances found for the specified type
-// /// using criterias.
-// /// </summary>
-// /// <param name="targetType"></param>
-// /// <param name="criterias"></param>
-// /// <returns></returns>
-// internal protected static Array FindAll(Type targetType, params ICriterion[] criterias)
-// {
-// return FindAll(targetType, null, criterias);
-// }
-//
-// internal protected static void DeleteAll(Type type)
-// {
-// DomainModel.DeleteAll(type);
-// }
-//
-// /// <summary>
-// /// Saves the instance to the database
-// /// </summary>
-// /// <param name="instance"></param>
-// protected static void Save(object instance)
-// {
-// DomainModel.Save(instance);
-// }
-//
-// /// <summary>
-// /// Creates (Saves) a new instance to the database.
-// /// </summary>
-// /// <param name="instance"></param>
-// protected static void Create(object instance)
-// {
-// DomainModel.Create(instance);
-// }
-//
-// /// <summary>
-// /// Persists the modification on the instance
-// /// state to the database.
-// /// </summary>
-// /// <param name="instance"></param>
-// protected static void Update(object instance)
-// {
-// DomainModel.Update(instance);
-// }
-//
-// /// <summary>
-// /// Deletes the instance from the database.
-// /// </summary>
-// /// <param name="instance"></param>
-// protected static void Delete(object instance)
-// {
-// DomainModel.Delete(instance);
-// }
-//
-// #endregion
-
#region Base methods
/// <summary>
|
|
From: <sv...@ca...> - 2005-10-30 18:19:53
|
User: hammett
Date: 2005/10/30 01:14 PM
Added:
/trunk/SharedLibs/db4o/
GPL.txt, db4o.dll
/trunk/SharedLibs/ibatis/
IBatisNet.Common.Logging.Log4Net.dll, IBatisNet.Common.dll, IBatisNet.DataMapper.dll
/trunk/SharedLibs/prevalence/
Bamboo.Prevalence.Collections.dll, Bamboo.Prevalence.Indexing.dll, Bamboo.Prevalence.Util.dll, Bamboo.Prevalence.XPath.dll, Bamboo.Prevalence.dll
Removed:
/trunk/Facilities/AspectSharp/lib/
/trunk/Facilities/Db4o/lib/
/trunk/Facilities/IBatisNet/lib/
/trunk/Facilities/Prevalence/lib/
/trunk/Facilities/Security/lib/
Modified:
/trunk/
copy-tasks.xml
/trunk/Facilities/
facilities.build
/trunk/Facilities/ActiveRecordIntegration/
default.build
/trunk/Facilities/AspectSharp/
default.build
/trunk/Facilities/AutomaticTransactionManagement/
default.build
/trunk/Facilities/BatchRegistration/
default.build
/trunk/Facilities/Cache/
default.build
/trunk/Facilities/Db4o/
default.build
/trunk/Facilities/IBatisNet/
default.build
/trunk/Facilities/Logging/
default.build, example_config.xml
/trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/
Castle.Facilities.Logging.Tests.csproj, Log4NetFacilityTests.cs, NLogFacilityTests.cs
/trunk/Facilities/Logging/Castle.Facilities.Logging/
LoggingFacility.cs
/trunk/Facilities/NHibernate/
default.build
/trunk/Facilities/NHibernateIntegration/
default.build
/trunk/Facilities/NHibernateIntegration/Castle.Facilities.NHibernateIntegration.Tests/
AbstractNHibernateTestCase.cs
/trunk/Facilities/Prevalence/
default.build
/trunk/Facilities/Remoting/
default.build
/trunk/Facilities/Security/
default.build
/trunk/Facilities/Security/Castle.Facilities.SecurityManagement/
SecurityComponentInspector.cs
/trunk/MonoRail/
monorail.build
/trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/
Castle.Services.Logging.log4netIntegration.csproj, Log4netFactory.cs, Log4netLogger.cs
Log:
build changes, still unfinished
File Changes:
Directory: /trunk/Facilities/ActiveRecordIntegration/
=====================================================
File [modified]: default.build
Delta lines: +23 -30
===================================================================
--- trunk/Facilities/ActiveRecordIntegration/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/ActiveRecordIntegration/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
-<project name="arintegration-facility" default="build">
+<project name="castle-arintegration-facility" default="build">
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.ActiveRecordIntegration" />
- <property name="nhibernate.test" value="true" unless="${property::exists('nhibernate.test')}" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.ActiveRecordIntegration.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.ActiveRecordIntegration" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
+ <property name="activerecord.test" value="true" unless="${property::exists('nhibernate.test')}" />
+
<target name="clean">
<delete failonerror="false">
<fileset basedir="${bin.dir}">
@@ -26,24 +28,15 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/Castle.ActiveRecord.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/NHibernate.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/HashCodeProvider.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/Iesi.Collections.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/Nullables.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/Nullables.NHibernate.dll" todir="${bin.dir}" />
- <copy file="${ar.bin.dir}/log4net.dll" todir="${bin.dir}" />
- <copy file="${services.bin.dir}/Castle.Services.Transaction.dll" todir="${bin.dir}" />
- <copy file="../AutomaticTransactionManagement/bin/Castle.Facilities.AutomaticTransactionManagement.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-activerecord" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-transaction-service" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-atm-facility" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
@@ -89,8 +82,8 @@
</csc>
</target>
- <target name="tests.run" depends="tests.compile" if="${nhibernate.test}">
- <nunit2 failonerror="false">
+ <target name="tests.run" depends="tests.compile" if="${activerecord.test}">
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
Directory: /trunk/Facilities/AspectSharp/
=========================================
File [modified]: default.build
Delta lines: +14 -26
===================================================================
--- trunk/Facilities/AspectSharp/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/AspectSharp/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="aspectsharp-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.AspectSharp" />
+
+ <include buildfile="../../common.inc" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.AspectSharp.Tests" />
<property name="name" value="Castle.Facilities.AspectSharp" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
@@ -25,24 +26,11 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
- <copy todir="${bin.dir}">
- <fileset basedir="${aspectsharp.bin.dir}">
- <include name="antlr.runtime.dll" />
- <include name="AopAlliance.dll" />
- <include name="AspectSharp.dll" />
- <include name="AspectSharp.Lang.dll" />
- <include name="Castle.DynamicProxy.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-aspectsharp" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
Directory: /trunk/Facilities/AutomaticTransactionManagement/
============================================================
File [modified]: default.build
Delta lines: +14 -19
===================================================================
--- trunk/Facilities/AutomaticTransactionManagement/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/AutomaticTransactionManagement/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="autotransaction-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.AutomaticTransactionManagement" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.AutomaticTransactionManagement.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.AutomaticTransactionManagement" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-3" />
@@ -25,17 +26,11 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy file="${services.bin.dir}/Castle.Services.Transaction.dll" todir="${bin.dir}" />
-
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-transaction-service" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
Directory: /trunk/Facilities/BatchRegistration/
===============================================
File [modified]: default.build
Delta lines: +11 -18
===================================================================
--- trunk/Facilities/BatchRegistration/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/BatchRegistration/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="BatchRegistration-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.BatchRegistration" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.BatchRegistration.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.BatchRegistration" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
-
+
<target name="clean">
<delete failonerror="false">
<fileset basedir="${bin.dir}">
@@ -25,15 +26,7 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
</target>
<target name="build" depends="init,tests.run" />
Directory: /trunk/Facilities/Cache/
===================================
File [modified]: default.build
Delta lines: +10 -17
===================================================================
--- trunk/Facilities/Cache/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Cache/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="Cache-facility" default="build">
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.Cache" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.Cache.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.Cache" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
@@ -25,15 +26,7 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
</target>
<target name="build" depends="init,tests.run" />
Directory: /trunk/Facilities/Logging/Castle.Facilities.Logging/
===============================================================
File [modified]: LoggingFacility.cs
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/Logging/Castle.Facilities.Logging/LoggingFacility.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Logging/Castle.Facilities.Logging/LoggingFacility.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -44,7 +44,7 @@
/// </summary>
public class LoggingFacility : AbstractFacility
{
- private static readonly String Log4NetLoggerFactoryTypeName = "Castle.Services.Logging.log4netIntegration.Log4netFactory, Castle.Services.Logging.log4netIntegration";
+ private static readonly String Log4NetLoggerFactoryTypeName = "Castle.Services.Logging.Log4netIntegration.Log4netFactory, Castle.Services.Logging.log4netIntegration";
private static readonly String NLogLoggerFactoryTypeName = "Castle.Services.Logging.NLogIntegration.NLogFactory, Castle.Services.Logging.NLogIntegration";
private static readonly String WebLoggerFactoryTypeName = "Castle.Services.Logging.Web.WebLoggerFactory, Castle.Services.Logging.Web";
Directory: /trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/
=====================================================================
File [modified]: Castle.Facilities.Logging.Tests.csproj
Delta lines: +30 -0
===================================================================
--- trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/Castle.Facilities.Logging.Tests.csproj 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/Castle.Facilities.Logging.Tests.csproj 2005-10-30 18:14:54 UTC (rev 1266)
@@ -115,6 +115,36 @@
AssemblyName = "Castle.Services.Logging"
HintPath = "..\..\..\Services\bin\Castle.Services.Logging.dll"
/>
+ <Reference
+ Name = "Castle.Services.Logging.Web"
+ AssemblyName = "Castle.Services.Logging.Web"
+ HintPath = "..\..\..\Services\bin\Castle.Services.Logging.Web.dll"
+ />
+ <Reference
+ Name = "Castle.Services.Logging.Log4netIntegration"
+ AssemblyName = "Castle.Services.Logging.Log4netIntegration"
+ HintPath = "..\..\..\Services\bin\Castle.Services.Logging.Log4netIntegration.dll"
+ />
+ <Reference
+ Name = "Castle.Services.Logging.NLogIntegration"
+ AssemblyName = "Castle.Services.Logging.NLogIntegration"
+ HintPath = "..\..\..\Services\bin\Castle.Services.Logging.NLogIntegration.dll"
+ />
+ <Reference
+ Name = "NLog.DotNet"
+ AssemblyName = "NLog.DotNet"
+ HintPath = "..\..\..\SharedLibs\nlog\NLog.DotNet.dll"
+ />
+ <Reference
+ Name = "NLog"
+ AssemblyName = "NLog"
+ HintPath = "..\..\..\SharedLibs\nlog\NLog.dll"
+ />
+ <Reference
+ Name = "log4net"
+ AssemblyName = "log4net"
+ HintPath = "..\..\..\SharedLibs\log4net\log4net.dll"
+ />
</References>
</Build>
<Files>
File [modified]: Log4NetFacilityTests.cs
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/Log4NetFacilityTests.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/Log4NetFacilityTests.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -24,7 +24,7 @@
/// <summary>
/// Summary description for Log4NetFacilityTests.
/// </summary>
- [TestFixture]
+ [TestFixture, Ignore("Dont think we are able to hook Console Output here")]
public class Log4NetFacilityTests : BaseTest
{
private IWindsorContainer container;
File [modified]: NLogFacilityTests.cs
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/NLogFacilityTests.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Logging/Castle.Facilities.Logging.Tests/NLogFacilityTests.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -24,7 +24,7 @@
/// <summary>
/// Summary description for NLogFacilityTestts.
/// </summary>
- [TestFixture]
+ [TestFixture, Ignore("Dont think we are able to hook Console Output here")]
public class NLogFacilityTests : BaseTest
{
private IWindsorContainer container;
Directory: /trunk/Facilities/NHibernateIntegration/Castle.Facilities.NHibernateIntegration.Tests/
=================================================================================================
File [modified]: AbstractNHibernateTestCase.cs
Delta lines: +9 -0
===================================================================
--- trunk/Facilities/NHibernateIntegration/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/NHibernateIntegration/Castle.Facilities.NHibernateIntegration.Tests/AbstractNHibernateTestCase.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -55,6 +55,15 @@
[TearDown]
public void Dispose()
{
+ Configuration cfg1 = (Configuration) container[ "sessionFactory1.cfg" ];
+ SchemaExport export1 = new SchemaExport(cfg1);
+
+ Configuration cfg2 = (Configuration) container[ "sessionFactory2.cfg" ];
+ SchemaExport export2 = new SchemaExport(cfg2);
+
+ export2.Drop(false, true);
+ export1.Drop(false, true);
+
container.Dispose();
container = null;
Directory: /trunk/Facilities/Security/Castle.Facilities.SecurityManagement/
===========================================================================
File [modified]: SecurityComponentInspector.cs
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/Security/Castle.Facilities.SecurityManagement/SecurityComponentInspector.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Security/Castle.Facilities.SecurityManagement/SecurityComponentInspector.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -41,7 +41,7 @@
model.Dependencies.Add(
new DependencyModel( DependencyType.Service, null, typeof(SecurityInterceptor), false ) );
- model.Interceptors.Insert( 0,
+ model.Interceptors.Add(
new InterceptorReference( typeof(SecurityInterceptor) ) );
}
}
Directory: /trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/
==============================================================================
File [modified]: Castle.Services.Logging.log4netIntegration.csproj
Delta lines: +2 -2
===================================================================
--- trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj 2005-10-30 18:14:54 UTC (rev 1266)
@@ -9,7 +9,7 @@
<Settings
ApplicationIcon = ""
AssemblyKeyContainerName = ""
- AssemblyName = "Castle.Services.Logging.log4netIntegration"
+ AssemblyName = "Castle.Services.Logging.Log4netIntegration"
AssemblyOriginatorKeyFile = ""
DefaultClientScript = "JScript"
DefaultHTMLPageLayout = "Grid"
@@ -18,7 +18,7 @@
OutputType = "Library"
PreBuildEvent = ""
PostBuildEvent = ""
- RootNamespace = "Castle.Services.Logging.log4netIntegration"
+ RootNamespace = "Castle.Services.Logging.Log4netIntegration"
RunPostBuildEvent = "OnBuildSuccess"
StartupObject = ""
>
File [modified]: Log4netFactory.cs
Delta lines: +1 -1
===================================================================
--- trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/Log4netFactory.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/Log4netFactory.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace Castle.Services.Logging.log4netIntegration
+namespace Castle.Services.Logging.Log4netIntegration
{
using System;
using System.IO;
File [modified]: Log4netLogger.cs
Delta lines: +1 -1
===================================================================
--- trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/Log4netLogger.cs 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Services/Logging/Castle.Services.Logging.log4netIntegration/Log4netLogger.cs 2005-10-30 18:14:54 UTC (rev 1266)
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-namespace Castle.Services.Logging.log4netIntegration
+namespace Castle.Services.Logging.Log4netIntegration
{
using System;
Directory: /trunk/Facilities/Db4o/
==================================
File [modified]: default.build
Delta lines: +20 -21
===================================================================
--- trunk/Facilities/Db4o/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Db4o/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
-<project name="nhibernate-facility" default="build">
+<project name="db4o-facility" default="build">
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.Db4oIntegration" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.Db4oIntegration.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.Db4oIntegration" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
@@ -25,17 +26,15 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy file="${services.bin.dir}/Castle.Services.Transaction.dll" todir="${bin.dir}" />
- <copy file="../AutomaticTransactionManagement/bin/Castle.Facilities.AutomaticTransactionManagement.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-transaction-service" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-atm-facility" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-db4o" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
@@ -82,7 +81,7 @@
</target>
<target name="tests.run" depends="tests.compile">
- <nunit2 failonerror="false">
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
Directory: /trunk/Facilities/
=============================
File [modified]: facilities.build
Delta lines: +14 -18
===================================================================
--- trunk/Facilities/facilities.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/facilities.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,30 +1,17 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
-<project name="facilities" default="build">
+<project name="castle-facilities" default="build">
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
+
<property name="name" value="Facilities" />
- <property name="version" value="beta-2" />
- <property name="container.bin.dir" value="${base.dir}/../../InversionOfControl/bin" />
- <property name="services.bin.dir" value="${base.dir}/../../Services/bin" />
- <property name="ar.bin.dir" value="${base.dir}/../../ActiveRecord/bin" />
- <property name="aspectsharp.bin.dir" value="${base.dir}/../../AspectSharp/bin" />
- <include buildfile="../common.inc" />
-
- <property name="strong" value="STRONG" unless="${property::exists('strong')}" />
- <property name="debug" value="false" />
- <property name="optimize" value="true" />
-
- <!-- Removed the build for prevalence til they apply the patch -->
- <!-- supplied -->
-
<target name="build" depends="init, buildlist1, buildlist2, buildlist3" />
<target name="buildlist1" depends="autotransaction,arintegration,aspectsharp,batchregistration,cache,db4o" />
<target name="buildlist2" depends="eventwiring,factorysupport,nhibernate,ibatis,logging" />
<target name="buildlist3" depends="prevalence,remoting,startable,securitymanagement,typedfactory" />
- <!-- entlib is/are out -->
+ <!-- entlib,x is/are out -->
<target name="init">
@@ -59,11 +46,15 @@
</target>
<target name="eventwiring">
+ <!--
<nant buildfile="EventWiring/default.build" inheritall="true" target="build" />
+ -->
</target>
<target name="factorysupport">
+ <!--
<nant buildfile="FactorySupport/default.build" inheritall="true" target="build" />
+ -->
</target>
<target name="ibatis">
@@ -83,11 +74,15 @@
</target>
<target name="remoting">
+ <!--
<nant buildfile="Remoting/default.build" inheritall="true" target="build" />
+ -->
</target>
<target name="startable">
+ <!--
<nant buildfile="Startable/default.build" inheritall="true" target="build" />
+ -->
</target>
<target name="securitymanagement">
@@ -95,7 +90,9 @@
</target>
<target name="typedfactory">
+ <!--
<nant buildfile="TypedFactory/default.build" inheritall="true" target="build" />
+ -->
</target>
<target name="dist">
@@ -122,7 +119,6 @@
<include name="**/*.zip" />
</fileset>
</zip>
-
</target>
</project>
Directory: /trunk/Facilities/IBatisNet/
=======================================
File [modified]: default.build
Delta lines: +18 -21
===================================================================
--- trunk/Facilities/IBatisNet/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/IBatisNet/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="nhibernate-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.IBatisNetIntegration" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.IBatisNetIntegration.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.IBatisNetIntegration" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
- <property name="ibatis.test" value="true" unless="${property::exists('ibatis.test')}" />
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
+
+ <property name="ibatis.test" value="true" unless="${property::exists('ibatis.test')}" />
<target name="clean">
<delete failonerror="false">
@@ -27,24 +28,20 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy file="${services.bin.dir}/Castle.Services.Transaction.dll" todir="${bin.dir}" />
- <copy file="../AutomaticTransactionManagement/bin/Castle.Facilities.AutomaticTransactionManagement.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-transaction-service" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-atm-facility" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-ibatis" inheritall="true" />
</target>
<target name="build" depends="init,tests.run" />
<target name="compile" depends="init">
<csc
- define="STRONG2"
+ define="STRONG"
target="library"
debug="${debug}"
optimize="${optimize}"
Directory: /trunk/Facilities/Logging/
=====================================
File [modified]: default.build
Delta lines: +20 -24
===================================================================
--- trunk/Facilities/Logging/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Logging/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="logging-facility" default="build">
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.Logging" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.Logging.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.Logging" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
- <property name="version" value="Beta-1" />
+ <property name="version" value="beta-2" />
<target name="clean">
<delete failonerror="false">
@@ -25,20 +26,15 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${services.bin.dir}/../Logging/lib">
- <include name="*.dll" />
- </fileset>
- </copy>
- <copy todir="${bin.dir}">
- <fileset basedir="${services.bin.dir}">
- <include name="Castle.Services.Log*.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-logging-service" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-log4net" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-nlog" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
@@ -85,7 +81,7 @@
</target>
<target name="tests.run" depends="tests.compile">
- <nunit2 failonerror="false">
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
File [modified]: example_config.xml
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/Logging/example_config.xml 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Logging/example_config.xml 2005-10-30 18:14:54 UTC (rev 1266)
@@ -5,7 +5,7 @@
<facilities>
<facility id="logging"
- loggingApi="NLog | Log4net | Custom"
+ loggingApi="NLog | Log4net | Web | Custom"
customLoggerFactory="typename, assemblyname" />
</facilities>
Directory: /trunk/MonoRail/
===========================
File [modified]: monorail.build
Delta lines: +3 -1
===================================================================
--- trunk/MonoRail/monorail.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/MonoRail/monorail.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -99,7 +99,9 @@
<nant buildfile="TestSite/sample.build" inheritall="true" target="compile" />
<nant buildfile="TestSiteWindsor/sample.build" inheritall="true" target="compile" />
<nant buildfile="TestSiteNVelocity/sample.build" inheritall="true" target="compile" />
- <nant buildfile="TestSiteBrail/sample.build" inheritall="true" target="compile" />
+ <!--
+ <nant buildfile="TestSiteBrail/sample.build" inheritall="true" target="compile" />
+ -->
<nant buildfile="TestScaffolding/sample.build" inheritall="true" target="compile" />
</target>
Directory: /trunk/Facilities/NHibernate/
========================================
File [modified]: default.build
Delta lines: +1 -1
===================================================================
--- trunk/Facilities/NHibernate/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/NHibernate/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -114,7 +114,7 @@
</target>
<target name="tests.run" depends="tests.compile" if="${nhibernate.test}">
- <nunit2 failonerror="false">
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
Directory: /trunk/Facilities/NHibernateIntegration/
===================================================
File [modified]: default.build
Delta lines: +21 -30
===================================================================
--- trunk/Facilities/NHibernateIntegration/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/NHibernateIntegration/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="nhibernate-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.NHibernateIntegration" />
- <property name="nhibernate.test" value="true" unless="${property::exists('nhibernate.test')}" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.NHibernateIntegration.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.NHibernateIntegration" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
- <property name="version" value="beta-3" />
+ <property name="version" value="beta-1" />
+ <property name="nhibernate.test" value="true" unless="${property::exists('nhibernate.test')}" />
+
<target name="clean">
<delete failonerror="false">
<fileset basedir="${bin.dir}">
@@ -26,26 +28,15 @@
</target>
<target name="init" depends="clean">
- <!-- Copy nhibernate assemblies -->
- <copy todir="${library.dir}">
- <fileset basedir="../../ActiveRecord/lib">
- <include name="*.dll" />
- </fileset>
- </copy>
-
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy file="${services.bin.dir}/Castle.Services.Transaction.dll" todir="${bin.dir}" />
- <copy file="../AutomaticTransactionManagement/bin/Castle.Facilities.AutomaticTransactionManagement.dll" todir="${bin.dir}" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-nhibernate" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-transaction-service" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-atm-facility" inheritall="true" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
-
</target>
<target name="build" depends="init,tests.run" />
@@ -92,7 +83,7 @@
</target>
<target name="tests.run" depends="tests.compile" if="${nhibernate.test}">
- <nunit2 failonerror="false">
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
Directory: /trunk/Facilities/Prevalence/
========================================
File [modified]: default.build
Delta lines: +14 -15
===================================================================
--- trunk/Facilities/Prevalence/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Prevalence/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="prevalence-facility" default="build">
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.Prevalence" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.Prevalence.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.Prevalence" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
<property name="version" value="beta-2" />
@@ -25,13 +26,11 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-prevalence" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
Directory: /trunk/Facilities/Remoting/
======================================
File [modified]: default.build
Delta lines: +13 -14
===================================================================
--- trunk/Facilities/Remoting/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Remoting/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="remoting-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.Remoting" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.Remoting.Tests" />
- <property name="test.components.src.dir" value="${base.dir}/Castle.Facilities.Remoting.TestComponents" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.Remoting" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
- <property name="test.components.name" value="Castle.Facilities.Remoting.TestComponents.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
+ <property name="test.components.src.dir" value="${base.dir}/${name}.TestComponents" />
+ <property name="test.components.name" value="${name}.TestComponents.dll" />
+
<property name="version" value="alpha" />
<target name="clean">
@@ -27,10 +29,7 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
</target>
<target name="build" depends="init,tests.run" />
Directory: /trunk/Facilities/Security/
======================================
File [modified]: default.build
Delta lines: +18 -23
===================================================================
--- trunk/Facilities/Security/default.build 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/Facilities/Security/default.build 2005-10-30 18:14:54 UTC (rev 1266)
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding='iso-8859-1' ?>
<project name="security-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
- <property name="base.dir" value="." />
+ <property name="base.dir" value="${path::get-full-path( project::get-base-directory() )}" />
<property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.SecurityManagement" />
- <property name="securitymanagement.test" value="true" unless="${property::exists('securitymanagement.test')}" />
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.SecurityManagement.Tests" />
+ <include buildfile="../../common.inc" />
+
<property name="name" value="Castle.Facilities.SecurityManagement" />
+ <property name="test.name" value="${name}.Tests" />
+
<property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
+ <property name="test.assembly.name" value="${test.name}.dll" />
+
+ <property name="src.dir" value="${base.dir}/${name}" />
+ <property name="test.src.dir" value="${base.dir}/${test.name}" />
+
+ <property name="version" value="alpha" />
- <property name="version" value="alpha-1" />
-
<target name="clean">
<delete failonerror="false">
<fileset basedir="${bin.dir}">
@@ -26,16 +26,11 @@
</target>
<target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- <copy file="${services.bin.dir}/Castle.Services.Security.dll" todir="${bin.dir}" />
- <copy todir="${bin.dir}">
- <fileset basedir="${library.dir}">
- <include name="*.dll" />
- </fileset>
- </copy>
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-container" inheritall="true" />
+
+ <nant buildfile="${base.dir}/../../copy-tasks.xml" target="copy-security-service" inheritall="true" />
+
</target>
<target name="build" depends="init,tests.run" />
@@ -81,8 +76,8 @@
</csc>
</target>
- <target name="tests.run" depends="tests.compile" if="${securitymanagement.test}">
- <nunit2 failonerror="false">
+ <target name="tests.run" depends="tests.compile">
+ <nunit2>
<formatter type="${nunit.formatter}" />
<test assemblyname="${bin.dir}/${test.assembly.name}" />
</nunit2>
Directory: /trunk/SharedLibs/db4o/
==================================
File [added]: GPL.txt
Delta lines: +341 -0
===================================================================
--- trunk/SharedLibs/db4o/GPL.txt 2005-10-30 17:32:06 UTC (rev 1265)
+++ trunk/SharedLibs/db4o/GPL.txt 2005-10-30 18:14:54 UTC (rev 1266)
@@ -0,0 +1,341 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place,...
[truncated message content] |
|
From: <sv...@ca...> - 2005-10-30 17:36:58
|
User: hammett
Date: 2005/10/30 12:32 PM
Added:
/trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/
config_with_include_relative2.xml
Modified:
/trunk/InversionOfControl/Castle.MicroKernel/
Castle.MicroKernel.csproj
/trunk/InversionOfControl/Castle.Model.Tests/Resources/
FileResourceFactoryTestCase.cs
/trunk/InversionOfControl/Castle.Model/Resource/
FileResource.cs
/trunk/InversionOfControl/Castle.Windsor.Tests/
Castle.Windsor.Tests.csproj
/trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/
IncludesTestCase.cs, config_with_include_relative.xml
Log:
Fixes for net 2.0
File Changes:
Directory: /trunk/InversionOfControl/Castle.MicroKernel/
========================================================
File [modified]: Castle.MicroKernel.csproj
Delta lines: +90 -0
===================================================================
--- trunk/InversionOfControl/Castle.MicroKernel/Castle.MicroKernel.csproj 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.MicroKernel/Castle.MicroKernel.csproj 2005-10-30 17:32:06 UTC (rev 1265)
@@ -173,6 +173,96 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "Facilities\EventWiring\EventWiringException.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\EventWiringFacility.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\FactorySupport\AccessorActivator.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\FactorySupport\FactoryActivator.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\FactorySupport\FactorySupportFacility.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Remoting\RemotingFacility.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Remoting\RemotingInspector.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Remoting\RemotingRegistry.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Remoting\CustomActivators\RemoteActivator.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Remoting\CustomActivators\RemoteActivatorThroughRegistry.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Remoting\CustomActivators\RemoteClientActivatedActivator.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Startable\StartableFacility.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Startable\StartConcern.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Startable\StopConcern.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\TypedFactory\Empty.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\TypedFactory\FactoryEntry.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\TypedFactory\FactoryInterceptor.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\TypedFactory\TypedFactoryFacility.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Handlers\AbstractHandler.cs"
SubType = "Code"
BuildAction = "Compile"
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/
==========================================================
File [modified]: Castle.Windsor.Tests.csproj
Delta lines: +4 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-30 17:32:06 UTC (rev 1265)
@@ -286,6 +286,10 @@
BuildAction = "EmbeddedResource"
/>
<File
+ RelPath = "Configuration2\config_with_include_relative2.xml"
+ BuildAction = "EmbeddedResource"
+ />
+ <File
RelPath = "Configuration2\include1.xml"
BuildAction = "EmbeddedResource"
/>
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/
=========================================================================
File [modified]: IncludesTestCase.cs
Delta lines: +17 -4
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/IncludesTestCase.cs 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/IncludesTestCase.cs 2005-10-30 17:32:06 UTC (rev 1265)
@@ -17,14 +17,16 @@
using System;
using System.IO;
+ using NUnit.Framework;
+
+ using Castle.Model.Resource;
+ using Castle.Model.Configuration;
+
using Castle.MicroKernel;
- using Castle.Model.Configuration;
- using Castle.Model.Resource;
+
using Castle.Windsor.Configuration.Interpreters;
- using NUnit.Framework;
-
[TestFixture]
public class IncludesTestCase
{
@@ -54,6 +56,17 @@
AssertConfiguration();
}
+ [Test, Ignore(".net 2.0 problems")]
+ public void FileResourceAndRelativeIncludes2()
+ {
+ String file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, dir +
+ "config_with_include_relative2.xml");
+
+ container = new WindsorContainer(file);
+
+ AssertConfiguration();
+ }
+
[Test]
public void AssemblyResourceAndIncludes()
{
File [modified]: config_with_include_relative.xml
Delta lines: +2 -2
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/config_with_include_relative.xml 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/config_with_include_relative.xml 2005-10-30 17:32:06 UTC (rev 1265)
@@ -1,6 +1,6 @@
<configuration>
- <include uri="file://./RelativeTest/rel_include1.xml"/>
- <include uri="file://./RelativeTest/rel_include2.xml"/>
+ <include uri="file://RelativeTest/rel_include1.xml"/>
+ <include uri="file://RelativeTest/rel_include2.xml"/>
</configuration>
\ No newline at end of file
File [added]: config_with_include_relative2.xml
Delta lines: +6 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/config_with_include_relative2.xml 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Configuration2/config_with_include_relative2.xml 2005-10-30 17:32:06 UTC (rev 1265)
@@ -0,0 +1,6 @@
+<configuration>
+
+ <include uri="file://RelativeTest2/../RelativeTest/rel_include1.xml"/>
+ <include uri="file://RelativeTest2/../RelativeTest/rel_include2.xml"/>
+
+</configuration>
\ No newline at end of file
Directory: /trunk/InversionOfControl/Castle.Model/Resource/
===========================================================
File [modified]: FileResource.cs
Delta lines: +4 -0
===================================================================
--- trunk/InversionOfControl/Castle.Model/Resource/FileResource.cs 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.Model/Resource/FileResource.cs 2005-10-30 17:32:06 UTC (rev 1265)
@@ -76,6 +76,10 @@
{
filePath = filePath.Substring(1);
}
+ if (filePath[ filePath.Length - 1 ] == '/')
+ {
+ filePath = filePath.Substring(0, filePath.Length - 1);
+ }
return CreateStreamFromPath(filePath, basePath);
}
Directory: /trunk/InversionOfControl/Castle.Model.Tests/Resources/
==================================================================
File [modified]: FileResourceFactoryTestCase.cs
Delta lines: +20 -4
===================================================================
--- trunk/InversionOfControl/Castle.Model.Tests/Resources/FileResourceFactoryTestCase.cs 2005-10-30 16:07:33 UTC (rev 1264)
+++ trunk/InversionOfControl/Castle.Model.Tests/Resources/FileResourceFactoryTestCase.cs 2005-10-30 17:32:06 UTC (rev 1265)
@@ -28,6 +28,12 @@
private FileResourceFactory resFactory = new FileResourceFactory();
private String basePath = "../Castle.Model.Tests/Resources";
+ [TestFixtureSetUp]
+ public void Init()
+ {
+ basePath = Path.Combine(Directory.GetCurrentDirectory(), basePath);
+ }
+
[Test]
public void Accept()
{
@@ -42,8 +48,11 @@
FileInfo fileInfo = new FileInfo(file);
- IResource resource = resFactory.Create( new Uri("file://" + fileInfo.FullName), null );
+ Uri uri = new Uri(fileInfo.FullName);
+ // IResource resource = resFactory.Create( new Uri("file://" + fileInfo.FullName), null );
+ IResource resource = resFactory.Create( uri, null );
+
Assert.IsNotNull(resource);
String line = resource.GetStreamReader().ReadLine();
Assert.AreEqual("Something", line);
@@ -52,7 +61,8 @@
[Test]
public void CreateWithRelativePath()
{
- IResource resource = resFactory.Create( new Uri("file://" + basePath + "/file1.txt") );
+ // IResource resource = resFactory.Create( new Uri("file://" + basePath + "/file1.txt") );
+ IResource resource = resFactory.Create( new Uri(basePath + "/file1.txt") );
Assert.IsNotNull(resource);
String line = resource.GetStreamReader().ReadLine();
@@ -62,8 +72,13 @@
[Test]
public void CreateWithRelativePathAndContext()
{
- IResource resource = resFactory.Create( new Uri("file://file1.txt"), basePath );
+ Uri uri = new Uri("file://file1.txt");
+ Console.WriteLine(uri.ToString());
+ Console.WriteLine(uri.IsFile);
+ // IResource resource = resFactory.Create( new Uri("file://file1.txt"), basePath );
+ IResource resource = resFactory.Create( uri, basePath );
+
Assert.IsNotNull(resource);
String line = resource.GetStreamReader().ReadLine();
Assert.AreEqual("Something", line);
@@ -73,7 +88,8 @@
[ExpectedException(typeof(ResourceException))]
public void NonExistingResource()
{
- resFactory.Create( new Uri("file://" + basePath + "/Something/file1.txt") );
+ // resFactory.Create( new Uri("file://" + basePath + "/Something/file1.txt") );
+ resFactory.Create( new Uri(basePath + "/Something/file1.txt") );
}
}
}
|
|
From: <sv...@ca...> - 2005-10-30 16:12:07
|
User: hammett Date: 2005/10/30 11:07 AM Added: /trunk/Facilities/Startable/ This facility has been moved to MicroKernel.Facilities.txt Removed: /trunk/Facilities/Startable/ Readme.txt, Startable.sln /trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/ Log: Moved standard facilities to microkernel codebase File Changes: Directory: /trunk/Facilities/Startable/ ======================================= File [removed]: Readme.txt Delta lines: +0 -4 =================================================================== --- trunk/Facilities/Startable/Readme.txt 2005-10-30 16:06:56 UTC (rev 1263) +++ trunk/Facilities/Startable/Readme.txt 2005-10-30 16:07:33 UTC (rev 1264) @@ -1,4 +0,0 @@ - -More information about facilities -can be found at http://www.castleproject.org/ - File [removed]: Startable.sln Delta lines: +0 -35 =================================================================== --- trunk/Facilities/Startable/Startable.sln 2005-10-30 16:06:56 UTC (rev 1263) +++ trunk/Facilities/Startable/Startable.sln 2005-10-30 16:07:33 UTC (rev 1264) @@ -1,35 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.Facilities.Startable", "Castle.Facilities.Startable\Castle.Facilities.Startable.csproj", "{FB937092-633B-49A1-BC1E-37B8D5EEFBB0}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.Facilities.Startable.Tests", "Castle.Facilities.Startable.Tests\Castle.Facilities.Startable.Tests.csproj", "{EC041291-4687-47DA-975D-E5A541BF6432}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {FB937092-633B-49A1-BC1E-37B8D5EEFBB0}.Debug.ActiveCfg = Debug|.NET - {FB937092-633B-49A1-BC1E-37B8D5EEFBB0}.Debug.Build.0 = Debug|.NET - {FB937092-633B-49A1-BC1E-37B8D5EEFBB0}.Release.ActiveCfg = Release|.NET - {FB937092-633B-49A1-BC1E-37B8D5EEFBB0}.Release.Build.0 = Release|.NET - {EC041291-4687-47DA-975D-E5A541BF6432}.Debug.ActiveCfg = Debug|.NET - {EC041291-4687-47DA-975D-E5A541BF6432}.Debug.Build.0 = Debug|.NET - {EC041291-4687-47DA-975D-E5A541BF6432}.Release.ActiveCfg = Release|.NET - {EC041291-4687-47DA-975D-E5A541BF6432}.Release.Build.0 = Release|.NET - EndGlobalSection - GlobalSection(SolutionItems) = postSolution - Changes.txt = Changes.txt - default.build = default.build - License.txt = License.txt - Readme.txt = Readme.txt - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal File [added]: This facility has been moved to MicroKernel.Facilities.txt Delta lines: +3 -0 =================================================================== --- trunk/Facilities/Startable/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 16:06:56 UTC (rev 1263) +++ trunk/Facilities/Startable/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 16:07:33 UTC (rev 1264) @@ -0,0 +1,3 @@ +Its type name now is + +Castle.Facilities.Startable.StartableFacility, Castle.MicroKernel \ No newline at end of file |
|
From: <sv...@ca...> - 2005-10-30 16:11:39
|
User: hammett
Date: 2005/10/30 11:06 AM
Added:
/trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/
/trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/
StartableFacilityTestCase.cs
Modified:
/trunk/InversionOfControl/Castle.MicroKernel.Tests/
Castle.MicroKernel.Tests.csproj
Log:
Moved standard facilities to microkernel codebase
File Changes:
Directory: /trunk/InversionOfControl/Castle.MicroKernel.Tests/
==============================================================
File [modified]: Castle.MicroKernel.Tests.csproj
Delta lines: +10 -0
===================================================================
--- trunk/InversionOfControl/Castle.MicroKernel.Tests/Castle.MicroKernel.Tests.csproj 2005-10-30 16:04:31 UTC (rev 1262)
+++ trunk/InversionOfControl/Castle.MicroKernel.Tests/Castle.MicroKernel.Tests.csproj 2005-10-30 16:06:56 UTC (rev 1263)
@@ -255,6 +255,16 @@
BuildAction = "Compile"
/>
<File
+ RelPath = "Facilities\Startable\StartableFacilityTestCase.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\Startable\Componets\StartableComponent.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Lifecycle\LifecycleTestCase.cs"
SubType = "Code"
BuildAction = "Compile"
Directory: /trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/
===================================================================================
File [added]: StartableFacilityTestCase.cs
Delta lines: +48 -0
===================================================================
--- trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/StartableFacilityTestCase.cs 2005-10-30 16:04:31 UTC (rev 1262)
+++ trunk/InversionOfControl/Castle.MicroKernel.Tests/Facilities/Startable/StartableFacilityTestCase.cs 2005-10-30 16:06:56 UTC (rev 1263)
@@ -0,0 +1,48 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.Startable.Tests
+{
+ using System;
+
+ using NUnit.Framework;
+
+ using Castle.MicroKernel;
+
+ using Castle.Facilities.Startable.Tests.Componets;
+
+
+ [TestFixture]
+ public class StartableFacilityTestCase
+ {
+ [Test]
+ public void SimpleCase()
+ {
+ IKernel kernel = new DefaultKernel();
+
+ kernel.AddFacility( "startable", new StartableFacility() );
+
+ kernel.AddComponent( "a", typeof(StartableComponent) );
+
+ StartableComponent component = kernel["a"] as StartableComponent;
+
+ Assert.IsNotNull(component);
+ Assert.IsTrue( component.Started );
+ Assert.IsFalse( component.Stopped );
+
+ kernel.ReleaseComponent(component);
+ Assert.IsTrue( component.Stopped );
+ }
+ }
+}
|
|
From: <sv...@ca...> - 2005-10-30 16:09:07
|
User: hammett
Date: 2005/10/30 11:04 AM
Added:
/trunk/Facilities/EventWiring/
This facility has been moved to MicroKernel.Facilities.txt
/trunk/Facilities/FactorySupport/
This facility has been moved to MicroKernel.Facilities.txt
/trunk/Facilities/Remoting/
This facility has been moved to MicroKernel.Facilities.txt
/trunk/Facilities/TypedFactory/
This facility has been moved to MicroKernel.Facilities.txt
Removed:
/trunk/Facilities/EventWiring/
EventWiring.sln, License.txt, Readme.txt, config.xml, default.build
/trunk/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/
/trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/
/trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/
/trunk/Facilities/Remoting/Castle.Facilities.Remoting/
/trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/
Modified:
/trunk/Facilities/TypedFactory/
TypedFactory.sln
/trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory.Tests/
Castle.Facilities.TypedFactory.Tests.csproj
Log:
Moved standard facilities to microkernel codebase
File Changes:
Directory: /trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory.Tests/
===============================================================================
File [modified]: Castle.Facilities.TypedFactory.Tests.csproj
Delta lines: +0 -5
===================================================================
--- trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory.Tests/Castle.Facilities.TypedFactory.Tests.csproj 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory.Tests/Castle.Facilities.TypedFactory.Tests.csproj 2005-10-30 16:04:31 UTC (rev 1262)
@@ -86,11 +86,6 @@
AssemblyFolderKey = "hklm\dn\nunit.framework"
/>
<Reference
- Name = "Castle.Facilities.TypedFactory"
- Project = "{03D19FDE-6EAD-4FC1-B244-987E8C4983E6}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
Name = "Castle.Windsor"
AssemblyName = "Castle.Windsor"
HintPath = "..\..\..\InversionOfControl\bin\Castle.Windsor.dll"
Directory: /trunk/Facilities/EventWiring/
=========================================
File [removed]: EventWiring.sln
Delta lines: +0 -32
===================================================================
--- trunk/Facilities/EventWiring/EventWiring.sln 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/EventWiring/EventWiring.sln 2005-10-30 16:04:31 UTC (rev 1262)
@@ -1,32 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.Facilities.EventWiring", "Castle.Facilities.EventWiring\Castle.Facilities.EventWiring.csproj", "{3B341A93-96C8-4560-A078-4384253BF679}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.Facilities.EventWiring.Tests", "Castle.Facilities.EventWiring.Tests\Castle.Facilities.EventWiring.Tests.csproj", "{89FC2739-BEAB-4926-9899-5B2CA43A39BB}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {3B341A93-96C8-4560-A078-4384253BF679}.Debug.ActiveCfg = Debug|.NET
- {3B341A93-96C8-4560-A078-4384253BF679}.Debug.Build.0 = Debug|.NET
- {3B341A93-96C8-4560-A078-4384253BF679}.Release.ActiveCfg = Release|.NET
- {3B341A93-96C8-4560-A078-4384253BF679}.Release.Build.0 = Release|.NET
- {89FC2739-BEAB-4926-9899-5B2CA43A39BB}.Debug.ActiveCfg = Debug|.NET
- {89FC2739-BEAB-4926-9899-5B2CA43A39BB}.Debug.Build.0 = Debug|.NET
- {89FC2739-BEAB-4926-9899-5B2CA43A39BB}.Release.ActiveCfg = Release|.NET
- {89FC2739-BEAB-4926-9899-5B2CA43A39BB}.Release.Build.0 = Release|.NET
- EndGlobalSection
- GlobalSection(SolutionItems) = postSolution
- config.xml = config.xml
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
File [removed]: License.txt
Delta lines: +0 -13
===================================================================
--- trunk/Facilities/EventWiring/License.txt 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/EventWiring/License.txt 2005-10-30 16:04:31 UTC (rev 1262)
@@ -1,13 +0,0 @@
-Copyright 2004-2005 Castle Project - http://www.castleproject.org/
-
-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.
File [removed]: Readme.txt
Delta lines: +0 -4
===================================================================
--- trunk/Facilities/EventWiring/Readme.txt 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/EventWiring/Readme.txt 2005-10-30 16:04:31 UTC (rev 1262)
@@ -1,4 +0,0 @@
-
-More information about facilities
-can be found at http://www.castleproject.org/
-
File [added]: This facility has been moved to MicroKernel.Facilities.txt
Delta lines: +3 -0
===================================================================
--- trunk/Facilities/EventWiring/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/EventWiring/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 16:04:31 UTC (rev 1262)
@@ -0,0 +1,3 @@
+Its type name now is
+
+Castle.Facilities.EventWiring.EventWiringFacility, Castle.MicroKernel
\ No newline at end of file
File [removed]: config.xml
Delta lines: +0 -47
===================================================================
--- trunk/Facilities/EventWiring/config.xml 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/EventWiring/config.xml 2005-10-30 16:04:31 UTC (rev 1262)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-
- <components>
- <component id="SimpleListener">
- <subscribes>
- <subscribe-to publisher="SimplePublisher" event="Event" handler="OnPublish"/>
- </subscribes>
- </component>
-
- <component id="SimpleListener2">
- <subscribes>
- <subscribe-to publisher="SimplePublisher" event="StaticEvent" handler="OnPublish"/>
- </subscribes>
- </component>
-
- <component id="MultiListener">
- <subscribes>
- <subscribe-to
- publisher="MultiPublisher"
- handler="OnPublish"
- event="Event1" />
- <subscribe-to
- publisher="MultiPublisher"
- handler="OnPublish2"
- event="Event2" />
- <subscribe-to
- publisher="PublisherListener"
- handler="OnPublish"
- event="Event1" />
- </subscribes>
- </component>
-
- <component id="PublisherListener">
- <subscribes>
- <subscribe-to handler="OnPublish" publisher="SimplePublisher" event="Event" />
- </subscribes>
- </component>
-
- <component id="BadConfig">
- <subscribes>
- <subscribe-to handler="OnPublish" publisher="SimplePublisher" event="EventIahhh" />
- </subscribes>
- </component>
- </components>
-
-</configuration>
File [removed]: default.build
Delta lines: +0 -153
===================================================================
--- trunk/Facilities/EventWiring/default.build 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/EventWiring/default.build 2005-10-30 16:04:31 UTC (rev 1262)
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding='iso-8859-1' ?>
-<project name="eventwiring-facility" default="build">
-
- <!-- This build file inherits common properties from the ../facilities.build -->
-
- <property name="base.dir" value="." />
- <property name="bin.dir" value="${base.dir}/bin" />
- <property name="library.dir" value="${base.dir}/lib" />
- <property name="doc.dir" value="${base.dir}/docs" />
- <property name="src.dir" value="${base.dir}/Castle.Facilities.EventWiring" />
-
- <property name="test.src.dir" value="${base.dir}/Castle.Facilities.EventWiring.Tests" />
- <property name="name" value="Castle.Facilities.EventWiring" />
- <property name="assembly.name" value="${name}.dll" />
- <property name="test.assembly.name" value="${name}.Tests.dll" />
-
- <property name="version" value="alpha" />
-
- <target name="clean">
- <delete failonerror="false">
- <fileset basedir="${bin.dir}">
- <include name="*.dll" />
- </fileset>
- </delete>
- </target>
-
- <target name="init" depends="clean">
- <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.Windsor.dll" todir="${bin.dir}" />
- <copy file="${container.bin.dir}/Castle.DynamicProxy.dll" todir="${bin.dir}" />
- </target>
-
- <target name="build" depends="init,tests.run" />
-
- <target name="compile" depends="init">
- <csc
- define="${strong}"
- target="library"
- debug="${debug}"
- optimize="${optimize}"
- output="${bin.dir}/${assembly.name}"
- doc="${bin.dir}/${name}.xml">
-
- <nowarn>
- <warning number="1591" />
- <warning number="1572" />
- </nowarn>
-
- <sources basedir="${src.dir}" defaultexcludes="true">
- <include name="**/*.cs" />
- </sources>
-
- <references>
- <include name="${bin.dir}/*.dll" />
- </references>
- </csc>
- </target>
-
- <target name="tests.compile" depends="compile">
- <csc
- target="library"
- debug="${debug}"
- output="${bin.dir}/${test.assembly.name}">
-
- <sources basedir="${test.src.dir}" defaultexcludes="true">
- <include name="**/*.cs" />
- </sources>
-
- <references>
- <include name="${nunit.framework.dll}" />
- <include name="${bin.dir}/*.dll" />
- </references>
- </csc>
- </target>
-
- <target name="tests.run" depends="tests.compile">
- <nunit2 >
- <formatter type="${nunit.formatter}" />
- <test assemblyname="${bin.dir}/${test.assembly.name}" />
- </nunit2>
- </target>
-
- <target name="docs">
- <ndoc failonerror="true">
- <assemblies basedir="${bin.dir}">
- <include name="${assembly.name}" />
- </assemblies>
- <documenters>
- <documenter name="MSDN">
- <property name="OutputTarget" value="HTMLHelp" />
- <property name="Preliminary" value="true" />
- <property name="CleanIntermediates" value="true" />
- <property name="SdkLinksOnWeb" value="true" />
- <property name="AutoPropertyBackerSummaries" value="true" />
- <property name="AutoDocumentConstructors" value="true" />
- <property name="OutputDirectory" value="${doc.dir}" />
- <property name="HtmlHelpName" value="${name}" />
- <property name="IncludeFavorites" value="False" />
- <property name="Title" value="Facility - ${name}" />
- <property name="SplitTOCs" value="False" />
- <property name="DefaulTOC" value="Windsor" />
- <property name="ShowVisualBasic" value="True" />
- <property name="ShowMissingSummaries" value="False" />
- <property name="ShowMissingRemarks" value="False" />
- <property name="ShowMissingParams" value="False" />
- <property name="ShowMissingReturns" value="False" />
- <property name="ShowMissingValues" value="False" />
- <property name="DocumentInternals" value="False" />
- <property name="DocumentProtected" value="True" />
- <property name="DocumentPrivates" value="False" />
- <property name="DocumentEmptyNamespaces" value="False" />
- <property name="IncludeAssemblyVersion" value="True" />
- <property name="CopyrightText" value="Copyright 2004,2005 - Castle Project (original author or authors)" />
- <property name="CopyrightHref" value="http://www.castleproject.org" />
- </documenter>
- </documenters>
- </ndoc>
- </target>
-
- <target name="dist" depends="docs">
- <zip zipfile="${name}.src.zip">
- <fileset basedir="${base.dir}">
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="*.build" />
- <include name="*.sln" />
- <include name="${src.dir}/**/*.*" />
- <include name="${test.src.dir}/**/*.*" />
- <include name="${library.dir}/**/*.*" />
-
- <exclude name="**/Debug/*" />
- <exclude name="**/obj/*" />
- <exclude name="**/*.user" />
- <exclude name="**/*.suo" />
- </fileset>
- </zip>
- <zip zipfile="${name}.${version}.zip">
- <fileset basedir="${base.dir}">
- <include name="${bin.dir}/${assembly.name}" />
- <include name="${library.dir}/**/*.*" />
- <include name="License.txt" />
- <include name="Readme.txt" />
- <include name="Changes.txt" />
- <include name="${name}.src.zip" />
- <include name="${doc.dir}/${name}.chm" />
- </fileset>
- </zip>
- <delete file="${name}.src.zip" />
- </target>
-
-</project>
Directory: /trunk/Facilities/FactorySupport/
============================================
File [added]: This facility has been moved to MicroKernel.Facilities.txt
Delta lines: +3 -0
===================================================================
--- trunk/Facilities/FactorySupport/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/FactorySupport/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 16:04:31 UTC (rev 1262)
@@ -0,0 +1,3 @@
+Its type name now is
+
+Castle.Facilities.FactorySupport.FactorySupportFacility, Castle.MicroKernel
\ No newline at end of file
Directory: /trunk/Facilities/Remoting/
======================================
File [added]: This facility has been moved to MicroKernel.Facilities.txt
Delta lines: +3 -0
===================================================================
--- trunk/Facilities/Remoting/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/Remoting/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 16:04:31 UTC (rev 1262)
@@ -0,0 +1,3 @@
+Its type name now is
+
+Castle.Facilities.Remoting.RemotingFacility, Castle.MicroKernel
\ No newline at end of file
Directory: /trunk/Facilities/TypedFactory/
==========================================
File [added]: This facility has been moved to MicroKernel.Facilities.txt
Delta lines: +3 -0
===================================================================
--- trunk/Facilities/TypedFactory/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/TypedFactory/This facility has been moved to MicroKernel.Facilities.txt 2005-10-30 16:04:31 UTC (rev 1262)
@@ -0,0 +1,3 @@
+Its type name now is
+
+Castle.Facilities.TypedFactory.TypedFactoryFacility, Castle.MicroKernel
\ No newline at end of file
File [modified]: TypedFactory.sln
Delta lines: +0 -8
===================================================================
--- trunk/Facilities/TypedFactory/TypedFactory.sln 2005-10-30 15:54:11 UTC (rev 1261)
+++ trunk/Facilities/TypedFactory/TypedFactory.sln 2005-10-30 16:04:31 UTC (rev 1262)
@@ -1,8 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.Facilities.TypedFactory", "Castle.Facilities.TypedFactory\Castle.Facilities.TypedFactory.csproj", "{03D19FDE-6EAD-4FC1-B244-987E8C4983E6}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Castle.Facilities.TypedFactory.Tests", "Castle.Facilities.TypedFactory.Tests\Castle.Facilities.TypedFactory.Tests.csproj", "{8A080CE4-4C56-4FCB-9940-451F261BFEE9}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@@ -13,10 +9,6 @@
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {03D19FDE-6EAD-4FC1-B244-987E8C4983E6}.Debug.ActiveCfg = Debug|.NET
- {03D19FDE-6EAD-4FC1-B244-987E8C4983E6}.Debug.Build.0 = Debug|.NET
- {03D19FDE-6EAD-4FC1-B244-987E8C4983E6}.Release.ActiveCfg = Release|.NET
- {03D19FDE-6EAD-4FC1-B244-987E8C4983E6}.Release.Build.0 = Release|.NET
{8A080CE4-4C56-4FCB-9940-451F261BFEE9}.Debug.ActiveCfg = Debug|.NET
{8A080CE4-4C56-4FCB-9940-451F261BFEE9}.Debug.Build.0 = Debug|.NET
{8A080CE4-4C56-4FCB-9940-451F261BFEE9}.Release.ActiveCfg = Release|.NET
|
|
From: <sv...@ca...> - 2005-10-30 15:58:47
|
User: hammett Date: 2005/10/30 10:54 AM Removed: /trunk/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/ EventWiringTestCase.cs /trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/ EventWiringException.cs, EventWiringFacility.cs /trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/ AccessorActivator.cs, FactoryActivator.cs, FactorySupportFacility.cs /trunk/Facilities/Remoting/Castle.Facilities.Remoting/ RemotingFacility.cs, RemotingInspector.cs, RemotingRegistry.cs /trunk/Facilities/Startable/ Changes.txt, License.txt, default.build /trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/ AssemblyInfo.cs, Castle.Facilities.Startable.Tests.csproj, StartableFacilityTestCase.cs /trunk/Facilities/Startable/Castle.Facilities.Startable/ /trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/ Empty.cs, FactoryEntry.cs, FactoryInterceptor.cs, TypedFactoryFacility.cs Log: Moved standard facilities to microkernel codebase File Changes: Directory: /trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/ ======================================================================= File [removed]: EventWiringException.cs Delta lines: +0 -39 =================================================================== --- trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/EventWiringException.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/EventWiringException.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,39 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.EventWiring -{ - using System; - using System.Runtime.Serialization; - - [Serializable] - public class EventWiringException : ApplicationException - { - public EventWiringException() - { - } - - public EventWiringException(string message) : base(message) - { - } - - public EventWiringException(string message, Exception innerException) : base(message, innerException) - { - } - - public EventWiringException(SerializationInfo info, StreamingContext context) : base(info, context) - { - } - } -} File [removed]: EventWiringFacility.cs Delta lines: +0 -128 =================================================================== --- trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/EventWiringFacility.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/EventWiring/Castle.Facilities.EventWiring/EventWiringFacility.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,128 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.EventWiring -{ - using System; - using System.Collections; - using System.Collections.Specialized; - using System.Reflection; - - using Castle.Model; - using Castle.Model.Configuration; - - using Castle.MicroKernel; - using Castle.MicroKernel.Facilities; - - - public class EventWiringFacility : AbstractFacility - { - private IDictionary _subscribers; - - public EventWiringFacility() - { - } - - protected override void Init() - { - _subscribers = new HybridDictionary(true); - - Kernel.ComponentModelCreated += new ComponentModelDelegate(OnComponentModelCreated); - Kernel.ComponentCreated += new ComponentInstanceDelegate(OnComponentCreated); - Kernel.ComponentDestroyed += new ComponentInstanceDelegate(OnComponentDestroyed); - } - - private void OnComponentModelCreated(ComponentModel model) - { - RegisterEventListeners(model); - } - - private void RegisterEventListeners(ComponentModel model) - { - if (model.Configuration != null) - { - IConfiguration subscribersNode = model.Configuration.Children["subscribes"]; - - if (subscribersNode != null) - { - //TODO: Validate the config. - - _subscribers.Add(model.Name, subscribersNode); - } - } - } - - private void OnComponentDestroyed(ComponentModel model, object instance) - { - //TODO: Remove Listener - } - - private void OnComponentCreated(ComponentModel model, object instance) - { - WireEventsIfNeeded(model, instance); - } - - private void WireEventsIfNeeded(ComponentModel model, object instance) - { - if (_subscribers.Contains(model.Name)) - { - IConfiguration subscribersNode = (IConfiguration) _subscribers[model.Name]; - - foreach (IConfiguration subscriberNode in subscribersNode.Children) - { - object publisher = GetPublisherInstance(subscriberNode); - - EventInfo eventInfo = GetEventInfo(publisher, subscriberNode); - - String handlerMethodName = subscriberNode.Attributes["handler"]; - Delegate handler = Delegate.CreateDelegate(eventInfo.EventHandlerType, instance, handlerMethodName); - - eventInfo.AddEventHandler(publisher, handler); - } - } - } - - private EventInfo GetEventInfo(object publisher, IConfiguration subscriberNode) - { - String eventName = subscriberNode.Attributes["event"]; - - Type publisherType = publisher.GetType(); - - EventInfo eventInfo = publisherType.GetEvent(eventName, BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public); - - if (eventInfo == null) - { - throw new EventWiringException(String.Format("Event Not Found. Event Name: {0}. Publisher: {1}", eventName, publisherType.FullName)); - } - - return eventInfo; - } - - private object GetPublisherInstance(IConfiguration subscriberNode) - { - String publisherId = subscriberNode.Attributes["publisher"]; - - //TODO: Check cyclic dependency - - try - { - return Kernel[publisherId]; - } - catch (Exception e) - { - throw new EventWiringException("Error resolving publisher", e); - } - } - } -} \ No newline at end of file Directory: /trunk/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/ ============================================================================= File [removed]: EventWiringTestCase.cs Delta lines: +0 -125 =================================================================== --- trunk/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/EventWiringTestCase.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/EventWiring/Castle.Facilities.EventWiring.Tests/EventWiringTestCase.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,125 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.EventWiring.Tests -{ - using NUnit.Framework; - - using Castle.Windsor; - using Castle.Facilities.EventWiring.Tests.Model; - - [TestFixture] - public class EventWiringTestCase - { - private WindsorContainer _container; - - public EventWiringTestCase() - { - } - - [SetUp] - public void Init() - { - _container = new WindsorContainer("../config.xml"); - - _container.AddFacility("eventwiring", new EventWiringFacility()); - - _container.AddComponent("SimpleListener", typeof(SimpleListener)); - _container.AddComponent("SimpleListener2", typeof(SimpleListener)); - _container.AddComponent("SimplePublisher", typeof(SimplePublisher)); - _container.AddComponent("MultiPublisher", typeof(MultiPublisher)); - _container.AddComponent("MultiListener", typeof(MultiListener)); - _container.AddComponent("PublisherListener", typeof(PublisherListener), typeof(PublisherListener)); - _container.AddComponent("BadConfig", typeof(SimpleListener)); - } - - [Test] - public void TriggerSimple() - { - SimplePublisher publisher = (SimplePublisher)_container["SimplePublisher"]; - SimpleListener listener = (SimpleListener)_container["SimpleListener2"]; - - Assert.IsFalse(listener.Listened); - Assert.IsNull(listener.Sender); - - publisher.StaticTrigger(); - - Assert.IsTrue(listener.Listened); - Assert.AreSame(publisher, listener.Sender); - } - - [Test] - public void TriggerStaticEvent() - { - SimplePublisher publisher = (SimplePublisher)_container["SimplePublisher"]; - SimpleListener listener = (SimpleListener)_container["SimpleListener"]; - - Assert.IsFalse(listener.Listened); - Assert.IsNull(listener.Sender); - - publisher.Trigger(); - - Assert.IsTrue(listener.Listened); - Assert.AreSame(publisher, listener.Sender); - } - - [Test, ExpectedException(typeof(EventWiringException))] - public void EventNotFound() - { - object badConfigured = _container["BadConfig"]; - } - - [Test] - public void MultiEvents() - { - MultiListener listener = (MultiListener)_container["MultiListener"]; - MultiPublisher publisher = (MultiPublisher)_container["MultiPublisher"]; - PublisherListener publisherThatListens = (PublisherListener)_container["PublisherListener"]; - SimplePublisher anotherPublisher = (SimplePublisher)_container["SimplePublisher"]; - - Assert.IsFalse(listener.Listened); - Assert.IsNull(listener.Sender); - - publisher.Trigger1(); - - Assert.IsTrue(listener.Listened); - Assert.AreSame(publisher, listener.Sender); - - listener.Reset(); - - publisher.Trigger2(); - - Assert.IsTrue(listener.Listened); - Assert.AreSame(publisher, listener.Sender); - - listener.Reset(); - - publisherThatListens.Trigger1(); - - Assert.IsTrue(listener.Listened); - Assert.AreSame(publisherThatListens, listener.Sender); - - - Assert.IsFalse(publisherThatListens.Listened); - Assert.IsNull(publisherThatListens.Sender); - - anotherPublisher.Trigger(); - - Assert.IsTrue(publisherThatListens.Listened); - Assert.AreSame(anotherPublisher, publisherThatListens.Sender); - } - - - } -} Directory: /trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/ ============================================================================= File [removed]: AccessorActivator.cs Delta lines: +0 -68 =================================================================== --- trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/AccessorActivator.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/AccessorActivator.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,68 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.FactorySupport -{ - using System; - using System.Reflection; - - using Castle.Model; - using Castle.MicroKernel; - using Castle.MicroKernel.ComponentActivator; - using Castle.MicroKernel.Facilities; - - - public class AccessorActivator : DefaultComponentActivator - { - public AccessorActivator(ComponentModel model, IKernel kernel, ComponentInstanceDelegate onCreation, ComponentInstanceDelegate onDestruction) : base(model, kernel, onCreation, onDestruction) - { - } - - protected override object Instantiate() - { - String accessor = (String) Model.ExtendedProperties["instance.accessor"]; - - PropertyInfo pi = Model.Implementation.GetProperty( - accessor, BindingFlags.Public|BindingFlags.Static ); - - if (pi == null) - { - String message = String.Format("You have specified an instance accessor " + - "for the component '{0}' {1} which could not be found (no public " + - "static property has this name)", Model.Name, Model.Implementation.FullName); - throw new FacilityException(message); - } - - if (!pi.CanRead) - { - String message = String.Format("You have specified an instance accessor " + - "for the component '{0}' {1} which is write-only", - Model.Name, Model.Implementation.FullName); - throw new FacilityException(message); - } - - try - { - return pi.GetValue( null, new object[0] ); - } - catch(Exception ex) - { - String message = String.Format("The instance accessor " + - "invocation failed for '{0}' {1}", - Model.Name, Model.Implementation.FullName); - throw new FacilityException(message, ex); - } - } - } -} File [removed]: FactoryActivator.cs Delta lines: +0 -141 =================================================================== --- trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/FactoryActivator.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/FactoryActivator.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,141 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.FactorySupport -{ - using System; - using System.Collections; - using System.Reflection; - - using Castle.Model; - - using Castle.MicroKernel; - using Castle.MicroKernel.ComponentActivator; - using Castle.MicroKernel.Facilities; - using Castle.MicroKernel.SubSystems.Conversion; - - - /// <summary> - /// - /// </summary> - public class FactoryActivator : DefaultComponentActivator - { - public FactoryActivator(ComponentModel model, IKernel kernel, ComponentInstanceDelegate onCreation, ComponentInstanceDelegate onDestruction) : base(model, kernel, onCreation, onDestruction) - { - } - - protected override object Instantiate() - { - String factoryId = (String) Model.ExtendedProperties["factoryId"]; - String factoryCreate = (String) Model.ExtendedProperties["factoryCreate"]; - - if (!Kernel.HasComponent( factoryId )) - { - String message = String.Format("You have specified a factory ('{2}') " + - "for the component '{0}' {1} but the kernel does not have this " + - "factory registered", - Model.Name, Model.Implementation.FullName, factoryId); - throw new FacilityException(message); - } - - IHandler factoryHandler = Kernel.GetHandler( factoryId ); - - // Let's find out whether the create method is a static or instance method - - Type factoryType = factoryHandler.ComponentModel.Implementation; - - MethodInfo staticCreateMethod = - factoryType.GetMethod( factoryCreate, - BindingFlags.Public|BindingFlags.Static ); - - MethodInfo instanceCreateMethod = - factoryType.GetMethod( factoryCreate, - BindingFlags.Public|BindingFlags.Instance ); - - if (staticCreateMethod != null) - { - return Create(null, factoryId, staticCreateMethod, factoryCreate); - } - else if (instanceCreateMethod != null) - { - object factoryInstance = Kernel[ factoryId ]; - - return Create(factoryInstance, factoryId, instanceCreateMethod, factoryCreate); - } - else - { - String message = String.Format("You have specified a factory " + - "('{2}' - method to be called: {3}) " + - "for the component '{0}' {1} but we couldn't find the creation method" + - "(neither instance or static method with the name '{3}')", - Model.Name, Model.Implementation.FullName, factoryId, factoryCreate); - throw new FacilityException(message); - } - } - - private object Create(object factoryInstance, string factoryId, - MethodInfo instanceCreateMethod, string factoryCreate) - { - ITypeConverter converter = (ITypeConverter) Kernel.GetSubSystem( SubSystemConstants.ConversionManagerKey ); - - try - { - ParameterInfo[] parameters = instanceCreateMethod.GetParameters(); - - ArrayList methodArgs = new ArrayList(); - - foreach(ParameterInfo parameter in parameters) - { - Type paramType = parameter.ParameterType; - - DependencyModel depModel = null; - - if ( converter.CanHandleType(paramType) ) - { - depModel = new DependencyModel( - DependencyType.Parameter, parameter.Name, paramType, false ); - } - else - { - depModel = new DependencyModel( - DependencyType.Service, parameter.Name, paramType, false ); - } - - if (!Kernel.Resolver.CanResolve(Model, depModel)) - { - String message = String.Format( - "Factory Method {0}.{1} requires an argument '{2}' that could not be resolved", - instanceCreateMethod.DeclaringType.FullName, instanceCreateMethod.Name, parameter.Name); - throw new FacilityException(message); - } - - object arg = Kernel.Resolver.Resolve(Model, depModel ); - - methodArgs.Add(arg); - } - - return instanceCreateMethod.Invoke( factoryInstance, methodArgs.ToArray() ); - } - catch(Exception ex) - { - String message = String.Format("You have specified a factory " + - "('{2}' - method to be called: {3}) " + - "for the component '{0}' {1} that failed during invoke.", - Model.Name, Model.Implementation.FullName, factoryId, factoryCreate); - - throw new FacilityException(message, ex); - } - } - } -} \ No newline at end of file File [removed]: FactorySupportFacility.cs Delta lines: +0 -59 =================================================================== --- trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/FactorySupportFacility.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/FactorySupport/Castle.Facilities.FactorySupport/FactorySupportFacility.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,59 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.FactorySupport -{ - using System; - - using Castle.Model; - using Castle.MicroKernel; - using Castle.MicroKernel.Facilities; - - - public class FactorySupportFacility : AbstractFacility - { - protected override void Init() - { - Kernel.ComponentModelCreated += new ComponentModelDelegate(Kernel_ComponentModelCreated); - } - - private void Kernel_ComponentModelCreated(ComponentModel model) - { - String instanceAccessor = model.Configuration.Attributes["instance-accessor"]; - String factoryId = model.Configuration.Attributes["factoryId"]; - String factoryCreate = model.Configuration.Attributes["factoryCreate"]; - - if ((factoryId != null && factoryCreate == null) || - (factoryId == null && factoryCreate != null)) - { - String message = String.Format("When a factoryId is specified, you must specify " + - "the factoryCreate (which is the method to be called) as well - component {0}", model.Name); - - throw new FacilityException(message); - } - - if (instanceAccessor != null) - { - model.ExtendedProperties.Add( "instance.accessor", instanceAccessor ); - model.CustomComponentActivator = typeof(AccessorActivator); - } - else if (factoryId != null) - { - model.ExtendedProperties.Add( "factoryId", factoryId ); - model.ExtendedProperties.Add( "factoryCreate", factoryCreate ); - model.CustomComponentActivator = typeof(FactoryActivator); - } - } - } -} Directory: /trunk/Facilities/Remoting/Castle.Facilities.Remoting/ ================================================================= File [removed]: RemotingFacility.cs Delta lines: +0 -157 =================================================================== --- trunk/Facilities/Remoting/Castle.Facilities.Remoting/RemotingFacility.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Remoting/Castle.Facilities.Remoting/RemotingFacility.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,157 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.Remoting -{ - using System; - using System.IO; - using System.Configuration; - using System.Runtime.Remoting; - - using Castle.MicroKernel; - using Castle.MicroKernel.Facilities; - using Castle.MicroKernel.SubSystems.Conversion; - - public class RemotingFacility : AbstractFacility - { - private ITypeConverter converter; - - private bool isServer, isClient; - private bool disconnectLocalRegistry; - private bool disconnectRemoteRegistry; - - /// <summary> - /// Used for client side (Expand explanation) - /// </summary> - private String baseUri; - - /// <summary> - /// Used for server side. - /// Holds the local registry - /// </summary> - private RemotingRegistry localRegistry; - - /// <summary> - /// Used for client side. - /// Holds a remote proxy to the server registry - /// </summary> - private RemotingRegistry remoteRegistry; - - /// <summary> - /// Constructs a RemotingFacility - /// </summary> - public RemotingFacility() - { - } - - protected override void Init() - { - ObtainConverter(); - - SetUpRemotingConfiguration(); - - baseUri = FacilityConfig.Attributes["baseUri"]; - - String isServerAttValue = FacilityConfig.Attributes["isServer"]; - String isClientAttValue = FacilityConfig.Attributes["isClient"]; - - if ("true".Equals(isServerAttValue)) - { - isServer = true; - ConfigureServerFacility(); - } - - if ("true".Equals(isClientAttValue)) - { - isClient = true; - ConfigureClientFacility(); - } - - Kernel.ComponentModelBuilder.AddContributor( - new RemotingInspector(converter, isServer, isClient, baseUri, remoteRegistry, localRegistry) ); - } - - private void SetUpRemotingConfiguration() - { - String configurationFile = FacilityConfig.Attributes["remotingConfigurationFile"]; - - if (configurationFile == null) return; - - if (!Path.IsPathRooted(configurationFile)) - { - configurationFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, configurationFile); - } - - if (!File.Exists(configurationFile)) - { - String message = String.Format("Remoting configuration file '{0}' does not exist", configurationFile); - throw new ConfigurationException(message); - } - - RemotingConfiguration.Configure(configurationFile); - } - - private void ConfigureServerFacility() - { - Kernel.AddComponent( "remoting.registry", typeof(RemotingRegistry) ); - - localRegistry = (RemotingRegistry) Kernel[ typeof(RemotingRegistry) ]; - - String kernelUri = FacilityConfig.Attributes["registryUri"]; - - if (kernelUri == null || kernelUri.Length == 0) - { - String message = "When the remote facility is configured as " + - "server you must supply the URI for the component registry using the attribute 'registryUri'"; - throw new ConfigurationException(message); - } - - RemotingServices.Marshal( localRegistry, kernelUri, typeof(RemotingRegistry) ); - - disconnectLocalRegistry = true; - } - - private void ConfigureClientFacility() - { - String remoteKernelUri = FacilityConfig.Attributes["remoteKernelUri"]; - - if (remoteKernelUri == null || remoteKernelUri.Length == 0) - { - String message = "When the remote facility is configured as " + - "client you must supply the URI for the kernel using the attribute 'remoteKernelUri'"; - throw new ConfigurationException(message); - } - - remoteRegistry = (RemotingRegistry) - RemotingServices.Connect( typeof(RemotingRegistry), remoteKernelUri ); - - disconnectRemoteRegistry = true; - } - - private void ObtainConverter() - { - converter = (ITypeConverter) Kernel.GetSubSystem( - SubSystemConstants.ConversionManagerKey ); - } - - public override void Dispose() - { - if (disconnectLocalRegistry) RemotingServices.Disconnect(localRegistry); - - if (disconnectRemoteRegistry) RemotingServices.Disconnect(remoteRegistry); - - base.Dispose(); - } - } -} File [removed]: RemotingInspector.cs Delta lines: +0 -238 =================================================================== --- trunk/Facilities/Remoting/Castle.Facilities.Remoting/RemotingInspector.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Remoting/Castle.Facilities.Remoting/RemotingInspector.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,238 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.Remoting -{ - using System; - using System.Runtime.Remoting; - - using Castle.Model; - - using Castle.MicroKernel; - using Castle.MicroKernel.ModelBuilder; - using Castle.MicroKernel.Facilities; - using Castle.MicroKernel.SubSystems.Conversion; - - enum RemotingStrategy - { - None, - Singleton, - SingleCall, - ClientActivated, - Component - } - - public class RemotingInspector : IContributeComponentModelConstruction - { - private readonly RemotingRegistry remoteRegistry; - private readonly RemotingRegistry localRegistry; - private readonly ITypeConverter converter; - private readonly bool isServer; - private readonly bool isClient; - private readonly String baseUri; - - public RemotingInspector(ITypeConverter converter, bool isServer, bool isClient, - String baseUri, RemotingRegistry remoteRegistry, RemotingRegistry localRegistry) - { - this.converter = converter; - this.isServer = isServer; - this.isClient = isClient; - this.baseUri = baseUri; - this.remoteRegistry = remoteRegistry; - this.localRegistry = localRegistry; - } - - public void ProcessModel(IKernel kernel, ComponentModel model) - { - if (model.Configuration == null) return; - - String remoteserverAttValue = model.Configuration.Attributes["remoteserver"]; - String remoteclientAttValue = model.Configuration.Attributes["remoteclient"]; - // String sponsorIdAttValue = model.Configuration.Attributes["sponsorId"]; - - RemotingStrategy server = RemotingStrategy.None; - RemotingStrategy client = RemotingStrategy.None; - - if (remoteserverAttValue == null && remoteclientAttValue == null) - { - return; - } - - if (remoteserverAttValue != null) - { - server = (RemotingStrategy) - converter.PerformConversion( remoteserverAttValue, typeof(RemotingStrategy) ); - } - - if (remoteclientAttValue != null) - { - client = (RemotingStrategy) - converter.PerformConversion( remoteclientAttValue, typeof(RemotingStrategy) ); - } - - DoSemanticCheck(server, model, client); - - ConfigureServerComponent(server, model.Implementation, model); - - ConfigureClientComponent(client, model.Service, model); - } - - private void ConfigureServerComponent(RemotingStrategy server, Type type, ComponentModel model) - { - if (server == RemotingStrategy.None) return; - - String uri = ConstructServerURI(server, model.Name, model); - - if (server == RemotingStrategy.Singleton) - { - CheckURIIsNotNull(uri, model.Name); - - RemotingConfiguration.RegisterWellKnownServiceType(type, uri, WellKnownObjectMode.Singleton); - } - else if (server == RemotingStrategy.SingleCall) - { - CheckURIIsNotNull(uri, model.Name); - - RemotingConfiguration.RegisterWellKnownServiceType(type, uri, WellKnownObjectMode.SingleCall); - } - else if (server == RemotingStrategy.ClientActivated) - { - RemotingConfiguration.RegisterActivatedServiceType(type); - } - else if (server == RemotingStrategy.Component) - { - localRegistry.AddComponentEntry( model ); - } - } - - private void ConfigureClientComponent(RemotingStrategy client, Type type, ComponentModel model) - { - if (client == RemotingStrategy.None) return; - - String uri = ConstructClientURI(client, model.Name, model); - - if (client == RemotingStrategy.Singleton || client == RemotingStrategy.SingleCall) - { - RemotingConfiguration.RegisterWellKnownClientType(type, uri); - - model.ExtendedProperties.Add("remoting.uri", uri); - model.CustomComponentActivator = typeof(RemoteActivator); - } - else if (client == RemotingStrategy.ClientActivated) - { - CheckHasBaseURI(); - - RemotingConfiguration.RegisterActivatedClientType(type, baseUri); - - model.ExtendedProperties.Add("remoting.appuri", baseUri); - model.CustomComponentActivator = typeof(RemoteClientActivatedActivator); - } - else if (client == RemotingStrategy.Component) - { - model.ExtendedProperties.Add("remoting.remoteregistry", remoteRegistry); - model.CustomComponentActivator = typeof(RemoteActivatorThroughRegistry); - } - } - - private void DoSemanticCheck(RemotingStrategy server, ComponentModel model, RemotingStrategy client) - { - if (server != RemotingStrategy.None && client != RemotingStrategy.None) - { - String message = String.Format("Component {0} cannot be a remote server and a client "+ - "at the same time", model.Name); - - throw new FacilityException(message); - } - - if (server == RemotingStrategy.Component && !isServer) - { - String message = String.Format("Component {0} was marked with remoteserver='component', " + - "but you must enable the remoting facility with isServer='true' to serve components this way", model.Name); - - throw new FacilityException(message); - } - - if (client == RemotingStrategy.Component && !isClient) - { - String message = String.Format("Component {0} was marked with remoteserver='component', " + - "but you must enable the remoting facility with isServer='true' to serve components this way", model.Name); - - throw new FacilityException(message); - } - } - - private String ConstructClientURI(RemotingStrategy client, String componentId, ComponentModel model) - { - if (client == RemotingStrategy.ClientActivated) return null; - - String value = model.Configuration.Attributes["uri"]; - - String uriText = null; - - if (client != RemotingStrategy.None && baseUri != null && value == null) - { - if (baseUri.EndsWith("/")) - uriText = String.Format("{0}{1}", baseUri, componentId); - else - uriText = String.Format("{0}/{1}", baseUri, componentId); - } - else - { - uriText = value; - } - - return uriText; - } - - private String ConstructServerURI(RemotingStrategy server, String componentId, ComponentModel model) - { - if (server == RemotingStrategy.ClientActivated) return null; - - String value = model.Configuration.Attributes["uri"]; - - String uriText = null; - - if (value == null) - { - value = componentId; - } - else - { - uriText = value; - } - - return uriText; - } - - private void CheckHasBaseURI() - { - if (baseUri == null) - { - String message = "baseUri must be defined in order to use client activated objects"; - throw new FacilityException(message); - } - } - - private void CheckURIIsNotNull(String uri, String componentId) - { - if (uri == null) - { - String message = String.Format("Could not obtain (or infer) " + - "URI for remote component {0}", componentId); - - throw new FacilityException(message); - } - } - } -} \ No newline at end of file File [removed]: RemotingRegistry.cs Delta lines: +0 -67 =================================================================== --- trunk/Facilities/Remoting/Castle.Facilities.Remoting/RemotingRegistry.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Remoting/Castle.Facilities.Remoting/RemotingRegistry.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,67 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.Remoting -{ - using System; - using System.Collections; - - using Castle.Model; - - using Castle.MicroKernel; - - - public class RemotingRegistry : MarshalByRefObject, IDisposable - { - private readonly IKernel kernel; - private readonly IDictionary entries = Hashtable.Synchronized( new Hashtable() ); - - public RemotingRegistry(IKernel kernel) - { - this.kernel = kernel; - } - - public override object InitializeLifetimeService() - { - return null; - } - - public void AddComponentEntry(ComponentModel model) - { - entries[model.Name] = model; - } - - public object CreateRemoteInstance(String key) - { - ComponentModel model = (ComponentModel) entries[key]; - - if (model == null) - { - throw new KernelException(String.Format("No remote/available " + - "component found for key {0}", key)); - } - - return kernel[key]; - } - - #region IDisposable Members - - public void Dispose() - { - entries.Clear(); - } - - #endregion - } -} Directory: /trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/ ========================================================================= File [removed]: AssemblyInfo.cs Delta lines: +0 -24 =================================================================== --- trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/AssemblyInfo.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/AssemblyInfo.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,24 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -[assembly: AssemblyTitle("")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: AssemblyVersion("1.0.0.0")] - -#if STRONG -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("../../CastleKey.snk")] -[assembly: AssemblyKeyName("")] -#endif File [removed]: Castle.Facilities.Startable.Tests.csproj Delta lines: +0 -126 =================================================================== --- trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/Castle.Facilities.Startable.Tests.csproj 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/Castle.Facilities.Startable.Tests.csproj 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,126 +0,0 @@ -<VisualStudioProject> - <CSHARP - ProjectType = "Local" - ProductVersion = "7.10.3077" - SchemaVersion = "2.0" - ProjectGuid = "{EC041291-4687-47DA-975D-E5A541BF6432}" - > - <Build> - <Settings - ApplicationIcon = "" - AssemblyKeyContainerName = "" - AssemblyName = "Castle.Facilities.Startable.Tests" - AssemblyOriginatorKeyFile = "" - DefaultClientScript = "JScript" - DefaultHTMLPageLayout = "Grid" - DefaultTargetSchema = "IE50" - DelaySign = "false" - OutputType = "Library" - PreBuildEvent = "" - PostBuildEvent = "" - RootNamespace = "Castle.Facilities.Startable.Tests" - RunPostBuildEvent = "OnBuildSuccess" - StartupObject = "" - > - <Config - Name = "Debug" - AllowUnsafeBlocks = "false" - BaseAddress = "285212672" - CheckForOverflowUnderflow = "false" - ConfigurationOverrideFile = "" - DefineConstants = "DEBUG;TRACE" - DocumentationFile = "" - DebugSymbols = "true" - FileAlignment = "4096" - IncrementalBuild = "false" - NoStdLib = "false" - NoWarn = "" - Optimize = "false" - OutputPath = "..\bin\" - RegisterForComInterop = "false" - RemoveIntegerChecks = "false" - TreatWarningsAsErrors = "false" - WarningLevel = "4" - /> - <Config - Name = "Release" - AllowUnsafeBlocks = "false" - BaseAddress = "285212672" - CheckForOverflowUnderflow = "false" - ConfigurationOverrideFile = "" - DefineConstants = "TRACE" - DocumentationFile = "" - DebugSymbols = "false" - FileAlignment = "4096" - IncrementalBuild = "false" - NoStdLib = "false" - NoWarn = "" - Optimize = "true" - OutputPath = "bin\Release\" - RegisterForComInterop = "false" - RemoveIntegerChecks = "false" - TreatWarningsAsErrors = "false" - WarningLevel = "4" - /> - </Settings> - <References> - <Reference - Name = "System" - AssemblyName = "System" - HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" - /> - <Reference - Name = "System.Data" - AssemblyName = "System.Data" - HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" - /> - <Reference - Name = "System.XML" - AssemblyName = "System.Xml" - HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" - /> - <Reference - Name = "Castle.Model" - AssemblyName = "Castle.Model" - HintPath = "..\..\..\InversionOfControl\bin\Castle.Model.dll" - /> - <Reference - Name = "Castle.MicroKernel" - AssemblyName = "Castle.MicroKernel" - HintPath = "..\..\..\InversionOfControl\bin\Castle.MicroKernel.dll" - /> - <Reference - Name = "Castle.Facilities.Startable" - Project = "{FB937092-633B-49A1-BC1E-37B8D5EEFBB0}" - Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" - /> - <Reference - Name = "nunit.framework" - AssemblyName = "nunit.framework" - HintPath = "C:\devtools\nunit22\bin\nunit.framework.dll" - AssemblyFolderKey = "hklm\dn\nunit.framework" - /> - </References> - </Build> - <Files> - <Include> - <File - RelPath = "AssemblyInfo.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "StartableFacilityTestCase.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Componets\StartableComponent.cs" - SubType = "Code" - BuildAction = "Compile" - /> - </Include> - </Files> - </CSHARP> -</VisualStudioProject> - File [removed]: StartableFacilityTestCase.cs Delta lines: +0 -48 =================================================================== --- trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/StartableFacilityTestCase.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Startable/Castle.Facilities.Startable.Tests/StartableFacilityTestCase.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,48 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.Startable.Tests -{ - using System; - - using NUnit.Framework; - - using Castle.MicroKernel; - - using Castle.Facilities.Startable.Tests.Componets; - - - [TestFixture] - public class StartableFacilityTestCase - { - [Test] - public void SimpleCase() - { - IKernel kernel = new DefaultKernel(); - - kernel.AddFacility( "startable", new StartableFacility() ); - - kernel.AddComponent( "a", typeof(StartableComponent) ); - - StartableComponent component = kernel["a"] as StartableComponent; - - Assert.IsNotNull(component); - Assert.IsTrue( component.Started ); - Assert.IsFalse( component.Stopped ); - - kernel.ReleaseComponent(component); - Assert.IsTrue( component.Stopped ); - } - } -} Directory: /trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/ ========================================================================= File [removed]: Empty.cs Delta lines: +0 -23 =================================================================== --- trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/Empty.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/Empty.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,23 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.TypedFactory -{ - using System; - - public class Empty - { - - } -} File [removed]: FactoryEntry.cs Delta lines: +0 -59 =================================================================== --- trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/FactoryEntry.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/FactoryEntry.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,59 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.TypedFactory -{ - using System; - - public class FactoryEntry - { - private String _id; - private Type _factoryInterface; - private String _creationMethod; - private String _destructionMethod; - - public FactoryEntry(String id, Type factoryInterface, String creationMethod, String destructionMethod) - { - if (id == null || id.Length == 0) throw new ArgumentNullException("id"); - if (factoryInterface == null) throw new ArgumentNullException("factoryInterface"); - if (!factoryInterface.IsInterface) throw new ArgumentException("factoryInterface must be an interface"); - if (creationMethod == null || creationMethod.Length == 0) throw new ArgumentNullException("creationMethod"); - - _id = id; - _factoryInterface = factoryInterface; - _creationMethod = creationMethod; - _destructionMethod = destructionMethod; - } - - public String Id - { - get { return _id; } - } - - public Type FactoryInterface - { - get { return _factoryInterface; } - } - - public String CreationMethod - { - get { return _creationMethod; } - } - - public String DestructionMethod - { - get { return _destructionMethod; } - } - } -} File [removed]: FactoryInterceptor.cs Delta lines: +0 -71 =================================================================== --- trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/FactoryInterceptor.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/FactoryInterceptor.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,71 +0,0 @@ -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.TypedFactory -{ - using System; - - using Castle.Model; - using Castle.Model.Interceptor; - - using Castle.MicroKernel; - - /// <summary> - /// Summary description for FactoryInterceptor. - /// </summary> - [Transient] - public class FactoryInterceptor : IMethodInterceptor, IOnBehalfAware - { - private FactoryEntry _entry; - private IKernel _kernel; - - public FactoryInterceptor(IKernel kernel) - { - _kernel = kernel; - } - - public void SetInterceptedComponentModel(ComponentModel target) - { - _entry = (FactoryEntry) target.ExtendedProperties["typed.fac.entry"]; - } - - public object Intercept(IMethodInvocation invocation, params object[] args) - { - String name = invocation.Method.Name; - - if (name.Equals(_entry.CreationMethod)) - { - if (args.Length == 0 || args[0] == null) - { - return _kernel[ invocation.Method.ReturnType ]; - } - else - { - return _kernel[ (String) args[0] ]; - } - } - else if (name.Equals(_entry.DestructionMethod)) - { - if (args.Length == 1) - { - _kernel.ReleaseComponent( args[0] ); - - return null; - } - } - - return invocation.Proceed(args); - } - } -} File [removed]: TypedFactoryFacility.cs Delta lines: +0 -80 =================================================================== --- trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/TypedFactoryFacility.cs 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/TypedFactory/Castle.Facilities.TypedFactory/TypedFactoryFacility.cs 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,80 +0,0 @@ - -// Copyright 2004-2005 Castle Project - http://www.castleproject.org/ -// -// 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. - -namespace Castle.Facilities.TypedFactory -{ - using System; - using System.Configuration; - - using Castle.Model; - using Castle.Model.Configuration; - - using Castle.MicroKernel; - using Castle.MicroKernel.Facilities; - using Castle.MicroKernel.SubSystems.Conversion; - - /// <summary> - /// Summary description for TypedFactoryFacility. - /// </summary> - public class TypedFactoryFacility : AbstractFacility - { - public void AddTypedFactoryEntry( FactoryEntry entry ) - { - ComponentModel model = - new ComponentModel(entry.Id, entry.FactoryInterface, typeof(Empty)); - - model.LifestyleType = LifestyleType.Singleton; - model.ExtendedProperties["typed.fac.entry"] = entry; - model.Interceptors.Add( new InterceptorReference( typeof(FactoryInterceptor) ) ); - - Kernel.AddCustomComponent( model ); - } - - protected override void Init() - { - Kernel.AddComponent( "typed.fac.interceptor", typeof(FactoryInterceptor) ); - - ITypeConverter converter = (ITypeConverter) - Kernel.GetSubSystem( SubSystemConstants.ConversionManagerKey ); - - AddFactories(FacilityConfig, converter); - } - - protected virtual void AddFactories(IConfiguration facilityConfig, ITypeConverter converter) - { - if (facilityConfig != null) - { - foreach(IConfiguration config in facilityConfig.Children["factories"].Children) - { - String id = config.Attributes["id"]; - String creation = config.Attributes["creation"]; - String destruction = config.Attributes["destruction"]; - Type factoryType = (Type) - converter.PerformConversion( config.Attributes["interface"], typeof(Type) ); - - try - { - AddTypedFactoryEntry( - new FactoryEntry(id, factoryType, creation, destruction) ); - } - catch(Exception ex) - { - throw new ConfigurationException("Invalid factory entry in configuration", ex); - } - } - } - } - } -} Directory: /trunk/Facilities/Startable/ ======================================= File [removed]: Changes.txt Delta lines: +0 -5 =================================================================== --- trunk/Facilities/Startable/Changes.txt 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Startable/Changes.txt 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,5 +0,0 @@ - -Alpha Version 1.0.0 -- First release - -Future modifications - after the first release - shall be tracked in this file \ No newline at end of file File [removed]: License.txt Delta lines: +0 -13 =================================================================== --- trunk/Facilities/Startable/License.txt 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Startable/License.txt 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,13 +0,0 @@ -Copyright 2004-2005 Castle Project - http://www.castleproject.org/ - -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. File [removed]: default.build Delta lines: +0 -151 =================================================================== --- trunk/Facilities/Startable/default.build 2005-10-30 15:52:41 UTC (rev 1260) +++ trunk/Facilities/Startable/default.build 2005-10-30 15:54:11 UTC (rev 1261) @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding='iso-8859-1' ?> -<project name="startable-facility" default="build"> - - <!-- This build file inherits common properties from the ../facilities.build --> - - <property name="base.dir" value="." /> - <property name="bin.dir" value="${base.dir}/bin" /> - <property name="library.dir" value="${base.dir}/lib" /> - <property name="doc.dir" value="${base.dir}/docs" /> - <property name="src.dir" value="${base.dir}/Castle.Facilities.Startable" /> - - <property name="test.src.dir" value="${base.dir}/Castle.Facilities.Startable.Tests" /> - <property name="name" value="Castle.Facilities.Startable" /> - <property name="assembly.name" value="${name}.dll" /> - <property name="test.assembly.name" value="${name}.Tests.dll" /> - - <property name="version" value="beta-2" /> - - <target name="clean"> - <delete failonerror="false"> - <fileset basedir="${bin.dir}"> - <include name="*.dll" /> - </fileset> - </delete> - </target> - - <target name="init" depends="clean"> - <copy file="${container.bin.dir}/Castle.MicroKernel.dll" todir="${bin.dir}" /> - <copy file="${container.bin.dir}/Castle.Model.dll" todir="${bin.dir}" /> - </target> - - <target name="build" depends="init,tests.run" /> - - <target name="compile" depends="init"> - <csc - define="${strong}" - target="library" - debug="${debug}" - optimize="${optimize}" - output="${bin.dir}/${assembly.name}" - doc="${bin.dir}/${name}.xml"> - - <nowarn> - <warning number="1591" /> - <warning number="1572" /> - </nowarn> - - <sources basedir="${src.dir}" defaultexcludes="true"> - <include name="**/*.cs" /> - </sources> - - <references> - <include name="${bin.dir}/*.dll" /> - </references> - </csc> - </target> - - <target name="tests.compile" depends="compile"> - <csc - target="library" - debug="${debug}" - output="${bin.dir}/${test.assembly.name}"> - - <sources basedir="${test.src.dir}" defaultexcludes="true"> - <include name="**/*.cs" /> - </sources> - - <references> - <include name="${nunit.framework.dll}" /> - <include name="${bin.dir}/*.dll" /> - </references> - </csc> - </target> - - <target name="tests.run" depends="tests.compile"> - <nunit2 > - <formatter type="${nunit.formatter}" /> - <test assemblyname="${bin.dir}/${test.assembly.name}" /> - </nunit2> - </target> - - <target name="docs"> - <ndoc failonerror="true"> - <assemblies basedir="${bin.dir}"> - <include name="${assembly.name}" /> - </assemblies> - <documenters> - <documenter name="MSDN"> - <property name="OutputTarget" value="HTMLHelp" /> - <property name="Preliminary" value="true" /> - <property name="CleanIntermediates" value="true" /> - <property name="SdkLinksOnWeb" value="true" /> - <property name="AutoPropertyBackerSummaries" value="true" /> - <property name="AutoDocumentConstructors" value="true" /> - <property name="OutputDirectory" value="${doc.dir}" /> - <property name="HtmlHelpName" value="${name}" /> - <property name="IncludeFavorites" value="False" /> - <property name="Title" value="Facility - ${name}" /> - <property name="SplitTOCs" value="False" /> - <property name="DefaulTOC" value="Windsor" /> - <property name="ShowVisualBasic" value="True" /> - <property name="ShowMissingSummaries" value="False" /> - <property name="ShowMissingRemarks" value="False" /> - <property name="ShowMissingParams" value="False" /> - <property name="ShowMissingReturns" value="False" /> - <property name="ShowMissingValues" value="False" /> - <property name="DocumentInternals" value="False" /> - <property name="DocumentProtected" value="True" /> - <property name="DocumentPrivates" value="False" /> - <property name="DocumentEmptyNamespaces" value="False" /> - <property name="IncludeAssemblyVersion" value="True" /> - <property name="CopyrightText" value="Copyright 2004,2005 - Castle Project (original author or authors)" /> - <property name="CopyrightHref" value="http://www.castleproject.org" /> - </documenter> - </documenters> - </ndoc> - </target> - - <target name="dist" depends="docs"> - <zip zipfile="${name}.src.zip"> - <fileset basedir="${base.dir}"> - <include name="License.txt" /> - <include name="Readme.txt" /> - <include name="Changes.txt" /> - <include name="*.build" /> - <include name="*.sln" /> - <include name="${src.dir}/**/*.*" /> - <include name="${test.src.dir}/**/*.*" /> - <include name="${library.dir}/**/*.*" /> - - <exclude name="**/Debug/*" /> - <exclude name="**/obj/*" /> - <exclude name="**/*.user" /> - <exclude name="**/*.suo" /> - </fileset> - </zip> - <zip zipfile="${name}.${version}.zip"> - <fileset basedir="${base.dir}"> - <include name="${bin.dir}/${assembly.name}" /> - <include name="${library.dir}/**/*.*" /> - <include name="License.txt" /> - <include name="Readme.txt" /> - <include name="Changes.txt" /> - <include name="${name}.src.zip" /> - <include name="${doc.dir}/${name}.chm" /> - </fileset> - </zip> - <delete file="${name}.src.zip" /> - </target> - -</project> |
|
From: <sv...@ca...> - 2005-10-30 15:57:22
|
User: hammett
Date: 2005/10/30 10:52 AM
Added:
/trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/
/trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/
EventWiringTestCase.cs, config.xml
/trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/
Handlers.cs, MultiListener.cs, MultiPublisher.cs, PublisherListener.cs, SimpleListener.cs, SimplePublisher.cs
Modified:
/trunk/InversionOfControl/Castle.Windsor.Tests/
Castle.Windsor.Tests.csproj
Log:
Moved standard facilities to microkernel codebase
File Changes:
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/
==========================================================
File [modified]: Castle.Windsor.Tests.csproj
Delta lines: +39 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Castle.Windsor.Tests.csproj 2005-10-30 15:52:41 UTC (rev 1260)
@@ -311,6 +311,45 @@
BuildAction = "EmbeddedResource"
/>
<File
+ RelPath = "Facilities\EventWiring\config.xml"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\EventWiringTestCase.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\Model\Handlers.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\Model\MultiListener.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\Model\MultiPublisher.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\Model\PublisherListener.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\Model\SimpleListener.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Facilities\EventWiring\Model\SimplePublisher.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
RelPath = "Installer\InstallerTestCase.cs"
SubType = "Code"
BuildAction = "Compile"
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/
=================================================================================
File [added]: EventWiringTestCase.cs
Delta lines: +123 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/EventWiringTestCase.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/EventWiringTestCase.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,123 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests
+{
+ using NUnit.Framework;
+
+ using Castle.Windsor;
+ using Castle.Facilities.EventWiring.Tests.Model;
+
+ [TestFixture]
+ public class EventWiringTestCase
+ {
+ private WindsorContainer _container;
+
+ public EventWiringTestCase()
+ {
+ }
+
+ [SetUp]
+ public void Init()
+ {
+ _container = new WindsorContainer("../Castle.Windsor.Tests/Facilities/EventWiring/config.xml");
+
+ _container.AddFacility("eventwiring", new EventWiringFacility());
+
+ _container.AddComponent("SimpleListener", typeof(SimpleListener));
+ _container.AddComponent("SimpleListener2", typeof(SimpleListener));
+ _container.AddComponent("SimplePublisher", typeof(SimplePublisher));
+ _container.AddComponent("MultiPublisher", typeof(MultiPublisher));
+ _container.AddComponent("MultiListener", typeof(MultiListener));
+ _container.AddComponent("PublisherListener", typeof(PublisherListener), typeof(PublisherListener));
+ _container.AddComponent("BadConfig", typeof(SimpleListener));
+ }
+
+ [Test]
+ public void TriggerSimple()
+ {
+ SimplePublisher publisher = (SimplePublisher)_container["SimplePublisher"];
+ SimpleListener listener = (SimpleListener)_container["SimpleListener2"];
+
+ Assert.IsFalse(listener.Listened);
+ Assert.IsNull(listener.Sender);
+
+ publisher.StaticTrigger();
+
+ Assert.IsTrue(listener.Listened);
+ Assert.AreSame(publisher, listener.Sender);
+ }
+
+ [Test]
+ public void TriggerStaticEvent()
+ {
+ SimplePublisher publisher = (SimplePublisher)_container["SimplePublisher"];
+ SimpleListener listener = (SimpleListener)_container["SimpleListener"];
+
+ Assert.IsFalse(listener.Listened);
+ Assert.IsNull(listener.Sender);
+
+ publisher.Trigger();
+
+ Assert.IsTrue(listener.Listened);
+ Assert.AreSame(publisher, listener.Sender);
+ }
+
+ [Test, ExpectedException(typeof(EventWiringException))]
+ public void EventNotFound()
+ {
+ object badConfigured = _container["BadConfig"];
+ }
+
+ [Test]
+ public void MultiEvents()
+ {
+ MultiListener listener = (MultiListener)_container["MultiListener"];
+ MultiPublisher publisher = (MultiPublisher)_container["MultiPublisher"];
+ PublisherListener publisherThatListens = (PublisherListener)_container["PublisherListener"];
+ SimplePublisher anotherPublisher = (SimplePublisher)_container["SimplePublisher"];
+
+ Assert.IsFalse(listener.Listened);
+ Assert.IsNull(listener.Sender);
+
+ publisher.Trigger1();
+
+ Assert.IsTrue(listener.Listened);
+ Assert.AreSame(publisher, listener.Sender);
+
+ listener.Reset();
+
+ publisher.Trigger2();
+
+ Assert.IsTrue(listener.Listened);
+ Assert.AreSame(publisher, listener.Sender);
+
+ listener.Reset();
+
+ publisherThatListens.Trigger1();
+
+ Assert.IsTrue(listener.Listened);
+ Assert.AreSame(publisherThatListens, listener.Sender);
+
+
+ Assert.IsFalse(publisherThatListens.Listened);
+ Assert.IsNull(publisherThatListens.Sender);
+
+ anotherPublisher.Trigger();
+
+ Assert.IsTrue(publisherThatListens.Listened);
+ Assert.AreSame(anotherPublisher, publisherThatListens.Sender);
+ }
+ }
+}
File [added]: config.xml
Delta lines: +47 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/config.xml 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/config.xml 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+
+ <components>
+ <component id="SimpleListener">
+ <subscribes>
+ <subscribe-to publisher="SimplePublisher" event="Event" handler="OnPublish"/>
+ </subscribes>
+ </component>
+
+ <component id="SimpleListener2">
+ <subscribes>
+ <subscribe-to publisher="SimplePublisher" event="StaticEvent" handler="OnPublish"/>
+ </subscribes>
+ </component>
+
+ <component id="MultiListener">
+ <subscribes>
+ <subscribe-to
+ publisher="MultiPublisher"
+ handler="OnPublish"
+ event="Event1" />
+ <subscribe-to
+ publisher="MultiPublisher"
+ handler="OnPublish2"
+ event="Event2" />
+ <subscribe-to
+ publisher="PublisherListener"
+ handler="OnPublish"
+ event="Event1" />
+ </subscribes>
+ </component>
+
+ <component id="PublisherListener">
+ <subscribes>
+ <subscribe-to handler="OnPublish" publisher="SimplePublisher" event="Event" />
+ </subscribes>
+ </component>
+
+ <component id="BadConfig">
+ <subscribes>
+ <subscribe-to handler="OnPublish" publisher="SimplePublisher" event="EventIahhh" />
+ </subscribes>
+ </component>
+ </components>
+
+</configuration>
Directory: /trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/
=======================================================================================
File [added]: Handlers.cs
Delta lines: +29 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/Handlers.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/Handlers.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,29 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests.Model
+{
+ using System;
+
+ public delegate void PublishEventHandler(object sender, EventArgs e);
+
+ public delegate void PublishOneEventHandler(object sender, EventArgs e);
+
+ public delegate void PublishTwoEventHandler(object sender, CustomEventArgs e);
+
+ public class CustomEventArgs : EventArgs
+ {
+
+ }
+}
File [added]: MultiListener.cs
Delta lines: +64 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/MultiListener.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/MultiListener.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,64 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests.Model
+{
+ using System;
+ using Castle.Model;
+
+ [Transient]
+ public class MultiListener
+ {
+ private object _sender;
+ private bool _listened;
+
+ public MultiListener()
+ {
+ }
+
+ public void OnPublish(object sender, EventArgs e)
+ {
+ _listened = true;
+ _sender = sender;
+ }
+
+ public void OnPublish2(object sender, CustomEventArgs e)
+ {
+ _listened = true;
+ _sender = sender;
+ }
+
+ public void Reset()
+ {
+ _listened = false;
+ _sender = null;
+ }
+
+ public bool Listened
+ {
+ get
+ {
+ return _listened;
+ }
+ }
+
+ public object Sender
+ {
+ get
+ {
+ return _sender;
+ }
+ }
+ }
+}
File [added]: MultiPublisher.cs
Delta lines: +40 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/MultiPublisher.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/MultiPublisher.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,40 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests.Model
+{
+ using System;
+
+
+ public class MultiPublisher
+ {
+ public event PublishOneEventHandler Event1;
+
+ public event PublishTwoEventHandler Event2;
+
+ public MultiPublisher()
+ {
+ }
+
+ public void Trigger1()
+ {
+ Event1(this, new EventArgs());
+ }
+
+ public void Trigger2()
+ {
+ Event2(this, new CustomEventArgs());
+ }
+ }
+}
File [added]: PublisherListener.cs
Delta lines: +58 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/PublisherListener.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/PublisherListener.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,58 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests.Model
+{
+ using System;
+
+
+ public class PublisherListener
+ {
+ private object _sender;
+ private bool _listened;
+
+ public event PublishOneEventHandler Event1;
+
+ public PublisherListener()
+ {
+ }
+
+ public void OnPublish(object sender, EventArgs e)
+ {
+ _sender = sender;
+ _listened = true;
+ }
+
+ public void Trigger1()
+ {
+ Event1(this, new EventArgs());
+ }
+
+ public bool Listened
+ {
+ get
+ {
+ return _listened;
+ }
+ }
+
+ public object Sender
+ {
+ get
+ {
+ return _sender;
+ }
+ }
+ }
+}
File [added]: SimpleListener.cs
Delta lines: +53 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/SimpleListener.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/SimpleListener.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,53 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests.Model
+{
+ using System;
+ using Castle.Model;
+
+ [Transient]
+ public class SimpleListener
+ {
+ private bool _listened;
+ private object _sender;
+
+ public SimpleListener()
+ {
+ }
+
+ public void OnPublish(object sender, EventArgs e)
+ {
+ _sender = sender;
+
+ _listened = sender != null;
+ }
+
+ public bool Listened
+ {
+ get
+ {
+ return _listened;
+ }
+ }
+
+ public object Sender
+ {
+ get
+ {
+ return _sender;
+ }
+ }
+ }
+}
File [added]: SimplePublisher.cs
Delta lines: +46 -0
===================================================================
--- trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/SimplePublisher.cs 2005-10-30 15:51:15 UTC (rev 1259)
+++ trunk/InversionOfControl/Castle.Windsor.Tests/Facilities/EventWiring/Model/SimplePublisher.cs 2005-10-30 15:52:41 UTC (rev 1260)
@@ -0,0 +1,46 @@
+// Copyright 2004-2005 Castle Project - http://www.castleproject.org/
+//
+// 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.
+
+namespace Castle.Facilities.EventWiring.Tests.Model
+{
+ using System;
+
+
+ public class SimplePublisher
+ {
+ public event PublishEventHandler Event;
+
+ public static event PublishEventHandler StaticEvent;
+
+ public SimplePublisher()
+ {
+ }
+
+ public void Trigger()
+ {
+ if (Event != null)
+ {
+ Event(this, new EventArgs());
+ }
+ }
+
+ public void StaticTrigger()
+ {
+ if (StaticEvent != null)
+ {
+ StaticEvent(this, new EventArgs());
+ }
+ }
+ }
+}
|
2 messages has been excluded from this view by a project administrator.