From 1f3fdfecb9a97e9badf6c50431b3519b05910bac Mon Sep 17 00:00:00 2001 From: sbohlen Date: Mon, 28 Mar 2011 20:59:54 +0000 Subject: [PATCH] SPRNET-1425 -changed version info to reflect 1.3.2 --- readme.txt | 20 +- src/Spring/CommonAssemblyInfo.cs | 14 +- .../Aop/Framework/AbstractMethodInvocation.cs | 30 +- .../AdvisorAdapterRegistrationManager.cs | 2 +- .../Adapter/AfterReturningAdviceAdapter.cs | 2 +- .../AfterReturningAdviceInterceptor.cs | 2 +- .../Framework/Adapter/BeforeAdviceAdapter.cs | 2 +- .../Adapter/DefaultAdvisorAdapterRegistry.cs | 4 +- .../Adapter/GlobalAdvisorAdapterRegistry.cs | 4 +- .../Aop/Framework/Adapter/IAdvisorAdapter.cs | 2 +- .../Adapter/IAdvisorAdapterRegistry.cs | 2 +- .../Adapter/MethodBeforeAdviceInterceptor.cs | 2 +- .../Framework/Adapter/ThrowsAdviceAdapter.cs | 2 +- .../Adapter/ThrowsAdviceInterceptor.cs | 4 +- .../Adapter/UnknownAdviceTypeException.cs | 2 +- .../Aop/Framework/AdvisedSupport.cs | 324 +++++----- .../Aop/Framework/AdvisorChainFactoryUtils.cs | 2 +- .../Aop/Framework/AopConfigException.cs | 2 +- .../Spring.Aop/Aop/Framework/AopContext.cs | 40 +- .../Spring.Aop/Aop/Framework/AopUtils.cs | 28 +- .../AbstractAdvisorAutoProxyCreator.cs | 276 ++++---- .../AutoProxy/AbstractAutoProxyCreator.cs | 28 +- .../AbstractFilteringAutoProxyCreator.cs | 36 +- .../AutoProxy/AttributeAutoProxyCreator.cs | 6 +- .../DefaultAdvisorAutoProxyCreator.cs | 131 ++-- .../AutoProxy/ITargetSourceCreator.cs | 2 +- .../InheritanceBasedAopConfigurer.cs | 2 +- .../AutoProxy/ObjectNameAutoProxyCreator.cs | 28 +- .../PointcutFilteringAutoProxyCreator.cs | 2 +- .../AbstractPrototypeTargetSourceCreator.cs | 2 +- .../AutoProxy/TypeNameAutoProxyCreator.cs | 2 +- .../Aop/Framework/DynamicMethodInvocation.cs | 48 +- .../AbstractAopProxyMethodBuilder.cs | 2 +- .../AbstractAopProxyTypeBuilder.cs | 2 +- .../Framework/DynamicProxy/AdvisedProxy.cs | 2 +- .../DynamicProxy/BaseAopProxyMethodBuilder.cs | 2 +- .../DynamicProxy/BaseCompositionAopProxy.cs | 2 +- .../DynamicProxy/CachedAopProxyFactory.cs | 2 +- .../CompositionAopProxyTypeBuilder.cs | 2 +- .../DecoratorAopProxyTypeBuilder.cs | 2 +- .../DynamicProxy/DefaultAopProxyFactory.cs | 28 +- .../IAdvisedProxyMethodBuilder.cs | 2 +- .../DynamicProxy/IAopProxyTypeGenerator.cs | 2 +- .../InheritanceAopProxyTypeBuilder.cs | 2 +- .../IntroductionProxyMethodBuilder.cs | 2 +- .../TargetAopProxyMethodBuilder.cs | 40 +- .../HashtableCachingAdvisorChainFactory.cs | 4 +- .../Spring.Aop/Aop/Framework/IAdvised.cs | 2 +- .../Aop/Framework/IAdvisedSupportListener.cs | 2 +- .../Aop/Framework/IAdvisorChainFactory.cs | 2 +- .../Spring.Aop/Aop/Framework/IAopProxy.cs | 2 +- .../Aop/Framework/IAopProxyFactory.cs | 2 +- .../Spring.Aop/Aop/Framework/ITargetAware.cs | 2 +- .../InterceptorAndDynamicMethodMatcher.cs | 2 +- .../Spring.Aop/Aop/Framework/ProxyConfig.cs | 16 +- .../Spring.Aop/Aop/Framework/ProxyFactory.cs | 60 +- .../Aop/Framework/ProxyFactoryObject.cs | 28 +- .../Framework/ReflectiveMethodInvocation.cs | 10 +- src/Spring/Spring.Aop/Aop/IAdvisor.cs | 2 +- src/Spring/Spring.Aop/Aop/IAdvisors.cs | 2 +- .../Spring.Aop/Aop/IAfterReturningAdvice.cs | 2 +- src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs | 2 +- .../Spring.Aop/Aop/IIntroductionAdvisor.cs | 2 +- .../Aop/IIntroductionInterceptor.cs | 2 +- .../Spring.Aop/Aop/IMethodBeforeAdvice.cs | 2 +- src/Spring/Spring.Aop/Aop/IMethodMatcher.cs | 2 +- src/Spring/Spring.Aop/Aop/IPointcut.cs | 2 +- src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs | 2 +- src/Spring/Spring.Aop/Aop/ITargetSource.cs | 2 +- src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs | 2 +- src/Spring/Spring.Aop/Aop/ITypeFilter.cs | 2 +- ...AbstractRegularExpressionMethodPointcut.cs | 2 +- .../AttributeMatchMethodPointcutAdvisor.cs | 20 +- .../Aop/Support/ComposablePointcut.cs | 2 +- .../Aop/Support/ControlFlowPointcut.cs | 2 +- .../Aop/Support/DefaultIntroductionAdvisor.cs | 78 +-- .../Aop/Support/DefaultPointcutAdvisor.cs | 42 +- .../Aop/Support/DynamicMethodMatcher.cs | 6 +- .../DynamicMethodMatcherPointcutAdvisor.cs | 2 +- .../Spring.Aop/Aop/Support/MethodMatchers.cs | 2 +- .../Aop/Support/NameMatchMethodPointcut.cs | 2 +- .../Support/NameMatchMethodPointcutAdvisor.cs | 2 +- .../Spring.Aop/Aop/Support/Pointcuts.cs | 2 +- .../RegularExpressionMethodPointcutAdvisor.cs | 2 +- .../Spring.Aop/Aop/Support/RootTypeFilter.cs | 2 +- .../Aop/Support/StaticMethodMatcher.cs | 38 +- .../Support/StaticMethodMatcherPointcut.cs | 2 +- .../StaticMethodMatcherPointcutAdvisor.cs | 2 +- .../Spring.Aop/Aop/Support/TypeFilters.cs | 2 +- .../Aop/Support/TypeNameTypeFilter.cs | 26 +- .../Spring.Aop/Aop/Support/UnionPointcut.cs | 4 +- .../Aop/Target/AbstractPoolingTargetSource.cs | 2 +- .../Target/AbstractPrototypeTargetSource.cs | 2 +- .../Aop/Target/EmptyTargetSource.cs | 2 +- .../Aop/Target/HotSwappableTargetSource.cs | 14 +- .../Target/IThreadLocalTargetSourceStats.cs | 2 +- .../Spring.Aop/Aop/Target/PoolingConfig.cs | 2 +- .../Aop/Target/PrototypeTargetSource.cs | 2 +- .../Aop/Target/SimplePoolTargetSource.cs | 2 +- .../Aop/Target/SingletonTargetSource.cs | 8 +- .../Aop/Target/ThreadLocalTargetSource.cs | 2 +- .../Spring.Aop/Aop/TrueMethodMatcher.cs | 2 +- src/Spring/Spring.Aop/Aop/TruePointcut.cs | 2 +- src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs | 2 +- .../Aspects/Cache/BaseCacheAdvice.cs | 2 +- .../Spring.Aop/Aspects/Cache/CacheAspect.cs | 2 +- .../Aspects/Cache/CacheParameterAdvice.cs | 142 ++-- .../Aspects/Cache/CacheParameterAdvisor.cs | 2 +- .../Aspects/Cache/CacheResultAdvice.cs | 2 +- .../Aspects/Cache/CacheResultAdvisor.cs | 2 +- .../Aspects/Cache/InvalidateCacheAdvice.cs | 84 +-- .../Aspects/Cache/InvalidateCacheAdvisor.cs | 2 +- .../Validation/ParameterValidationAdvisor.cs | 2 +- src/Spring/Spring.Core/AssemblyInfo.cs | 72 +-- .../Spring.Core/Collections/AbstractQueue.cs | 2 +- .../Spring.Core/Collections/DictionarySet.cs | 4 +- .../Collections/Generic/DictionarySet.cs | 2 +- .../Collections/Generic/HashedSet.cs | 2 +- .../Spring.Core/Collections/Generic/ISet.cs | 28 +- .../Collections/Generic/ImmutableSet.cs | 2 +- .../Collections/Generic/OrderedSet.cs | 28 +- .../Spring.Core/Collections/Generic/Set.cs | 2 +- .../Collections/Generic/SortedSet.cs | 2 +- .../Collections/Generic/SynchronizedSet.cs | 2 +- .../Spring.Core/Collections/HashedSet.cs | 4 +- .../Spring.Core/Collections/HybridSet.cs | 22 +- src/Spring/Spring.Core/Collections/IQueue.cs | 2 +- src/Spring/Spring.Core/Collections/ISet.cs | 4 +- .../Spring.Core/Collections/ImmutableSet.cs | 4 +- .../Spring.Core/Collections/LinkedList.cs | 2 +- src/Spring/Spring.Core/Collections/ListSet.cs | 4 +- .../Collections/NoElementsException.cs | 2 +- .../Spring.Core/Collections/PriorityQueue.cs | 2 +- src/Spring/Spring.Core/Collections/Set.cs | 4 +- .../Spring.Core/Collections/SortedSet.cs | 4 +- .../Collections/SynchronizedSet.cs | 4 +- .../Context/ApplicationContextException.cs | 2 +- .../Context/ApplicationEventArgs.cs | 2 +- .../Context/EventListenerAttribute.cs | 2 +- .../Context/Events/ConsoleListener.cs | 2 +- .../Context/Events/ContextEventArgs.cs | 46 +- .../Context/IApplicationContext.cs | 2 +- .../Context/IApplicationContextAware.cs | 2 +- .../Context/IApplicationEventListener.cs | 2 +- .../Context/IApplicationEventPublisher.cs | 2 +- .../IConfigurableApplicationContext.cs | 2 +- .../Context/IHierarchicalMessageSource.cs | 2 +- src/Spring/Spring.Core/Context/ILifecycle.cs | 2 +- .../Spring.Core/Context/IMessageSource.cs | 2 +- .../Context/IMessageSourceAware.cs | 2 +- .../Context/IMessageSourceResolvable.cs | 2 +- .../Context/IResourceLoaderAware.cs | 2 +- .../Context/NoSuchMessageException.cs | 2 +- .../Support/AbstractApplicationContext.cs | 2 +- .../Support/AbstractXmlApplicationContext.cs | 2 +- .../AbstractXmlApplicationContextArgs.cs | 2 +- .../ApplicationContextAwareProcessor.cs | 2 +- .../Support/ApplicationObjectSupport.cs | 2 +- .../Context/Support/ContextRegistry.cs | 2 +- .../Support/DefaultMessageSourceResolvable.cs | 2 +- .../Context/Support/DefaultSectionHandler.cs | 2 +- .../Support/DelegatingMessageSource.cs | 2 +- .../Context/Support/MessageSourceAccessor.cs | 2 +- .../Support/MessageSourceResolvableVisitor.cs | 2 +- .../Support/NamespaceParsersSectionHandler.cs | 2 +- .../Support/ResourceHandlersSectionHandler.cs | 2 +- .../Support/ResourceSetMessageSource.cs | 2 +- .../Support/StaticApplicationContext.cs | 4 +- .../Context/Support/StaticMessageSource.cs | 2 +- .../Support/TypeAliasesSectionHandler.cs | 2 +- .../Support/TypeConvertersSectionHandler.cs | 2 +- .../Context/Support/XmlApplicationContext.cs | 2 +- .../Support/XmlApplicationContextArgs.cs | 2 +- .../Core/CannotLoadObjectTypeException.cs | 2 +- .../Spring.Core/Core/ComposedCriteria.cs | 2 +- .../Spring.Core/Core/ControlFlowFactory.cs | 2 +- .../Spring.Core/Core/CriteriaMemberFilter.cs | 2 +- src/Spring/Spring.Core/Core/IControlFlow.cs | 2 +- src/Spring/Spring.Core/Core/ICriteria.cs | 2 +- src/Spring/Spring.Core/Core/IErrorCoded.cs | 2 +- .../Spring.Core/Core/IO/AbstractResource.cs | 16 +- .../Spring.Core/Core/IO/AssemblyResource.cs | 32 +- .../Core/IO/ConfigSectionResource.cs | 16 +- .../Core/IO/ConfigurableResourceLoader.cs | 2 +- .../Spring.Core/Core/IO/FileSystemResource.cs | 2 +- .../Spring.Core/Core/IO/IInputStreamSource.cs | 2 +- src/Spring/Spring.Core/Core/IO/IResource.cs | 2 +- .../Spring.Core/Core/IO/IResourceLoader.cs | 2 +- .../Core/IO/InputStreamResource.cs | 2 +- .../Spring.Core/Core/IO/ResourceConverter.cs | 2 +- .../Spring.Core/Core/IO/StringResource.cs | 2 +- src/Spring/Spring.Core/Core/IO/UrlResource.cs | 6 +- src/Spring/Spring.Core/Core/IOrdered.cs | 2 +- .../Core/InvalidPropertyException.cs | 2 +- .../Core/MethodArgumentsCriteria.cs | 26 +- .../MethodGenericArgumentsCountCriteria.cs | 4 +- .../Core/MethodInvocationException.cs | 2 +- .../Core/MethodNameMatchCriteria.cs | 2 +- .../Core/MethodParametersCountCriteria.cs | 2 +- .../Core/MethodParametersCriteria.cs | 2 +- .../Core/MethodReturnTypeCriteria.cs | 2 +- .../Core/NotReadablePropertyException.cs | 2 +- .../Core/NotWritablePropertyException.cs | 2 +- .../Core/NullValueInNestedPathException.cs | 2 +- .../Spring.Core/Core/OrderComparator.cs | 16 +- .../Core/PropertyAccessException.cs | 2 +- .../Core/PropertyChangeEventArgs.cs | 2 +- .../Core/RegularExpressionCriteria.cs | 2 +- .../RegularExpressionEventNameCriteria.cs | 2 +- .../RegularExpressionMethodNameCriteria.cs | 2 +- .../TypeConversion/CredentialConverter.cs | 2 +- .../TypeConversion/CustomNumberConverter.cs | 2 +- .../Core/TypeConversion/FileInfoConverter.cs | 2 +- .../Core/TypeConversion/NameValueConverter.cs | 2 +- .../Core/TypeConversion/RGBColorConverter.cs | 2 +- .../Core/TypeConversion/RegexConverter.cs | 2 +- .../TypeConversion/RegistryKeyConverter.cs | 2 +- .../ResourceManagerConverter.cs | 2 +- .../TypeConversion/RuntimeTypeConverter.cs | 2 +- .../Core/TypeConversion/StreamConverter.cs | 2 +- .../TypeConversion/StringArrayConverter.cs | 2 +- .../Core/TypeConversion/TimeSpanConverter.cs | 2 +- .../Core/TypeConversion/UniqueKeyConverter.cs | 2 +- .../Core/TypeConversion/UriConverter.cs | 2 +- .../Spring.Core/Core/TypeMismatchException.cs | 2 +- .../Core/TypeResolution/CachedTypeResolver.cs | 2 +- .../TypeResolution/GenericArgumentsHolder.cs | 28 +- .../TypeResolution/GenericTypeResolver.cs | 12 +- .../Core/TypeResolution/ITypeResolver.cs | 2 +- .../Core/TypeResolution/TypeAssemblyHolder.cs | 2 +- .../Core/TypeResolution/TypeRegistry.cs | 2 +- .../TypeResolution/TypeResolutionUtils.cs | 2 +- .../Core/TypeResolution/TypeResolver.cs | 2 +- .../DataBinding/BindingErrorMessage.cs | 2 +- .../DataBinding/SimpleExpressionBinding.cs | 2 +- .../Expressions/ArrayConstructorNode.cs | 6 +- .../Spring.Core/Expressions/AssignNode.cs | 4 +- .../Spring.Core/Expressions/AttributeNode.cs | 2 +- .../Spring.Core/Expressions/BaseNode.cs | 4 +- .../Spring.Core/Expressions/BinaryOperator.cs | 44 +- .../Expressions/BooleanLiteralNode.cs | 4 +- .../Expressions/ConstructorNode.cs | 4 +- .../Spring.Core/Expressions/DefaultNode.cs | 6 +- .../Spring.Core/Expressions/Expression.cs | 30 +- .../Expressions/ExpressionConverter.cs | 2 +- .../Expressions/ExpressionEvaluator.cs | 10 +- .../Expressions/ExpressionListNode.cs | 4 +- .../Spring.Core/Expressions/FunctionNode.cs | 28 +- .../Spring.Core/Expressions/HexLiteralNode.cs | 4 +- .../Spring.Core/Expressions/IExpression.cs | 2 +- .../Spring.Core/Expressions/IndexerNode.cs | 12 +- .../Spring.Core/Expressions/IntLiteralNode.cs | 4 +- .../Expressions/LambdaExpressionNode.cs | 64 +- .../Expressions/ListInitializerNode.cs | 4 +- .../Expressions/LocalFunctionNode.cs | 18 +- .../Expressions/LocalVariableNode.cs | 4 +- .../Spring.Core/Expressions/MapEntryNode.cs | 10 +- .../Expressions/MapInitializerNode.cs | 6 +- .../Spring.Core/Expressions/MethodNode.cs | 2 +- .../Expressions/NamedArgumentNode.cs | 4 +- .../Expressions/NodeWithArguments.cs | 70 +- .../Expressions/NullLiteralNode.cs | 2 +- src/Spring/Spring.Core/Expressions/OpADD.cs | 4 +- src/Spring/Spring.Core/Expressions/OpAND.cs | 2 +- .../Spring.Core/Expressions/OpBetween.cs | 4 +- .../Spring.Core/Expressions/OpDIVIDE.cs | 4 +- src/Spring/Spring.Core/Expressions/OpEqual.cs | 28 +- .../Spring.Core/Expressions/OpGreater.cs | 4 +- .../Expressions/OpGreaterOrEqual.cs | 4 +- src/Spring/Spring.Core/Expressions/OpIn.cs | 4 +- src/Spring/Spring.Core/Expressions/OpIs.cs | 4 +- src/Spring/Spring.Core/Expressions/OpLess.cs | 4 +- .../Spring.Core/Expressions/OpLessOrEqual.cs | 4 +- src/Spring/Spring.Core/Expressions/OpLike.cs | 4 +- .../Spring.Core/Expressions/OpMODULUS.cs | 4 +- .../Spring.Core/Expressions/OpMULTIPLY.cs | 4 +- .../Spring.Core/Expressions/OpMatches.cs | 4 +- src/Spring/Spring.Core/Expressions/OpNOT.cs | 40 +- .../Spring.Core/Expressions/OpNotEqual.cs | 4 +- src/Spring/Spring.Core/Expressions/OpOR.cs | 2 +- src/Spring/Spring.Core/Expressions/OpPOWER.cs | 4 +- .../Spring.Core/Expressions/OpSUBTRACT.cs | 4 +- .../Spring.Core/Expressions/OpUnaryMinus.cs | 4 +- .../Spring.Core/Expressions/OpUnaryPlus.cs | 6 +- .../Processors/AverageAggregator.cs | 2 +- .../Processors/ConversionProcessor.cs | 2 +- .../Expressions/Processors/CountAggregator.cs | 2 +- .../Processors/DistinctProcessor.cs | 2 +- .../Processors/ICollectionProcessor.cs | 2 +- .../Expressions/Processors/MaxAggregator.cs | 2 +- .../Expressions/Processors/MinAggregator.cs | 2 +- .../Processors/NonNullProcessor.cs | 2 +- .../Processors/OrderByProcessor.cs | 2 +- .../Processors/ReverseProcessor.cs | 2 +- .../Expressions/Processors/SortProcessor.cs | 2 +- .../Expressions/Processors/SumAggregator.cs | 2 +- .../Spring.Core/Expressions/ProjectionNode.cs | 6 +- .../Expressions/PropertyOrFieldNode.cs | 2 +- .../Expressions/QualifiedIdentifier.cs | 28 +- .../Expressions/RealLiteralNode.cs | 4 +- .../Spring.Core/Expressions/ReferenceNode.cs | 4 +- .../Expressions/SelectionFirstNode.cs | 6 +- .../Expressions/SelectionLastNode.cs | 4 +- .../Spring.Core/Expressions/SelectionNode.cs | 10 +- .../Expressions/StringLiteralNode.cs | 4 +- .../Expressions/SyntaxErrorException.cs | 2 +- .../Spring.Core/Expressions/TernaryNode.cs | 12 +- .../Spring.Core/Expressions/TypeNode.cs | 28 +- .../Spring.Core/Expressions/UnaryOperator.cs | 2 +- .../Spring.Core/Expressions/VariableNode.cs | 2 +- .../Formatters/FilteringFormatter.cs | 2 +- .../Formatters/HasTextFilteringFormatter.cs | 2 +- .../Globalization/ICultureResolver.cs | 2 +- .../Resolvers/DefaultCultureResolver.cs | 2 +- .../Objects/Events/IEventRegistry.cs | 38 +- .../Objects/Events/IEventRegistryAware.cs | 2 +- .../Events/Support/EventManipulationUtils.cs | 6 +- .../Objects/Events/Support/EventRegistry.cs | 94 +-- .../Factory/Attributes/RequiredAttribute.cs | 2 +- .../RequiredAttributeObjectPostProcessor.cs | 2 +- .../Factory/Config/AbstractConfigurer.cs | 2 +- .../Factory/Config/AbstractFactoryObject.cs | 2 +- .../Objects/Factory/Config/AutoWiringMode.cs | 2 +- .../Config/CommandLineArgsVariableSource.cs | 54 +- .../Config/ConfigSectionVariableSource.cs | 86 +-- .../Factory/Config/ConfigurationReader.cs | 28 +- .../Config/ConnectionStringsVariableSource.cs | 2 +- .../Config/ConstructorArgumentValues.cs | 78 +-- .../Config/CustomConverterConfigurer.cs | 2 +- .../Factory/Config/DelegateFactoryObject.cs | 2 +- .../Factory/Config/DictionaryFactoryObject.cs | 2 +- .../Factory/Config/EnvironmentVariableMode.cs | 2 +- .../Config/EnvironmentVariableSource.cs | 24 +- .../Objects/Factory/Config/EventValues.cs | 2 +- .../Factory/Config/ExpressionHolder.cs | 2 +- .../Config/FieldRetrievingFactoryObject.cs | 2 +- .../Config/IAutowireCapableObjectFactory.cs | 2 +- .../Config/IConfigurableFactoryObject.cs | 2 +- .../IConfigurableListableObjectFactory.cs | 4 +- .../Config/IConfigurableObjectFactory.cs | 4 +- .../IDestructionAwareObjectPostProcessor.cs | 2 +- .../IInstantiationAwareObjectPostProcessor.cs | 20 +- .../Factory/Config/IManagedCollection.cs | 4 +- .../Factory/Config/IObjectDefinition.cs | 2 +- .../Config/IObjectFactoryPostProcessor.cs | 2 +- .../Factory/Config/IObjectPostProcessor.cs | 2 +- .../Objects/Factory/Config/IVariableSource.cs | 14 +- ...ntiationAwareObjectPostProcessorAdapter.cs | 2 +- .../Factory/Config/ListFactoryObject.cs | 2 +- .../Factory/Config/LogFactoryObject.cs | 2 +- .../Factory/Config/ManagedDictionary.cs | 2 +- .../Objects/Factory/Config/ManagedList.cs | 2 +- .../Config/ManagedNameValueCollection.cs | 28 +- .../Objects/Factory/Config/ManagedSet.cs | 140 ++-- .../Config/MethodInvokingFactoryObject.cs | 2 +- .../Factory/Config/ObjectDefinitionHolder.cs | 2 +- .../ObjectFactoryCreatingFactoryObject.cs | 2 +- .../Config/ObjectReferenceFactoryObject.cs | 30 +- .../Config/PropertyFileVariableSource.cs | 108 ++-- .../Config/PropertyOverrideConfigurer.cs | 2 +- .../Config/PropertyPathFactoryObject.cs | 2 +- .../Config/PropertyPlaceholderConfigurer.cs | 26 +- .../Config/PropertyResourceConfigurer.cs | 2 +- .../Config/PropertyRetrievingFactoryObject.cs | 2 +- .../Factory/Config/RegistryVariableSource.cs | 24 +- .../Config/ResourceHandlerConfigurer.cs | 2 +- .../Config/ResourceManagerFactoryObject.cs | 2 +- .../Factory/Config/RuntimeObjectReference.cs | 2 +- .../Factory/Config/SetFactoryObject.cs | 2 +- .../Config/SharedStateAwareProcessor.cs | 2 +- ...rtInstantiationAwareObjectPostProcessor.cs | 2 +- .../Config/SpecialFolderVariableSource.cs | 24 +- .../Factory/Config/TypeAliasConfigurer.cs | 2 +- .../Factory/Config/TypedStringValue.cs | 50 +- .../Factory/Config/VariableAccessor.cs | 2 +- .../FactoryObjectNotInitializedException.cs | 2 +- .../Objects/Factory/IFactoryObject.cs | 2 +- .../Objects/Factory/IGenericObjectFactory.cs | 2 +- .../Factory/IHierarchicalObjectFactory.cs | 2 +- .../Objects/Factory/IInitializingObject.cs | 2 +- .../Objects/Factory/IListableObjectFactory.cs | 14 +- .../Factory/IObjectDefinitionFactory.cs | 2 +- .../Objects/Factory/IObjectFactory.cs | 2 +- .../Objects/Factory/IObjectFactoryAware.cs | 2 +- .../Objects/Factory/IObjectNameAware.cs | 2 +- .../NoSuchObjectDefinitionException.cs | 2 +- .../Factory/ObjectCreationException.cs | 2 +- .../ObjectCurrentlyInCreationException.cs | 2 +- .../Factory/ObjectDefinitionException.cs | 2 +- .../Objects/Factory/ObjectFactoryUtils.cs | 2 +- .../Factory/ObjectInitializationException.cs | 2 +- .../Factory/ObjectIsNotAFactoryException.cs | 2 +- .../ObjectNotOfRequiredTypeException.cs | 2 +- .../Parsing/FailFastProblemReporter.cs | 28 +- .../Factory/Parsing/IProblemReporter.cs | 28 +- .../Objects/Factory/Parsing/Location.cs | 28 +- .../ObjectDefinitionParsingException.cs | 28 +- .../Objects/Factory/Parsing/Problem.cs | 28 +- .../AbstractAutowireCapableObjectFactory.cs | 2 +- .../Factory/Support/AbstractMethodReplacer.cs | 2 +- .../Support/AbstractObjectDefinition.cs | 2 +- .../Support/AbstractObjectDefinitionReader.cs | 2 +- .../Factory/Support/AbstractObjectFactory.cs | 2 +- .../Objects/Factory/Support/AutowireUtils.cs | 2 +- .../Factory/Support/ChildObjectDefinition.cs | 4 +- .../Support/DefaultListableObjectFactory.cs | 2 +- .../Support/DefaultObjectDefinitionFactory.cs | 2 +- .../Support/DelegatingMethodReplacer.cs | 2 +- .../Factory/Support/DependencyCheckingMode.cs | 2 +- .../Support/IConfigurableObjectDefinition.cs | 2 +- .../Factory/Support/IInstantiationStrategy.cs | 2 +- .../Factory/Support/IMethodReplacer.cs | 2 +- .../Support/IObjectDefinitionReader.cs | 2 +- .../Support/IObjectDefinitionRegistry.cs | 10 +- .../IObjectDefinitionRegistryPostProcessor.cs | 28 +- .../Factory/Support/LookupMethodOverride.cs | 2 +- .../Factory/Support/LookupMethodReplacer.cs | 2 +- .../MethodInjectingInstantiationStrategy.cs | 2 +- .../Objects/Factory/Support/MethodOverride.cs | 2 +- .../Factory/Support/MethodOverrides.cs | 2 +- .../Support/ObjectDefinitionReaderUtils.cs | 2 +- .../ObjectDefinitionValidationException.cs | 2 +- .../Objects/Factory/Support/ObjectScope.cs | 2 +- .../PropertiesObjectDefinitionReader.cs | 2 +- .../Factory/Support/RootObjectDefinition.cs | 48 +- .../Support/SimpleInstantiationStrategy.cs | 2 +- .../Support/StaticListableObjectFactory.cs | 24 +- .../Factory/UnsatisfiedDependencyException.cs | 2 +- .../Factory/Xml/DocumentDefaultsDefinition.cs | 24 +- .../Objects/Factory/Xml/INamespaceParser.cs | 4 +- .../Xml/IObjectDefinitionDocumentReader.cs | 2 +- .../Factory/Xml/IObjectDefinitionParser.cs | 2 +- .../Factory/Xml/NamespaceParserRegistry.cs | 2 +- .../Factory/Xml/ObjectDefinitionConstants.cs | 22 +- .../Xml/ObjectDefinitionParserHelper.cs | 28 +- .../Xml/ObjectFactorySectionHandler.cs | 2 +- .../Factory/Xml/ReplacedMethodOverride.cs | 2 +- .../Objects/Factory/Xml/XmlObjectFactory.cs | 2 +- .../Objects/FatalObjectException.cs | 2 +- .../Spring.Core/Objects/IEventHandlerValue.cs | 2 +- src/Spring/Spring.Core/Objects/IMergable.cs | 28 +- .../Spring.Core/Objects/IObjectWrapper.cs | 2 +- .../Spring.Core/Objects/IPropertyValues.cs | 2 +- .../Spring.Core/Objects/ISharedStateAware.cs | 2 +- .../Objects/ISharedStateFactory.cs | 2 +- .../Objects/MutablePropertyValues.cs | 2 +- .../Spring.Core/Objects/ObjectWrapper.cs | 4 +- .../Spring.Core/Objects/ObjectsException.cs | 2 +- .../PropertyAccessExceptionsException.cs | 2 +- .../Spring.Core/Objects/PropertyValue.cs | 8 +- .../Support/AbstractEventHandlerValue.cs | 2 +- .../Support/AbstractSharedStateFactory.cs | 2 +- .../AbstractWiringEventHandlerValue.cs | 2 +- .../ArgumentConvertingMethodInvoker.cs | 2 +- .../Support/AutoWiringEventHandlerValue.cs | 2 +- .../Support/ByTypeSharedStateFactory.cs | 2 +- .../Objects/Support/ISortDefinition.cs | 2 +- .../Support/InstanceEventHandlerValue.cs | 2 +- .../Objects/Support/MethodInvoker.cs | 2 +- .../Objects/Support/MutableSortDefinition.cs | 2 +- .../Objects/Support/PropertyComparator.cs | 14 +- .../Support/StaticEventHandlerValue.cs | 2 +- src/Spring/Spring.Core/Pool/IObjectPool.cs | 2 +- .../Pool/IPoolableObjectFactory.cs | 2 +- src/Spring/Spring.Core/Pool/PoolException.cs | 2 +- .../Spring.Core/Pool/Support/SimplePool.cs | 2 +- .../Proxy/AbstractProxyMethodBuilder.cs | 2 +- .../Proxy/AbstractProxyTypeBuilder.cs | 2 +- .../Proxy/BaseProxyMethodBuilder.cs | 2 +- .../Proxy/CompositionProxyTypeBuilder.cs | 2 +- .../Spring.Core/Proxy/DynamicProxyManager.cs | 2 +- .../Spring.Core/Proxy/IProxyMethodBuilder.cs | 2 +- .../Spring.Core/Proxy/IProxyTypeBuilder.cs | 2 +- .../Spring.Core/Proxy/IProxyTypeGenerator.cs | 2 +- .../Proxy/InheritanceProxyTypeBuilder.cs | 2 +- .../Spring.Core/Proxy/ProxyIgnoreAttribute.cs | 2 +- .../Proxy/TargetProxyMethodBuilder.cs | 2 +- .../Reflection/Dynamic/BaseDynamicMember.cs | 2 +- .../Reflection/Dynamic/DynamicConstructor.cs | 30 +- .../Reflection/Dynamic/DynamicField.cs | 24 +- .../Reflection/Dynamic/DynamicIndexer.cs | 612 +++++++++--------- .../Reflection/Dynamic/DynamicMethod.cs | 44 +- .../Reflection/Dynamic/DynamicProperty.cs | 20 +- .../Dynamic/DynamicReflectionManager.cs | 2 +- src/Spring/Spring.Core/Threading/ISync.cs | 2 +- src/Spring/Spring.Core/Threading/Latch.cs | 2 +- .../Threading/LogicalThreadContext.cs | 2 +- src/Spring/Spring.Core/Threading/Semaphore.cs | 2 +- .../Spring.Core/Threading/SyncHolder.cs | 2 +- .../Spring.Core/Threading/TimeoutException.cs | 2 +- .../Spring.Core/Threading/TimeoutSync.cs | 2 +- src/Spring/Spring.Core/Threading/Utils.cs | 2 +- src/Spring/Spring.Core/Util/ArrayUtils.cs | 104 +-- src/Spring/Spring.Core/Util/AssertUtils.cs | 300 ++++----- .../Spring.Core/Util/CollectionUtils.cs | 30 +- .../Spring.Core/Util/ConfigXmlAttribute.cs | 48 +- .../Spring.Core/Util/ConfigXmlDocument.cs | 50 +- .../Spring.Core/Util/ConfigXmlElement.cs | 48 +- src/Spring/Spring.Core/Util/DelegateInfo.cs | 2 +- .../Spring.Core/Util/DynamicCodeManager.cs | 2 +- src/Spring/Spring.Core/Util/EventUtils.cs | 2 +- .../Util/FatalReflectionException.cs | 2 +- .../Util/Generic/CollectionUtils.cs | 42 +- src/Spring/Spring.Core/Util/NumberUtils.cs | 28 +- src/Spring/Spring.Core/Util/PathMatcher.cs | 2 +- .../Spring.Core/Util/PatternMatchUtils.cs | 4 +- src/Spring/Spring.Core/Util/Properties.cs | 62 +- .../Spring.Core/Util/ReflectionException.cs | 2 +- .../Spring.Core/Util/ReflectionUtils.cs | 2 +- .../Spring.Core/Util/SecurityCritical.cs | 2 +- src/Spring/Spring.Core/Util/StringUtils.cs | 28 +- .../Spring.Core/Util/TextPositionInfo.cs | 44 +- src/Spring/Spring.Core/Util/UniqueKey.cs | 2 +- .../Validation/BaseSimpleValidator.cs | 2 +- .../Spring.Core/Validation/BaseValidator.cs | 2 +- .../Validation/BaseValidatorGroup.cs | 2 +- .../Validation/IValidationAction.cs | 2 +- .../Spring.Core/Validation/IValidator.cs | 2 +- .../Validation/ValidationErrors.cs | 2 +- .../Validation/ValidationException.cs | 2 +- .../Validators/ConditionValidator.cs | 2 +- .../Validators/RegularExpressionValidator.cs | 2 +- .../Validators/RequiredValidator.cs | 2 +- .../Data/NHibernate/HibernateAdoException.cs | 6 +- .../Data/NHibernate/HibernateDelegate.cs | 2 +- ...ibernateObjectRetrievalFailureException.cs | 2 +- .../NHibernate/HibernateQueryException.cs | 22 +- .../NHibernate/HibernateSystemException.cs | 18 +- .../Data/NHibernate/HibernateTemplate.cs | 2 +- .../NHibernate/HibernateTransactionManager.cs | 22 +- .../NHibernate/ICommonHibernateOperations.cs | 44 +- .../Data/NHibernate/IHibernateCallback.cs | 2 +- .../Data/NHibernate/IHibernateOperations.cs | 2 +- .../Data/NHibernate/SessionHolder.cs | 2 +- .../ConfigSectionSessionScopeSettings.cs | 2 +- .../NHibernate/Support/HibernateDaoSupport.cs | 2 +- .../Support/OpenSessionInViewModule.cs | 2 +- .../Data/NHibernate/Support/SessionScope.cs | 2 +- .../Support/SessionScopeSettings.cs | 2 +- .../Data/NHibernate/TemplateFlushMode.cs | 2 +- .../Generic/FindHibernateDelegate.cs | 2 +- .../NHibernate/Generic/HibernateDaoSupport.cs | 2 +- .../NHibernate/Generic/HibernateDelegate.cs | 2 +- .../NHibernate/Generic/HibernateTemplate.cs | 2 +- .../Generic/IFindHibernateCallback.cs | 2 +- .../NHibernate/Generic/IHibernateCallback.cs | 2 +- .../Generic/IHibernateOperations.cs | 2 +- .../Data/NHibernate/HibernateAccessor.cs | 2 +- ...ernateOptimisticLockingFailureException.cs | 12 +- .../NHibernate/LocalSessionFactoryObject.cs | 2 +- .../Data/NHibernate/SessionFactoryUtils.cs | 2 +- .../Data/NHibernate/SpringSessionContext.cs | 2 +- .../SpringSessionSynchronization.cs | 2 +- .../FilterDefiniitionFactoryObject.cs | 2 +- ...ibernateObjectRetrievalFailureException.cs | 26 +- ...ernateOptimisticLockingFailureException.cs | 22 +- .../NHibernate/LocalSessionFactoryObject.cs | 2 +- .../NHibernate/Bytecode/BytecodeProvider.cs | 2 +- .../NHibernate/Bytecode/LazyInitializer.cs | 2 +- .../NHibernate/Bytecode/ObjectsFactory.cs | 2 +- .../Data/NHibernate/Bytecode/ProxyFactory.cs | 2 +- .../Bytecode/ProxyFactoryFactory.cs | 2 +- .../Bytecode/ReflectionOptimizer.cs | 2 +- .../HibernateTxScopeTransactionManager.cs | 2 +- .../Dao/EmptyResultDataAccessException.cs | 2 +- ...ObjectOptimisticLockingFailureException.cs | 2 +- .../Dao/ObjectRetrievalFailureException.cs | 2 +- .../Spring.Data/Dao/Support/DaoSupport.cs | 2 +- .../Dao/Support/DataAccessUtils.cs | 28 +- .../Dao/Support/Generic/DataAccessUtils.cs | 2 +- .../Data/BadSqlGrammarException.cs | 2 +- .../Data/CannotGetAdoConnectionException.cs | 2 +- .../Spring.Data/Data/CommandDelegate.cs | 2 +- .../Spring.Data/Data/CommandSetterDelegate.cs | 2 +- .../Spring.Data/Data/Common/DbMetadata.cs | 2 +- .../Spring.Data/Data/Common/DbParameter.cs | 2 +- .../Spring.Data/Data/Common/DbParameters.cs | 18 +- .../Data/Common/DbParametersBuilder.cs | 2 +- .../Spring.Data/Data/Common/DbProvider.cs | 2 +- .../Data/Common/DbProviderFactory.cs | 2 +- .../Data/Common/DbProviderFactoryObject.cs | 2 +- .../Data/Common/DelegatingDbProvider.cs | 2 +- .../Spring.Data/Data/Common/ErrorCodes.cs | 2 +- .../Spring.Data/Data/Common/IDbMetadata.cs | 2 +- .../Spring.Data/Data/Common/IDbParameter.cs | 2 +- .../Spring.Data/Data/Common/IDbProvider.cs | 2 +- .../Data/Common/MultiDelegatingDbProvider.cs | 2 +- .../Data/Common/UserCredentialsDbProvider.cs | 2 +- .../Spring.Data/Data/Core/AdoAccessor.cs | 28 +- .../Spring.Data/Data/Core/AdoTemplate.cs | 112 ++-- .../Data/Core/RowMapperResultSetExtractor.cs | 2 +- ...ServiceDomainPlatformTransactionManager.cs | 2 +- .../Spring.Data/Data/DuplicateKeyException.cs | 2 +- .../Spring.Data/Data/Generic/AdoDaoSupport.cs | 2 +- .../Spring.Data/Data/Generic/AdoTemplate.cs | 2 +- .../Data/Generic/CommandDelegate.cs | 2 +- .../Data/Generic/DataAdapterDelegate.cs | 2 +- .../Data/Generic/IAdoOperations.cs | 2 +- .../Data/Generic/ICommandCallback.cs | 2 +- .../Data/Generic/IDataAdapterCallback.cs | 2 +- .../Data/Generic/IDbCommandCallback.cs | 2 +- .../Data/Generic/IDbCommandDelegate.cs | 2 +- .../Data/Generic/IResultSetExtractor.cs | 2 +- .../Spring.Data/Data/Generic/IRowMapper.cs | 2 +- .../Data/Generic/NamedResultSetProcessor.cs | 2 +- .../Generic/ResultSetExtractorDelegate.cs | 2 +- .../Data/Generic/RowMapperDelegate.cs | 2 +- .../Generic/RowMapperResultSetExtractor.cs | 2 +- src/Spring/Spring.Data/Data/IAdoOperations.cs | 2 +- .../Spring.Data/Data/ICommandCallback.cs | 2 +- src/Spring/Spring.Data/Data/ICommandSetter.cs | 2 +- .../Spring.Data/Data/ICommonAdoOperations.cs | 2 +- .../Spring.Data/Data/IDataAdapterCallback.cs | 2 +- .../Spring.Data/Data/IDataAdapterSetter.cs | 2 +- .../Spring.Data/Data/IDataReaderWrapper.cs | 2 +- .../Data/IDataSetFillLifecycleProcessor.cs | 2 +- .../Spring.Data/Data/IDbCommandCreator.cs | 2 +- .../Data/IDbCommandCreatorFactory.cs | 2 +- .../Spring.Data/Data/IDbDataAdapterCreator.cs | 2 +- .../Spring.Data/Data/IResultSetExtractor.cs | 2 +- src/Spring/Spring.Data/Data/IRowMapper.cs | 2 +- .../Data/InvalidResultSetAccessException.cs | 2 +- .../Spring.Data/Data/Objects/AdoNonQuery.cs | 2 +- .../Spring.Data/Data/Objects/AdoOperation.cs | 2 +- .../Spring.Data/Data/Objects/AdoQuery.cs | 2 +- .../Spring.Data/Data/Objects/AdoScalar.cs | 2 +- .../Data/Objects/Generic/AdoOperation.cs | 2 +- .../Data/Objects/Generic/AdoQuery.cs | 2 +- .../Data/Objects/Generic/MappingAdoQuery.cs | 2 +- .../Generic/MappingAdoQueryWithContext.cs | 2 +- .../Data/Objects/Generic/StoredProcedure.cs | 2 +- .../Data/Objects/MappingAdoQuery.cs | 2 +- .../Objects/MappingAdoQueryWithContext.cs | 2 +- .../Data/Objects/StoredProcedure.cs | 16 +- .../Data/ResultSetExtractorDelegate.cs | 2 +- .../Spring.Data/Data/RowMapperDelegate.cs | 2 +- .../Support/AdoTransactionObjectSupport.cs | 2 +- .../Data/Support/ConnectionUtils.cs | 38 +- .../Support/DefaultServiceDomainAdapter.cs | 2 +- .../Support/ErrorCodeExceptionTranslator.cs | 2 +- .../Support/FallbackExceptionTranslator.cs | 2 +- .../Data/Support/IServiceDomainAdapter.cs | 2 +- .../Data/Support/NamedResultSetProcessor.cs | 2 +- .../Data/Support/NullMappingDataReader.cs | 2 +- .../Data/Support/ParameterUtils.cs | 2 +- .../Data/Support/SimpleServiceConfig.cs | 2 +- .../Data/UncategorizedAdoException.cs | 38 +- .../Interceptor/TransactionAttribute.cs | 2 +- .../Support/ITransactionCallback.cs | 2 +- .../TransactionCallbackWithoutResult.cs | 2 +- .../Connections/ChainedExceptionListener.cs | 2 +- .../Nms/Connections/ConnectionFactoryUtils.cs | 2 +- .../Nms/Connections/NmsResourceHolder.cs | 2 +- .../Connections/SingleConnectionFactory.cs | 2 +- .../SynchedLocalTransactionFailedException.cs | 2 +- .../Messaging/Nms/Core/IMessageCreator.cs | 2 +- .../Nms/Core/IMessagePostProcessor.cs | 2 +- .../Messaging/Nms/Core/INmsOperations.cs | 2 +- .../Messaging/Nms/Core/IProducerCallback.cs | 2 +- .../Messaging/Nms/Core/ISessionCallback.cs | 2 +- .../Nms/Core/MessageCreatorDelegate.cs | 2 +- .../Messaging/Nms/Core/NmsGatewaySupport.cs | 2 +- .../Messaging/Nms/Core/NmsTemplate.cs | 2 +- .../Messaging/Nms/Core/SessionDelegate.cs | 8 +- .../AbstractMessageListenerContainer.cs | 2 +- .../Support/Converter/IMessageConverter.cs | 2 +- .../Converter/MessageConversionException.cs | 2 +- .../Converter/SimpleMessageConverter.cs | 2 +- .../Nms/Support/Converter/TypeMapper.cs | 2 +- .../DynamicDestinationResolver.cs | 2 +- .../Destinations/IDestinationResolver.cs | 2 +- .../Destinations/NmsDestinationAccessor.cs | 2 +- .../Messaging/Nms/Support/MessageUtils.cs | 2 +- .../Messaging/Nms/Support/NmsAccessor.cs | 2 +- .../Core/DefaultMessageQueueFactory.cs | 2 +- .../Messaging/Core/IMessageQueueFactory.cs | 28 +- .../ServicedComponentHelper.cs | 2 +- .../Activation/ServiceHostFactory.cs | 2 +- .../Activation/ServiceHostFactoryObject.cs | 2 +- .../Activation/WebServiceHostFactory.cs | 2 +- .../ServiceModel/ChannelFactoryObject.cs | 2 +- .../ServiceModel/ServiceExporter.cs | 2 +- .../ServiceModel/SpringServiceHost.cs | 2 +- .../ServiceModel/SpringWebServiceHost.cs | 2 +- .../Support/ServiceProxyTypeBuilder.cs | 2 +- .../Web/Services/WebServiceProxyFactory.cs | 2 +- .../Script/Services/ScriptHandlerFactory.cs | 2 +- .../Context/Support/MvcApplicationContext.cs | 28 +- .../Support/MvcApplicationContextArgs.cs | 28 +- .../Context/Support/MvcContextHandler.cs | 28 +- .../Spring.Web.Mvc/SpringActionInvoker.cs | 28 +- .../Spring.Web.Mvc/SpringControllerFactory.cs | 28 +- .../Spring.Web.Mvc/SpringMvcApplication.cs | 28 +- .../Support/HttpApplicationConfigurer.cs | 2 +- .../Support/WebApplicationContextArgs.cs | 2 +- .../Context/Support/WebContextHandler.cs | 2 +- .../Context/Support/WebSupportModule.cs | 2 +- src/Spring/Spring.Web/Core/IO/WebResource.cs | 2 +- .../Factory/Xml/WebObjectsNamespaceParser.cs | 2 +- .../Spring.Web/Util/HttpContextSwitch.cs | 2 +- .../Spring.Web/Util/IVirtualEnvironment.cs | 2 +- .../Spring.Web/Util/SecurityCritical.cs | 2 +- .../Spring.Web/Util/VirtualEnvironment.cs | 2 +- src/Spring/Spring.Web/Util/WebUtils.cs | 2 +- ...urableActiveDirectoryMembershipProvider.cs | 2 +- .../ConfigurableSqlMembershipProvider.cs | 2 +- .../ConfigurableSqlProfileProvider.cs | 2 +- .../Providers/ConfigurableSqlRoleProvider.cs | 2 +- .../ConfigurableXmlSiteMapProvider.cs | 2 +- .../Spring.Web/Web/Providers/IRoleProvider.cs | 2 +- .../Web/Providers/ISiteMapProvider.cs | 2 +- .../Providers/MembershipProviderAdapter.cs | 2 +- .../Web/Providers/RoleProviderAdapter.cs | 2 +- .../Web/Providers/SiteMapProviderAdapter.cs | 2 +- .../Web/Services/WebServiceExporter.cs | 2 +- .../Web/Services/WebServiceHandlerFactory.cs | 2 +- .../Web/Support/AbstractHandlerFactory.cs | 2 +- .../Spring.Web/Web/Support/ControlAccessor.cs | 2 +- .../Web/Support/ControlCollectionAccessor.cs | 2 +- .../Web/Support/ControlInterceptor.cs | 2 +- .../Web/Support/DefaultHandlerFactory.cs | 2 +- .../Web/Support/DefaultResultFactory.cs | 2 +- .../Spring.Web/Web/Support/HandlerMap.cs | 2 +- .../Spring.Web/Web/Support/HandlerMapEntry.cs | 2 +- .../Web/Support/IInterceptionStrategy.cs | 2 +- .../Web/Support/IResultWebNavigator.cs | 2 +- .../ISupportsWebDependencyInjection.cs | 2 +- ...InterceptControlCollectionOwnerStrategy.cs | 2 +- .../InterceptControlCollectionStrategy.cs | 2 +- .../Web/Support/LocalResourceManager.cs | 2 +- .../Web/Support/MappingHandlerFactory.cs | 2 +- .../MappingHandlerFactoryConfigurer.cs | 2 +- .../Spring.Web/Web/Support/MimeMediaType.cs | 2 +- src/Spring/Spring.Web/Web/Support/Result.cs | 2 +- .../Web/Support/ResultFactoryRegistry.cs | 2 +- .../Spring.Web/Web/Support/ResultMode.cs | 2 +- ...ortsWebDependencyInjectionMethodBuilder.cs | 2 +- ...upportsWebDependencyInjectionOwnerProxy.cs | 2 +- ...pportsWebDependencyInjectionTypeBuilder.cs | 2 +- .../UI/Controls/AbstractValidationControl.cs | 2 +- .../Spring.Web/Web/UI/Controls/Calendar.cs | 2 +- src/Spring/Spring.Web/Web/UI/Controls/Form.cs | 2 +- .../Spring.Web/Web/UI/Controls/Panel.cs | 2 +- .../Web/UI/IModelPersistenceMedium.cs | 2 +- .../Spring.Web/Web/UI/IValidationContainer.cs | 2 +- .../Web/UI/SessionModelPersistenceMedium.cs | 2 +- .../Aop/Advice/DebugAdvice.cs | 2 +- .../Aop/Config/AopNamespaceParserTests.cs | 2 +- .../AbstractMethodInvocationTests.cs | 2 +- .../AfterReturningAdviceInterceptorTests.cs | 2 +- .../Adapter/ThrowsAdviceInterceptorTests.cs | 2 +- .../UnknownAdviceTypeExceptionTests.cs | 2 +- .../Aop/Framework/AopContextTests.cs | 2 +- ...AutoProxyCreatorCircularReferencesTests.cs | 2 +- .../AutoProxy/AdvisorAutoProxyCreatorTests.cs | 2 +- .../AttributeAutoProxyCreatorTests.cs | 2 +- .../Framework/AutoProxy/NoSetterProperties.cs | 2 +- .../ObjectNameAutoProxyCreatorTests.cs | 2 +- ...OrderedLogicalThreadContextCheckAdvisor.cs | 2 +- .../PointcutFilteringAutoProxyCreatorTests.cs | 2 +- .../TypeNameAutoProxyCreatorTests.cs | 2 +- .../Framework/CountingAfterReturningAdvice.cs | 2 +- .../Aop/Framework/CountingBeforeAdvice.cs | 2 +- .../Aop/Framework/CountingMultiAdvice.cs | 2 +- .../Aop/Framework/CountingThrowsAdvice.cs | 2 +- .../Framework/DynamicMethodInvocationTests.cs | 2 +- .../DynamicProxy/AbstractAopProxyTests.cs | 2 +- .../Framework/DynamicProxy/AopUtilsTests.cs | 2 +- .../CachedAopProxyFactoryTests.cs | 2 +- .../DynamicProxy/CompositionAopProxyTests.cs | 2 +- .../DynamicProxy/DecoratorAopProxyTests.cs | 2 +- .../DefaultAopProxyFactoryTests.cs | 2 +- .../DynamicProxy/InheritanceAopProxyTests.cs | 2 +- .../DynamicProxy/MockTargetSource.cs | 2 +- ...ashtableCachingAdvisorChainFactoryTests.cs | 2 +- .../Aop/Framework/IIsModified.cs | 2 +- .../Aop/Framework/IsModifiedMixin.cs | 2 +- .../Aop/Framework/ProxyConfigTests.cs | 2 +- .../Aop/Framework/ProxyFactoryObjectTests.cs | 2 +- .../Aop/Framework/ProxyFactoryTests.cs | 2 +- .../ReflectiveMethodInvocationTests.cs | 2 +- .../Aop/Interceptor/NopInterceptor.cs | 2 +- .../AttributeMatchMethodPointcutTests.cs | 2 +- .../Aop/Support/ControlFlowPointcutTests.cs | 2 +- .../Aop/Support/RootTypeFilterTests.cs | 2 +- .../Aop/Target/EmptyTargetSourceTests.cs | 2 +- .../Target/HotSwappableTargetSourceTests.cs | 2 +- .../Aop/Target/PrototypeTargetSourceTests.cs | 2 +- .../Aop/Target/SingletonTargetSourceTests.cs | 2 +- .../Aop/TrueMethodMatcherTests.cs | 2 +- .../Spring.Aop.Tests/Aop/TruePointcutTests.cs | 2 +- .../Aop/TrueTypeFilterTests.cs | 2 +- .../Cache/CacheAspectIntegrationTests.cs | 2 +- .../Cache/CacheParameterAdviceTests.cs | 2 +- .../Aspects/Cache/CacheResultAdviceTests.cs | 2 +- .../Cache/InvalidateCacheAdviceTests.cs | 2 +- .../ExceptionHandlerAspectIntegrationTests.cs | 2 +- .../Logging/SimpleLoggingAdviceTests.cs | 2 +- .../Aspects/RetryAdviceTests.cs | 2 +- .../ParameterValidationAdviceTests.cs | 2 +- .../Caching/AbstractCacheTests.cs | 2 +- .../Caching/BaseCacheAttributeTests.cs | 2 +- .../Collections/AbstractQueueTests.cs | 2 +- .../CaseInsensitiveHashtableTests.cs | 2 +- .../Generic/ReadOnlyDictionaryTests.cs | 2 +- .../Collections/LinkedListTests.cs | 2 +- .../Collections/SynchronizedHashtableTests.cs | 2 +- .../Spring.Core.Tests/CompilerOptionsTests.cs | 2 +- .../Context/EventListenerAttributeTests.cs | 2 +- .../Context/Events/ConsoleListenerTests.cs | 2 +- .../ApplicationContextAwareProcessorTests.cs | 2 +- .../ApplicationContextExtensionTests.cs | 2 +- .../Support/ApplicationObjectSupportTests.cs | 2 +- .../Support/ContextLocatorHandlerTests.cs | 2 +- .../Context/Support/ContextRegistryTests.cs | 2 +- .../DefaultMessageSourceResolvableTests.cs | 2 +- .../Support/DelegatingMessageSourceTests.cs | 2 +- .../NamespaceParsersSectionHandlerTests.cs | 2 +- .../Support/ResourceSetMessageSourceTests.cs | 2 +- .../Support/StaticMessageSourceTests.cs | 2 +- .../Context/Support/TestObjectConfigParser.cs | 2 +- .../Support/TypeAliasesSectionHandlerTests.cs | 2 +- .../Core/ComposedCriteriaTests.cs | 2 +- .../Core/IO/FileSystemResourceCommonTests.cs | 2 +- .../Core/IO/FileSystemResourceTests.cs | 2 +- .../Core/IO/StringResourceTests.cs | 2 +- .../CredentialConverterTests.cs | 2 +- .../TypeConversion/FileInfoConverterTests.cs | 2 +- .../TypeConversion/RGBColorConverterTests.cs | 2 +- .../TypeConversion/RegexConverterTests.cs | 2 +- .../RegistryKeyConverterTests.cs | 2 +- .../StringArrayConverterTests.cs | 2 +- .../TypeConversion/TimeSpanConverterTests.cs | 2 +- .../TypeConverterRegistryTests.cs | 2 +- .../TypeConversion/UniqueKeyConverterTests.cs | 2 +- .../TypeResolution/CachedTypeResolverTests.cs | 2 +- .../GenericTypeResolverTests.cs | 2 +- .../TypeResolution/TypeAssemblyHolderTests.cs | 2 +- .../Core/TypeResolution/TypeRegistryTests.cs | 2 +- .../Core/TypeResolution/TypeResolverTests.cs | 2 +- .../Objects/Factory/Config/PPC-SPRNET-55.xml | 2 +- .../Spring.Core.Tests/ExceptionsTest.cs | 2 +- .../Expressions/ConstructorNodeTests.cs | 2 +- .../Expressions/ExpressionEvaluatorTests.cs | 2 +- .../Expressions/FunctionNodeTests.cs | 2 +- .../Expressions/MethodNodeTests.cs | 2 +- .../Processors/ConversionProcessorTests.cs | 2 +- .../Processors/OrderByProcessorTests.cs | 2 +- .../Expressions/PropertyOrFieldNodeTests.cs | 2 +- .../Expressions/ReferenceNodeTests.cs | 2 +- .../Expressions/SelectionNodeTests.cs | 2 +- .../Globalization/AbstractLocalizerTests.cs | 2 +- .../Formatters/FilteringFormatterTests.cs | 2 +- .../HasTextFilteringFormatterTests.cs | 2 +- .../Localizers/ResourceSetLocalizerTests.cs | 2 +- .../Resolvers/DefaultCultureResolverTests.cs | 2 +- .../HookableContextHandler.cs | 2 +- .../Objects/DerivedTestObject.cs | 2 +- .../Factory/Attributes/MyRequiredAttribute.cs | 2 +- ...quiredAttributeObjectPostProcessorTests.cs | 2 +- .../Factory/Attributes/RequiredTestObject.cs | 2 +- .../Config/AbstractFactoryObjectTests.cs | 2 +- .../CommandLineArgsVariableSourceTests.cs | 2 +- .../ConfigSectionVariableSourceTests.cs | 2 +- .../Config/ConfigurationReaderTests.cs | 2 +- .../ConnectionStringsVariableSourceTests.cs | 2 +- .../Config/ConstructorArgumentValuesTests.cs | 2 +- .../Config/CustomConverterConfigurerTests.cs | 2 +- .../Config/DelegateFactoryObjectTests.cs | 2 +- .../Config/EnvironmentVariableSourceTests.cs | 2 +- .../FieldRetrievingFactoryObjectTests.cs | 2 +- .../Factory/Config/LogFactoryObjectTests.cs | 2 +- .../Config/ObjectDefinitionVisitorTests.cs | 2 +- ...ObjectFactoryCreatingFactoryObjectTests.cs | 2 +- .../ObjectReferenceFactoryObjectTests.cs | 2 +- .../Config/PropertyFileVariableSourceTests.cs | 2 +- .../Config/PropertyOverrideConfigurerTests.cs | 2 +- .../Config/PropertyPathFactoryObjectTests.cs | 2 +- .../PropertyPlaceholderConfigurerTests.cs | 2 +- .../PropertyRetrievingFactoryObjectTests.cs | 2 +- .../Config/RegistryVariableSourceTests.cs | 2 +- .../Config/ResourceHandlerConfigurerTests.cs | 2 +- .../Config/SharedStateAwareProcessorTests.cs | 2 +- .../SpecialFolderVariableSourceTests.cs | 2 +- .../Config/TypeAliasConfigurerTests.cs | 2 +- .../Factory/Config/VariableAccessorTests.cs | 2 +- .../VariablePlaceholderConfigurerTests.cs | 2 +- .../DefaultListableObjectFactoryPerfTests.cs | 2 +- .../Objects/Factory/KnowsIfInstantiated.cs | 2 +- .../Objects/Factory/MethodReplacerTests.cs | 2 +- .../Support/ChildObjectDefinitionTests.cs | 2 +- .../DefaultObjectDefinitionFactoryTests.cs | 2 +- .../Support/DelegatingMethodReplacerTests.cs | 2 +- .../Support/LookupMethodOverrideTests.cs | 2 +- .../Support/LookupMethodReplacerTests.cs | 2 +- .../Support/ObjectDefinitionBuilderTests.cs | 2 +- .../ObjectDefinitionReaderUtilsTests.cs | 2 +- .../Support/ReplacedMethodOverrideTests.cs | 2 +- .../Support/RootObjectDefinitionTests.cs | 2 +- .../Xml/CollectionMergingGenericTests.cs | 2 +- .../Factory/Xml/CollectionMergingTests.cs | 2 +- .../Objects/Factory/Xml/DependenciesObject.cs | 2 +- .../Objects/Factory/Xml/FactoryMethods.cs | 2 +- .../Objects/Factory/Xml/LocaleTests.cs | 2 +- .../Xml/NamespaceParserRegistryTests.cs | 12 +- .../Factory/Xml/ObjectNameGenerationTests.cs | 2 +- .../Factory/Xml/SiimpleCtorWiringTests.cs | 2 +- .../Objects/Factory/Xml/TestObjectCreator.cs | 2 +- .../Factory/Xml/XmlObjectCollectionTests.cs | 2 +- .../Factory/Xml/XmlObjectFactoryTests.cs | 2 +- .../Objects/INestedTestObject.cs | 2 +- .../Objects/LazyTestObject.cs | 2 +- .../Objects/PropertyValueTests.cs | 2 +- .../Objects/ResourceTestObject.cs | 2 +- .../Objects/SerializablePerson.cs | 2 +- .../AbstractSharedStateFactoryTests.cs | 2 +- .../Support/ByTypeSharedStateProviderTests.cs | 2 +- .../Support/PropertyComparatorTests.cs | 2 +- .../Pool/Support/SimplePoolTest.cs | 2 +- .../Proxy/AbstractProxyTypeBuilderTests.cs | 2 +- .../Proxy/CompositionProxyTypeBuilderTests.cs | 2 +- .../Proxy/DynamicProxyManagerTests.cs | 2 +- ...xplicitCompositionProxyTypeBuilderTests.cs | 2 +- .../Proxy/InheritanceProxyTypeBuilderTests.cs | 2 +- .../Reflection/Dynamic/SafePropertyTests.cs | 2 +- test/Spring/Spring.Core.Tests/StopWatch.cs | 2 +- .../StreamHelperDecorator.cs | 2 +- .../Threading/AsyncTestMethod.cs | 2 +- .../Threading/AsyncTestTask.cs | 2 +- .../Threading/CallContextStorageTests.cs | 2 +- .../Threading/CommonThreadStorageTests.cs | 2 +- .../Threading/LogicalThreadContextTest.cs | 2 +- .../Threading/ThreadStaticStorageTests.cs | 2 +- .../Util/ConfigXmlDocumentTests.cs | 2 +- .../Util/DelegateInfoTests.cs | 2 +- .../Util/StringUtilsTests.cs | 2 +- .../Util/SystemUtilsTests.cs | 2 +- .../Spring.Core.Tests/Util/UniqueKeyTests.cs | 2 +- .../ValidationNamespaceParserTests.cs | 2 +- .../Validators/ConditionValidatorTests.cs | 2 +- .../Validators/CreditCardValidatorTests.cs | 2 +- .../Validators/ISBNValidatorTests.cs | 2 +- .../Data/AdoTemplatePerformanceTests.cs | 2 +- .../Data/AdoTemplateTests.cs | 12 +- .../Data/AutoDeclarativeTxTests.cs | 2 +- .../Data/CallCreateTestObject.cs | 2 +- .../Data/CreateTestObjectNonQuery.cs | 2 +- .../Data/DTCTests.cs | 2 +- .../Data/DTCTestsNoInterfaces.cs | 2 +- .../Data/DeclarativeTxTests.cs | 2 +- .../Data/Generic/GenericAdoTemplateTests.cs | 2 +- .../Data/Generic/ITestObjectDao.cs | 2 +- .../Data/Generic/TestObjectDao.cs | 2 +- .../Data/Generic/TestObjectRowMapper.cs | 2 +- .../Data/MappingAdoQueryTests.cs | 2 +- .../Data/NativeAdoTests.cs | 2 +- .../Data/NestedTxScopeTests.cs | 2 +- .../Data/Northwind/AdoTemplateShipperDao.cs | 2 +- .../Data/Northwind/IShipperDao.cs | 2 +- .../Data/Northwind/NativeAdoShipperDao.cs | 2 +- .../Data/Northwind/Shipper.cs | 2 +- .../Objects/Generic/StoredProcedureTests.cs | 2 +- .../Data/Objects/Generic/VacationRowMapper.cs | 2 +- .../Data/OracleAdoTemplateTests.cs | 2 +- .../Data/SQLiteTests.cs | 2 +- .../Data/StoredProcedureTests.cs | 2 +- .../SimpleExceptionTranslationTests.cs | 2 +- .../Data/TestObjectManager.cs | 2 +- .../Data/TestObjectQuery.cs | 2 +- .../Data/TestObjectStoredProcedure.cs | 2 +- .../Data/TestTxIsolationLevelTests.cs | 2 +- .../Data/TransactionTemplateTests.cs | 2 +- .../Data/NHibernate/AccountManager.cs | 2 +- .../Data/NHibernate/Credit.cs | 2 +- .../NHibernate/DbProviderTemplateTests.cs | 2 +- .../Data/NHibernate/Debit.cs | 2 +- .../Data/NHibernate/IAuditDao.cs | 2 +- .../Data/NHibernate/ITestObjectDao.cs | 2 +- .../Data/NHibernate/MultipleDbTests.cs | 2 +- .../Data/NHibernate/NHDAOTests.cs | 2 +- .../Data/NHibernate/NHTestObjectDao.cs | 2 +- .../Data/NHibernate/NativeNHTestObjectDao.cs | 2 +- .../Data/NHibernate/NativeNHTests.cs | 2 +- .../Data/NHibernate/TemplateTests.cs | 2 +- .../Data/NHibernate/TestObject.cs | 2 +- .../NHibernate/Config/AopConfiguration.cs | 2 +- .../HibernateTransactionManagerTests.cs | 2 +- .../Data/NHibernate/ITestObjectDao.cs | 2 +- .../LocalSessionFactoryObjectTests.cs | 2 +- .../Data/NHibernate/NHTestObjectDao.cs | 2 +- .../ConfigSectionSessionScopeSettingsTests.cs | 2 +- .../Support/SessionScopeSettingsTests.cs | 2 +- .../NHibernate/Support/SessionScopeTests.cs | 2 +- .../Data/NHibernate/TestObject.cs | 2 +- ...HibernateTxScopeTransactionManagerTests.cs | 2 +- ...istenceExceptionTranslationAdvisorTests.cs | 2 +- ...nceExceptionTranslationInterceptorTests.cs | 2 +- ...eExceptionTranslationPostProcessorTests.cs | 2 +- .../Dao/Support/DataAccessUtilsTests.cs | 2 +- .../AdoPlatformTransactionManagerTests.cs | 2 +- .../Data/AutoDeclarativeTxTests.cs | 2 +- .../Data/Common/DbParametersTests.cs | 2 +- .../Data/Common/DbProviderFactoryTests.cs | 2 +- .../Common/UserCredentialsDbProviderTests.cs | 2 +- .../ServiceDomainTransactionManagerTests.cs | 2 +- ...ScopeTransactionManagerIntegrationTests.cs | 2 +- .../Core/TxScopeTransactionManagerTests.cs | 2 +- .../Data/Objects/AbstractAdoQueryTests.cs | 2 +- .../Data/Objects/AdoOperationTests.cs | 4 +- .../Data/Objects/AdoQueryTests.cs | 4 +- .../Data/Objects/StoredProcedureTests.cs | 4 +- .../Spring.Data.Tests/Data/TestObjectMgr.cs | 2 +- .../ErrorCodeExceptionTranslatorTests.cs | 2 +- .../Support/TestDbProvider.cs | 2 +- .../Support/TestSqlException.cs | 2 +- .../AbstractTransactionAspectTests.cs | 2 +- .../TransactionAttributeSourceTests.cs | 2 +- .../TransactionInterceptorTests.cs | 2 +- .../Nms/Config/NmsNamespaceHandlerTests.cs | 2 +- .../CachingConnectionFactoryTests.cs | 2 +- .../MessageTransactionManagerTests.cs | 2 +- .../SingleConnectionFactoryTests.cs | 2 +- .../Nms/Connections/TestExceptionListener.cs | 2 +- .../Nms/Core/MessageTemplateTests.cs | 2 +- .../Nms/Core/SimpleMessageConverterTests.cs | 2 +- .../SimpleMessageListenerContainerTests.cs | 2 +- .../SimpleMessageListenerContainerTests.cs | 2 +- .../Adapter/MessageListenerAdapterTests.cs | 2 +- .../Nms/Support/Converter/TypeMapperTests.cs | 2 +- .../Core/MessageQueueMetadataCacheTests.cs | 2 +- .../Core/MessageQueueTemplateTests.cs | 2 +- .../Messaging/Core/ThreadingTests.cs | 2 +- .../Adapter/MessageListenerAdapterTests.cs | 2 +- ...tributedTxMessageListenerContainerTests.cs | 2 +- ...nsactionalMessageListenerContainerTests.cs | 2 +- ...nsactionalMessageListenerContainerTests.cs | 2 +- ...nsactionalMessageListenerContainerTests.cs | 2 +- .../Support/MessageQueueFactoryObjectTests.cs | 2 +- .../ExportedServicedComponentSample.cs | 2 +- .../ServiceModel/ServiceExporterTests.cs | 2 +- .../VelocityEngineFactoryObjectTests.cs | 2 +- .../Velocity/VelocityEngineTestBase.cs | 2 +- .../ControllerFactoryTestExtension.cs | 28 +- .../FirstContainerRegisteredController.cs | 28 +- .../Controllers/NamedContextController.cs | 28 +- .../Controllers/NotInContainerController.cs | 28 +- .../SecondContainerRegisteredController.cs | 28 +- .../SpringControllerFactoryTests.cs | 2 +- test/Spring/Spring.Web.Tests/AssemblyInfo.cs | 2 +- .../Caching/AspNetCacheTests.cs | 2 +- .../Support/HttpApplicationConfigurerTests.cs | 2 +- .../Support/WebApplicationContextTests.cs | 2 +- .../Context/Support/WebContextHandlerTests.cs | 2 +- .../Core/IO/WebResourceTests.cs | 2 +- .../DefaultWebCultureResolverTests.cs | 2 +- .../WebObjectDefinitionFactoryTests.cs | 2 +- .../Factory/Support/WebObjectFactoryTests.cs | 2 +- .../TestSupport/TestWebContext.cs | 2 +- .../TestSupport/TestWebContextTests.cs | 2 +- .../Threading/HttpContextStorageTests.cs | 2 +- .../Threading/HybridContextStorageTests.cs | 2 +- .../Util/WebDIPerformanceTests.cs | 2 +- .../Spring.Web.Tests/Util/WebUtilsTests.cs | 2 +- .../Web/Services/WebServiceExporterTests.cs | 2 +- .../Support/AbstractHandlerFactoryTests.cs | 2 +- .../Web/Support/ControlInterceptionTests.cs | 2 +- .../Web/Support/LocalResourceManagerTests.cs | 2 +- .../Web/Support/MimeMediaTypeTests.cs | 2 +- .../Web/Support/PageHandlerFactoryTests.cs | 2 +- .../Web/Support/ResultFactoryRegistryTests.cs | 2 +- .../Web/Support/ResultTests.cs | 2 +- .../AbstractValidationControlTests.cs | 2 +- .../Web/UI/Controls/HeadTests.cs | 2 +- .../Web/UI/Controls/ValidationErrorsTests.cs | 2 +- .../Web/UI/Controls/ValidationSummaryTests.cs | 2 +- .../UI/SessionModelPersistenceMediumTests.cs | 2 +- .../Web/UI/UserControlTests.cs | 2 +- 1077 files changed, 4022 insertions(+), 4015 deletions(-) diff --git a/readme.txt b/readme.txt index 8bf01c51..083c8776 100644 --- a/readme.txt +++ b/readme.txt @@ -1,11 +1,11 @@ -THE SPRING.NET FRAMEWORK, Release 1.3.1 (December 10, 2010) +THE SPRING.NET FRAMEWORK, Release 1.3.2 (April 1, 2011) -------------------------------------------------------------------- http://www.springframework.net/ 1. INTRODUCTION -The 1.3.1 release of Spring.NET contains +The 1.3.2 release of Spring.NET contains * A full featured Inversion of Control container * An Aspect Oriented Programming framework @@ -20,7 +20,7 @@ The 1.3.1 release of Spring.NET contains * Portable Service Abstractions - Export plain .NET objects via .NET Remoting, Web Service or .NET Serviced Component and create client side proxies based on endpoint URL and service interface. * NHibernate Integation - - NHibernate 1.0, 1.2, 2.0, 2.1, and 3.0 integration to simplify use of NHibernate and participate in Spring's declarative transaction management functionality. + - NHibernate 1.0, 1.2, 2.0, 2.1, 3.0, and 3.1 integration to simplify use of NHibernate and participate in Spring's declarative transaction management functionality. * ASP.NET AJAX Integration - Exporter to expose plain object on which Dependency Injection and AOP have been applied to JavaScript. * NUnit and MSTest integration @@ -65,6 +65,7 @@ Release contents: * "lib/NHibernate20" contains NHibernate 2.0 dlls * "lib/NHibernate21" contains NHibernate 2.1 dlls * "lib/NHibernate30" contains NHibernate 3.0 dlls +* "lib/NHibernate31" contains NHibernate 3.1 dlls * "doc" contains reference documentation, MSDN-style API help, and the Spring.NET xsd. * "examples" contains sample applications. * "build-support" contains additonal applications need to build using NAnt as some convenience @@ -112,6 +113,10 @@ The "bin" directory contains the following distinct dll files for use in applica - Contents: NHibernate 3.0 integration - Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate +* "Spring.Data.NHibernate31" (~90 KB) +- Contents: NHibernate 3.1 integration +- Dependencies: Spring.Core, Spring.Aop, Spring.Data, NHibernate + * "Spring.Services" (~70 KB) - Contents: Web Services, Remoting, and Enterprise Component based services. - Dependencies: Spring.Core, Spring.Aop @@ -179,8 +184,9 @@ Documented sample applications can be found in "examples": VS.NET ------ -There are four solution file for different version of VS.NET +There are five solution file for different version of VS.NET +* Spring.Net.2002.sln for use with VS.NET 2002 * Spring.Net.2003.sln for use with VS.NET 2003 * Spring.Net.2005.sln for use with VS.NET 2005 * Spring.Net.2008.sln for use with VS.NET 2008 @@ -190,10 +196,10 @@ Note: When building on Vista/Windows7 with activated UAC, you might get an error: xcopy -"C:\Spring.Net\Spring.NET-1.3.0\Spring.NET\test\Spring\Spring.Core.Tests\Spring.Core.Tests.dll.config" +"C:\Spring.Net\Spring.NET-1.3.2\Spring.NET\test\Spring\Spring.Core.Tests\Spring.Core.Tests.dll.config" ..\..\..\..\build\VS.Net.2008\Spring.Core.Tests\Debug\ /y /s /q-Command exited with Code 9009. Spring.Core.Tests.2008 -In this case you need to run Visual Studio with Administrator-permissions. +In this case you need to run Visual Studio with Administrator-permissions. (note that the first part of this path is an example only) NAnt ---- @@ -204,7 +210,7 @@ To build the source and run the unit tests type build test -If you want to run the build to create strongly signed assemblies you can generate a key file by executing the following command +If you want to run the build to create strongly signed assemblies you can generate a key file by executing the following command (assuming that sn.exe is properly on your search path): sn -k Spring.Net.snk diff --git a/src/Spring/CommonAssemblyInfo.cs b/src/Spring/CommonAssemblyInfo.cs index 2a99ef46..d6b48925 100644 --- a/src/Spring/CommonAssemblyInfo.cs +++ b/src/Spring/CommonAssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Reflection; #endif [assembly: AssemblyCompany("http://www.springframework.net")] [assembly: AssemblyProduct("Spring.NET Framework 1.3.1")] -[assembly: AssemblyCopyright("Copyright 2002-2010 Spring.NET Framework Team.")] +[assembly: AssemblyCopyright("Copyright 2002-2011 Spring.NET Framework Team.")] [assembly: AssemblyTrademark("Apache License, Version 2.0")] [assembly: AssemblyCulture("")] @@ -35,17 +35,17 @@ using System.Reflection; // (e.g., add any new ones at the TOP of this construct!) #if NET_4_0 -[assembly: AssemblyVersion("1.3.1.40001")] +[assembly: AssemblyVersion("1.3.2.40001")] #elif NET_3_5 -[assembly: AssemblyVersion("1.3.1.35001")] +[assembly: AssemblyVersion("1.3.2.35001")] #elif NET_3_0 -[assembly: AssemblyVersion("1.3.1.30001")] +[assembly: AssemblyVersion("1.3.2.30001")] #elif NET_2_0 -[assembly: AssemblyVersion("1.3.1.20001")] +[assembly: AssemblyVersion("1.3.2.20001")] #elif NET_1_1 -[assembly: AssemblyVersion("1.3.1.11001")] +[assembly: AssemblyVersion("1.3.2.11001")] #elif NET_1_0 -[assembly: AssemblyVersion("1.3.1.10001")] +[assembly: AssemblyVersion("1.3.2.10001")] #endif diff --git a/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs index 9607f88b..213563c3 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AbstractMethodInvocation.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -254,7 +254,7 @@ namespace Spring.Aop.Framework { if (this.interceptors == null || this.currentInterceptorIndex == this.interceptors.Count) - { + { AssertJoinpoint(); return InvokeJoinpoint(); } @@ -299,24 +299,24 @@ namespace Spring.Aop.Framework protected abstract IMethodInvocation PrepareMethodInvocationForProceed( IMethodInvocation invocation); - /// - /// Performs sanity checks, whether the actual joinpoint may be invoked - /// - /// - /// By default checks that the underlying target is not null and the called method is implemented - /// by the target's type. - /// - /// if is null. + /// + /// Performs sanity checks, whether the actual joinpoint may be invoked + /// + /// + /// By default checks that the underlying target is not null and the called method is implemented + /// by the target's type. + /// + /// if is null. /// if the 's type does not implement . protected virtual void AssertJoinpoint() - { + { AssertUtils.ArgumentNotNull(target, "target"); // if (this.method != null // && !this.method.DeclaringType.IsAssignableFrom(target.GetType())) -// { -// // This means the target type doesn't implement the interface. -// // Since no interceptor has handled the call, we throw a sensible exception here. -// throw new NotSupportedException(string.Format("Interface method '{0}.{1}()' was not handled by any interceptor and the underlying target type '{2}' does not implement this method.", method.DeclaringType.FullName, method.Name, target.GetType().FullName)); +// { +// // This means the target type doesn't implement the interface. +// // Since no interceptor has handled the call, we throw a sensible exception here. +// throw new NotSupportedException(string.Format("Interface method '{0}.{1}()' was not handled by any interceptor and the underlying target type '{2}' does not implement this method.", method.DeclaringType.FullName, method.Name, target.GetType().FullName)); // } } diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs index 90c14a67..49c86fae 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AdvisorAdapterRegistrationManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs index 1c2e6b03..67f02777 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs index c59db0dd..8e3482e6 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/AfterReturningAdviceInterceptor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs index 856bca93..6c8d3989 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/BeforeAdviceAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs index 945f5e97..d5c2c7dc 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/DefaultAdvisorAdapterRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ namespace Spring.Aop.Framework.Adapter /// interface. /// /// Rod Johnson - /// Aleksandar Seovic (.NET) + /// Aleksandar Seovic (.NET) [Serializable] public class DefaultAdvisorAdapterRegistry : IAdvisorAdapterRegistry { diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs index d1aaafd3..a8606122 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/GlobalAdvisorAdapterRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ namespace Spring.Aop.Framework.Adapter /// instance. /// /// Rod Johnson - /// Aleksandar Seovic (.NET) + /// Aleksandar Seovic (.NET) [Serializable] public sealed class GlobalAdvisorAdapterRegistry : DefaultAdvisorAdapterRegistry { diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs index 4ae1019e..71fe8484 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs index 9d014aab..1b571536 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/IAdvisorAdapterRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs index 6654d398..fd7a4a4a 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/MethodBeforeAdviceInterceptor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs index e5a2186a..dace881f 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs index feaf1c0e..3f3306b1 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -310,7 +310,7 @@ namespace Spring.Aop.Framework.Adapter handlerMethod.Invoke(this.throwsAdvice, handlerArgs); } catch (TargetInvocationException ex) - { + { throw ReflectionUtils.UnwrapTargetInvocationException(ex); } } diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs index bf5853f9..9455bd1e 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/UnknownAdviceTypeException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs b/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs index a80751d1..cc250005 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AdvisedSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -112,14 +112,14 @@ namespace Spring.Aop.Framework /// /// The advisor chain factory. - /// - private IAdvisorChainFactory advisorChainFactory; - - /// - /// If no explicit interfaces are specified, interfaces will be automatically determined - /// from the target type - /// - private bool autoDetectInterfaces; + /// + private IAdvisorChainFactory advisorChainFactory; + + /// + /// If no explicit interfaces are specified, interfaces will be automatically determined + /// from the target type + /// + private bool autoDetectInterfaces; #endregion @@ -131,10 +131,10 @@ namespace Spring.Aop.Framework /// default advisor chain factory. /// public AdvisedSupport() - { - this.advisorChainFactory = new HashtableCachingAdvisorChainFactory(); - this.AddListener(this.advisorChainFactory); - this.autoDetectInterfaces = true; + { + this.advisorChainFactory = new HashtableCachingAdvisorChainFactory(); + this.AddListener(this.advisorChainFactory); + this.autoDetectInterfaces = true; } /// @@ -155,38 +155,38 @@ namespace Spring.Aop.Framework AddInterfaceInternal(intf); } } - } - - /// - /// Creates a new instance of the - /// class that proxys all of the interfaces exposed by the supplied - /// . - /// - /// The object to proxy. - /// - /// If the is . - /// - public AdvisedSupport(object target) - : this(GetInterfaces(target)) - { - Target = target; - } - - /// - /// Creates a new instance of the - /// class that proxys all of the interfaces exposed by the supplied - /// 's target. - /// - /// The providing access to the object to proxy. - /// - /// If the is . - /// - public AdvisedSupport(ITargetSource targetSource) - : this(GetInterfaces(targetSource != null ? targetSource.TargetType : null)) - { - TargetSource = targetSource; - } - + } + + /// + /// Creates a new instance of the + /// class that proxys all of the interfaces exposed by the supplied + /// . + /// + /// The object to proxy. + /// + /// If the is . + /// + public AdvisedSupport(object target) + : this(GetInterfaces(target)) + { + Target = target; + } + + /// + /// Creates a new instance of the + /// class that proxys all of the interfaces exposed by the supplied + /// 's target. + /// + /// The providing access to the object to proxy. + /// + /// If the is . + /// + public AdvisedSupport(ITargetSource targetSource) + : this(GetInterfaces(targetSource != null ? targetSource.TargetType : null)) + { + TargetSource = targetSource; + } + #endregion #region IAdvised implementation @@ -214,10 +214,10 @@ namespace Spring.Aop.Framework } } set - { - AssertUtils.ArgumentNotNull(value, "AdvisorChainFactory"); + { + AssertUtils.ArgumentNotNull(value, "AdvisorChainFactory"); lock (this.SyncRoot) - { + { if (this.advisorChainFactory != null) { RemoveListener(this.advisorChainFactory); @@ -313,22 +313,22 @@ namespace Spring.Aop.Framework SetInterfacesInternal(value); } } - } - - /// - /// Set interfaces to be proxied, bypassing locking and - /// - protected void SetInterfacesInternal(Type[] value) - { + } + + /// + /// Set interfaces to be proxied, bypassing locking and + /// + protected void SetInterfacesInternal(Type[] value) + { this.interfaceMap.Clear(); if (value != null) - { + { for (int i = 0; i < value.Length; i++) { AddInterfaceInternal(value[i]); } - } - InterfacesChanged(); + } + InterfacesChanged(); } /// @@ -611,7 +611,7 @@ namespace Spring.Aop.Framework if (index == -1) { return false; - } + } RemoveAdvisorInternal(index); return true; } @@ -917,7 +917,7 @@ namespace Spring.Aop.Framework /// As will normally be passed straight through /// to the advised target, this method returns the /// equivalent for the AOP proxy itself. - /// + /// /// To override this format, override /// /// A description of the proxy configuration. @@ -925,53 +925,53 @@ namespace Spring.Aop.Framework public string ToProxyConfigString() { lock (this.SyncRoot) - { + { return ToProxyConfigStringInternal(); } - } - - /// - /// Returns textual information about this configuration object - /// - /// + } + + /// + /// Returns textual information about this configuration object + /// + /// protected virtual string ToProxyConfigStringInternal() - { - StringBuilder buffer = new StringBuilder(this.GetType().FullName + ":\n"); - buffer.Append(this.interfaceMap.Count + " interfaces=["); - this.InterfacesToString(buffer); - buffer.Append("];\n"); - buffer.Append(this._advisors.Count + " pointcuts=["); - this.AdvisorsToString(buffer); - buffer.Append("];\n"); - buffer.Append("targetSource=[" + this.m_targetSource + "];\n"); - buffer.Append("advisorChainFactory=" + this.advisorChainFactory + ";\n"); - buffer.Append(base.ToString()); - return buffer.ToString(); + { + StringBuilder buffer = new StringBuilder(this.GetType().FullName + ":\n"); + buffer.Append(this.interfaceMap.Count + " interfaces=["); + this.InterfacesToString(buffer); + buffer.Append("];\n"); + buffer.Append(this._advisors.Count + " pointcuts=["); + this.AdvisorsToString(buffer); + buffer.Append("];\n"); + buffer.Append("targetSource=[" + this.m_targetSource + "];\n"); + buffer.Append("advisorChainFactory=" + this.advisorChainFactory + ";\n"); + buffer.Append(base.ToString()); + return buffer.ToString(); } #endregion - #region Properties - - /// - /// Gets the target type behind the implementing object. - /// Ttypically a proxy configuration or an actual proxy. - /// - /// The type of the target or null if not known. - public Type TargetType - { - get { return TargetSource.TargetType; } - } - - /// - /// If no explicit interfaces are specified, interfaces will be automatically determined - /// from the target type on proxy creation. Defaults to true - /// - public bool AutoDetectInterfaces - { - get { return autoDetectInterfaces; } - set { autoDetectInterfaces = value; } - } + #region Properties + + /// + /// Gets the target type behind the implementing object. + /// Ttypically a proxy configuration or an actual proxy. + /// + /// The type of the target or null if not known. + public Type TargetType + { + get { return TargetSource.TargetType; } + } + + /// + /// If no explicit interfaces are specified, interfaces will be automatically determined + /// from the target type on proxy creation. Defaults to true + /// + public bool AutoDetectInterfaces + { + get { return autoDetectInterfaces; } + set { autoDetectInterfaces = value; } + } /// /// Sets the target object that is to be advised. @@ -1348,8 +1348,8 @@ namespace Spring.Aop.Framework this._advisorsArray = advisorsArray; } - #region IAdvisedSupportListener support - + #region IAdvisedSupportListener support + /// /// Callback method that is invoked when the list of proxied interfaces /// has changed. @@ -1402,11 +1402,11 @@ namespace Spring.Aop.Framework { listener.Activated(this); } - } - } - - #endregion - + } + } + + #endregion + /// /// Creates an AOP proxy using this instance's configuration data. /// @@ -1422,32 +1422,32 @@ namespace Spring.Aop.Framework protected internal virtual IAopProxy CreateAopProxy() { lock (this.SyncRoot) - { - if (this.autoDetectInterfaces && CountNonIntroductionInterfaces() == 0 -// && !this.ProxyTargetType - ) - { - this.interfaceMap.Clear(); - // add all target interfaces - Type[] targetInterfaces = ReflectionUtils.GetInterfaces(this.TargetType); - foreach(Type targetInterface in targetInterfaces ) - { - this.interfaceMap[targetInterface] = null; - } - // add introduced interfaces - foreach(IIntroductionAdvisor introduction in this._introductions) - { - foreach(Type introducedInterface in introduction.Interfaces) - { - this.interfaceMap[introducedInterface] = introduction; - } - } - - if (targetInterfaces.Length > 0) - { - InterfacesChanged(); - } - } + { + if (this.autoDetectInterfaces && CountNonIntroductionInterfaces() == 0 +// && !this.ProxyTargetType + ) + { + this.interfaceMap.Clear(); + // add all target interfaces + Type[] targetInterfaces = ReflectionUtils.GetInterfaces(this.TargetType); + foreach(Type targetInterface in targetInterfaces ) + { + this.interfaceMap[targetInterface] = null; + } + // add introduced interfaces + foreach(IIntroductionAdvisor introduction in this._introductions) + { + foreach(Type introducedInterface in introduction.Interfaces) + { + this.interfaceMap[introducedInterface] = introduction; + } + } + + if (targetInterfaces.Length > 0) + { + InterfacesChanged(); + } + } if (!this.isActive) { @@ -1457,20 +1457,20 @@ namespace Spring.Aop.Framework } } - /// - /// Calculates the number of not delegating to one of the . - /// + /// + /// Calculates the number of not delegating to one of the . + /// private int CountNonIntroductionInterfaces() - { - int c = 0; - foreach(Type interfaceType in this.interfaceMap.Keys) - { - if (this.interfaceMap[interfaceType] == null) - { - c++; - } - } - return c; + { + int c = 0; + foreach(Type interfaceType in this.interfaceMap.Keys) + { + if (this.interfaceMap[interfaceType] == null) + { + c++; + } + } + return c; } /// @@ -1491,8 +1491,8 @@ namespace Spring.Aop.Framework /// instance. /// protected internal virtual void CopyConfigurationFrom(AdvisedSupport other) - { - CopyConfigurationFrom(other, other.TargetSource, new ArrayList(other.Advisors), new ArrayList(other.Introductions)); + { + CopyConfigurationFrom(other, other.TargetSource, new ArrayList(other.Advisors), new ArrayList(other.Introductions)); } /// @@ -1511,10 +1511,10 @@ namespace Spring.Aop.Framework /// The instance /// containing the configiration data that is to be copied into this /// instance. - /// - /// the new target source - /// the advisors for the chain - /// the introductions for the chain + /// + /// the new target source + /// the advisors for the chain + /// the introductions for the chain protected internal virtual void CopyConfigurationFrom(AdvisedSupport other, ITargetSource targetSource, IList advisors, IList introductions) { CopyFrom(other); @@ -1522,23 +1522,23 @@ namespace Spring.Aop.Framework this.m_targetSource = targetSource; // this.cachedProxyType = other.cachedProxyType; // this.cachedProxyConstructor = other.cachedProxyConstructor; - this.Interfaces = (Type[]) CollectionUtils.ToArray(other.Interfaces, typeof(Type)); - foreach (Type intf in other.interfaceMap.Keys) - { - this.interfaceMap[intf] = other.interfaceMap[intf]; - } + this.Interfaces = (Type[]) CollectionUtils.ToArray(other.Interfaces, typeof(Type)); + foreach (Type intf in other.interfaceMap.Keys) + { + this.interfaceMap[intf] = other.interfaceMap[intf]; + } this._advisors = new ArrayList(); foreach (IAdvisor advisor in advisors) { - AssertUtils.ArgumentNotNull(advisor, "Advisor must not be null"); + AssertUtils.ArgumentNotNull(advisor, "Advisor must not be null"); AddAdvisor(advisor); } this._introductions = new ArrayList(); foreach (IIntroductionAdvisor advisor in introductions) - { - // TODO (EE): implement -// ValidateIntroductionAdvisor((IIntroductionAdvisor) advisor); - AssertUtils.ArgumentNotNull(advisor, "IntroductionAdvisor must not be null"); + { + // TODO (EE): implement +// ValidateIntroductionAdvisor((IIntroductionAdvisor) advisor); + AssertUtils.ArgumentNotNull(advisor, "IntroductionAdvisor must not be null"); AddIntroduction(advisor); } UpdateAdvisorsArray(); diff --git a/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs b/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs index 203f7d9a..f9201428 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs b/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs index 54ebb198..f8662e8b 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AopConfigException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs b/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs index e354449c..1d058fae 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AopContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,27 +81,27 @@ namespace Spring.Aop.Framework } } - /// - /// Indicates if the current call is executed under control of an AOP proxy. - /// - /// - ///

- /// Will be unless the - /// property - /// on the controlling proxy has been set to . - ///

- ///

- /// The default value for the - /// property - /// is , for performance reasons. - ///

- /// + /// + /// Indicates if the current call is executed under control of an AOP proxy. + /// + /// + ///

+ /// Will be unless the + /// property + /// on the controlling proxy has been set to . + ///

+ ///

+ /// The default value for the + /// property + /// is , for performance reasons. + ///

+ /// public static bool IsActive - { - get - { + { + get + { return (tls_ProxyStack != null && tls_ProxyStack.Count > 0); - } + } } /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs b/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs index f9434715..3ceb7a54 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AopUtils.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs index 815da272..a937aabc 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs @@ -1,96 +1,96 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - -#region Imports - -using System; -using System.Collections; +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + +#region Imports + +using System; +using System.Collections; using Common.Logging; -using Spring.Aop.Framework.DynamicProxy; -using Spring.Core; -using Spring.Objects.Factory; +using Spring.Aop.Framework.DynamicProxy; +using Spring.Core; +using Spring.Objects.Factory; using Spring.Objects.Factory.Config; -using Spring.Util; - -#endregion - -namespace Spring.Aop.Framework.AutoProxy -{ - /// - /// Abstract IObjectPostProcessor implementation that creates AOP proxies. - /// This class is completely generic; it contains no special code to handle - /// any particular aspects, such as pooling aspects. - /// - /// - ///

Subclasses must implement the abstract FindCandidateAdvisors() method - /// to return a list of Advisors applying to any object. Subclasses can also - /// override the inherited ShouldSkip() method to exclude certain objects - /// from autoproxying, but they must be careful to invoke the ShouldSkip() - /// method of this class, which tries to avoid circular reference problems - /// and infinite loops.

- ///

Advisors or advices requiring ordering should implement the Ordered interface. - /// This class sorts advisors by Ordered order value. Advisors that don't implement - /// the Ordered interface will be considered to be unordered, and will appear - /// at the end of the advisor chain in undefined order.

- /// - /// - /// Rod Johnson +using Spring.Util; + +#endregion + +namespace Spring.Aop.Framework.AutoProxy +{ + /// + /// Abstract IObjectPostProcessor implementation that creates AOP proxies. + /// This class is completely generic; it contains no special code to handle + /// any particular aspects, such as pooling aspects. + /// + /// + ///

Subclasses must implement the abstract FindCandidateAdvisors() method + /// to return a list of Advisors applying to any object. Subclasses can also + /// override the inherited ShouldSkip() method to exclude certain objects + /// from autoproxying, but they must be careful to invoke the ShouldSkip() + /// method of this class, which tries to avoid circular reference problems + /// and infinite loops.

+ ///

Advisors or advices requiring ordering should implement the Ordered interface. + /// This class sorts advisors by Ordered order value. Advisors that don't implement + /// the Ordered interface will be considered to be unordered, and will appear + /// at the end of the advisor chain in undefined order.

+ /// + /// + /// Rod Johnson /// Adhari C Mahendra (.NET) - /// Erich Eichinger - public abstract class AbstractAdvisorAutoProxyCreator : AbstractAutoProxyCreator - { - private readonly ILog Log; - private IAdvisorRetrievalHelper _advisorRetrievalHelper; - + /// Erich Eichinger + public abstract class AbstractAdvisorAutoProxyCreator : AbstractAutoProxyCreator + { + private readonly ILog Log; + private IAdvisorRetrievalHelper _advisorRetrievalHelper; + /// /// Initialize - /// - protected AbstractAdvisorAutoProxyCreator() + /// + protected AbstractAdvisorAutoProxyCreator() { Log = LogManager.GetLogger(this.GetType()); } - /// - /// We override this method to ensure that all candidate advisors are materialized - /// under a stack trace including this object. Otherwise, the dependencies won't - /// be apparent to the circular-reference prevention strategy in AbstractObjectFactory. - /// - public override IObjectFactory ObjectFactory - { - set - { - if (!(value is IConfigurableListableObjectFactory)) - { - throw new InvalidOperationException("Can not use AdvisorAutoProxyCreator without a ConfigurableListableObjectFactory"); - } + /// + /// We override this method to ensure that all candidate advisors are materialized + /// under a stack trace including this object. Otherwise, the dependencies won't + /// be apparent to the circular-reference prevention strategy in AbstractObjectFactory. + /// + public override IObjectFactory ObjectFactory + { + set + { + if (!(value is IConfigurableListableObjectFactory)) + { + throw new InvalidOperationException("Can not use AdvisorAutoProxyCreator without a ConfigurableListableObjectFactory"); + } base.ObjectFactory = value; InitObjectFactory((IConfigurableListableObjectFactory)value); - } - } - + } + } + /// /// An new was set. Initialize this creator instance /// according to the specified object factory. /// - /// - protected virtual void InitObjectFactory(IConfigurableListableObjectFactory objectFactory) + /// + protected virtual void InitObjectFactory(IConfigurableListableObjectFactory objectFactory) { _advisorRetrievalHelper = CreateAdvisorRetrievalHelper(objectFactory); } @@ -107,19 +107,19 @@ namespace Spring.Aop.Framework.AutoProxy protected virtual IAdvisorRetrievalHelper CreateAdvisorRetrievalHelper(IConfigurableListableObjectFactory objectFactory) { return new ObjectFactoryAdvisorRetrievalHelperAdapter(this, objectFactory); - } - - /// - /// Return whether the given object is to be proxied, what additional - /// advices (e.g. AOP Alliance interceptors) and advisors to apply. - /// - /// - ///

The previous targetName of this method was "GetInterceptorAndAdvisorForObject". - /// It has been renamed in the course of general terminology clarification - /// in Spring 1.1. An AOP Alliance Interceptor is just a special form of - /// Advice, so the generic Advice term is preferred now.

- ///

The third parameter, customTargetSource, is new in Spring 1.1; - /// add it to existing implementations of this method.

+ } + + /// + /// Return whether the given object is to be proxied, what additional + /// advices (e.g. AOP Alliance interceptors) and advisors to apply. + /// + /// + ///

The previous targetName of this method was "GetInterceptorAndAdvisorForObject". + /// It has been renamed in the course of general terminology clarification + /// in Spring 1.1. An AOP Alliance Interceptor is just a special form of + /// Advice, so the generic Advice term is preferred now.

+ ///

The third parameter, customTargetSource, is new in Spring 1.1; + /// add it to existing implementations of this method.

/// /// the type of the target object /// the name of the target object @@ -130,34 +130,34 @@ namespace Spring.Aop.Framework.AutoProxy /// or an empty array if no additional interceptors but just the common ones; /// or null if no proxy at all, not even with the common interceptors. /// - protected override object[] GetAdvicesAndAdvisorsForObject(Type targetType, string targetName, ITargetSource customTargetSource) - { - IList advisors = FindEligibleAdvisors(targetType, targetName); - if (advisors.Count == 0) - { - return DO_NOT_PROXY; - } - return (object[]) CollectionUtils.ToArray(advisors, typeof (object)); - } - - /// - /// Find all eligible advices and for autoproxying this class. - /// + protected override object[] GetAdvicesAndAdvisorsForObject(Type targetType, string targetName, ITargetSource customTargetSource) + { + IList advisors = FindEligibleAdvisors(targetType, targetName); + if (advisors.Count == 0) + { + return DO_NOT_PROXY; + } + return (object[]) CollectionUtils.ToArray(advisors, typeof (object)); + } + + /// + /// Find all eligible advices and for autoproxying this class. + /// /// the type of the object to be advised - /// the name of the object to be advised + /// the name of the object to be advised /// /// the empty list, not null, if there are no pointcuts or interceptors. /// The by-order sorted list of advisors otherwise - /// - protected IList FindEligibleAdvisors(Type targetType, string targetName) - { - IList candidateAdvisors = FindCandidateAdvisors(targetType, targetName); + /// + protected IList FindEligibleAdvisors(Type targetType, string targetName) + { + IList candidateAdvisors = FindCandidateAdvisors(targetType, targetName); IList eligibleAdvisors = FindAdvisorsThatCanApply(candidateAdvisors, targetType, targetName); ExtendAdvisors(eligibleAdvisors, targetType, targetName); eligibleAdvisors = SortAdvisors(eligibleAdvisors); - - return eligibleAdvisors; + + return eligibleAdvisors; } /// @@ -217,32 +217,32 @@ namespace Spring.Aop.Framework.AutoProxy if (logger.IsInfoEnabled) { logger.Info(string.Format("Candidate advisor [{0}] rejected for targetType [{1}]", candidate, targetType)); - } + } } } return eligibleAdvisors; - } - - - /// - /// Sorts the advisors. - /// - /// The advisors. - /// - protected virtual IList SortAdvisors(IList advisors) - { + } + + + /// + /// Sorts the advisors. + /// + /// The advisors. + /// + protected virtual IList SortAdvisors(IList advisors) + { if (advisors.Count==0) { return advisors; - } - - if (advisors is ArrayList) - ((ArrayList) advisors).Sort(new OrderComparator()); - else if (advisors is Array) - Array.Sort((Array) advisors, new OrderComparator()); - return advisors; - } - + } + + if (advisors is ArrayList) + ((ArrayList) advisors).Sort(new OrderComparator()); + else if (advisors is Array) + Array.Sort((Array) advisors, new OrderComparator()); + return advisors; + } + /// /// Extension hook that subclasses can override to add additional advisors for the given object, /// given the sorted advisors obtained to date.
@@ -256,9 +256,9 @@ namespace Spring.Aop.Framework.AutoProxy /// Advisors that have already been identified as applying to a given object /// the type of the object to be advised /// the name of the object to be advised - protected virtual void ExtendAdvisors(IList advisors, Type objectType, string objectName) - {} - + protected virtual void ExtendAdvisors(IList advisors, Type objectType, string objectName) + {} + /// /// Whether the given advisor is eligible for the specified target. The default implementation /// always returns true. @@ -269,8 +269,8 @@ namespace Spring.Aop.Framework.AutoProxy protected virtual bool IsEligibleAdvisorObject(string advisorName, Type targetType, string targetName) { return true; - } - + } + private class ObjectFactoryAdvisorRetrievalHelperAdapter : ObjectFactoryAdvisorRetrievalHelper { private readonly AbstractAdvisorAutoProxyCreator _owner; @@ -285,6 +285,6 @@ namespace Spring.Aop.Framework.AutoProxy return base.IsEligibleObject(advisorName, objectType, objectName) && _owner.IsEligibleAdvisorObject(advisorName, objectType, objectName); } - } - } + } + } } \ No newline at end of file diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs index b0fa47dc..29c653b1 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs index 02df45d5..57833631 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractFilteringAutoProxyCreator.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion @@ -54,9 +54,9 @@ namespace Spring.Aop.Framework.AutoProxy /// /// Whether an object shall be proxied or not is determined by the result of . /// - /// ingored - /// ignored - /// ignored + /// ingored + /// ignored + /// ignored /// /// Always to indicate, that the object shall be proxied. /// @@ -73,7 +73,7 @@ namespace Spring.Aop.Framework.AutoProxy /// Override this method to allow or reject proxying for the given object. /// /// the object's type - /// the name of the object + /// the name of the object /// /// whether the given object shall be proxied. protected abstract bool IsEligibleForProxying( Type targetType, string targetName ); diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs index 8ff1b7c1..5a2600fc 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AttributeAutoProxyCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,8 +63,8 @@ namespace Spring.Aop.Framework.AutoProxy /// /// Determines, whether the given object shall be proxied by matching against . /// - /// the object's type - /// the name of the object + /// the object's type + /// the name of the object protected override bool IsEligibleForProxying( Type targetType, string targetName ) { AssertUtils.ArgumentNotNull(this.AttributeTypes, "AttributeTypes"); diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs index 57d0c28a..1b441e15 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/DefaultAdvisorAutoProxyCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ #region Imports using System; -using System.Collections; -using Spring.Context; +using System.Collections; +using Spring.Context; using Spring.Objects.Factory; #endregion @@ -72,69 +72,70 @@ namespace Spring.Aop.Framework.AutoProxy set { advisorObjectNamePrefix = value; } } - #endregion - - #region IObjectNameAware Members - - /// - /// Set the name of the object in the object factory that created this object. - /// - /// The name of the object in the factory. - /// - ///

- /// Invoked after population of normal object properties but before an init - /// callback like 's - /// - /// method or a custom init-method. - ///

- /// - public string ObjectName - { - set - { - // If no infrastructure object name prefix has been set, override it. - if (advisorObjectNamePrefix == null) - { - advisorObjectNamePrefix = value + SEPARATOR; - } - } - } - - #endregion - - /// - /// Find all possible advisor candidates to use in auto-proxying - /// - /// the type of the object to be advised - /// the name of the object to be advised - /// the list of candidate advisors - protected override IList FindCandidateAdvisors(Type targetType, string targetName) - { - if (cachedAdvisors == null) { - cachedAdvisors = base.FindCandidateAdvisors(targetType, targetName); - } - return cachedAdvisors; - } + #endregion - /// - /// Whether the given advisor is eligible for the specified target. - /// - /// the advisor name - /// the target object's type - /// the target object's name - protected override bool IsEligibleAdvisorObject(string advisorName, Type targetType, string targetName) - { - return (!usePrefix || advisorName.StartsWith(advisorObjectNamePrefix)) - && base.IsEligibleAdvisorObject(advisorName, targetType, targetName); - } + #region IObjectNameAware Members - /// - /// Validate configuration + /// + /// Set the name of the object in the object factory that created this object. /// - public virtual void AfterPropertiesSet() - { - // eagerly resolve advisors at this stage already to prevent circular dep problems. - // TODO (EE): fix instantiation process to make test "AdvisorAutoProxyCreatorCircularReferencesTests" work. - cachedAdvisors = base.FindCandidateAdvisors(null, null); - } } + /// The name of the object in the factory. + /// + ///

+ /// Invoked after population of normal object properties but before an init + /// callback like 's + /// + /// method or a custom init-method. + ///

+ /// + public string ObjectName + { + set + { + // If no infrastructure object name prefix has been set, override it. + if (advisorObjectNamePrefix == null) + { + advisorObjectNamePrefix = value + SEPARATOR; + } + } + } + + #endregion + + /// + /// Find all possible advisor candidates to use in auto-proxying + /// + /// the type of the object to be advised + /// the name of the object to be advised + /// the list of candidate advisors + protected override IList FindCandidateAdvisors(Type targetType, string targetName) + { + if (cachedAdvisors == null) { + cachedAdvisors = base.FindCandidateAdvisors(targetType, targetName); + } + return cachedAdvisors; + } + + /// + /// Whether the given advisor is eligible for the specified target. + /// + /// the advisor name + /// the target object's type + /// the target object's name + protected override bool IsEligibleAdvisorObject(string advisorName, Type targetType, string targetName) + { + return (!usePrefix || advisorName.StartsWith(advisorObjectNamePrefix)) + && base.IsEligibleAdvisorObject(advisorName, targetType, targetName); + } + + /// + /// Validate configuration + /// + public virtual void AfterPropertiesSet() + { + // eagerly resolve advisors at this stage already to prevent circular dep problems. + // TODO (EE): fix instantiation process to make test "AdvisorAutoProxyCreatorCircularReferencesTests" work. + cachedAdvisors = base.FindCandidateAdvisors(null, null); + } + } } \ No newline at end of file diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs index 8b1703f1..b5bf6215 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ITargetSourceCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InheritanceBasedAopConfigurer.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InheritanceBasedAopConfigurer.cs index 84f203a2..02c40933 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InheritanceBasedAopConfigurer.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/InheritanceBasedAopConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs index db261f05..70b0a01f 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreator.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs index e5456502..cfdb53f6 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs index 6d1f57ca..a60e0a4a 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs index 78e2c23f..32b85454 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/TypeNameAutoProxyCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs index cb4f97de..36b19034 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicMethodInvocation.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion @@ -88,22 +88,22 @@ namespace Spring.Aop.Framework /// If invoking the joinpoint resulted in an exception. /// /// - protected override object InvokeJoinpoint() - { + protected override object InvokeJoinpoint() + { MethodInfo targetMethodInfo = ((this.proxyMethod == null)) ? method : this.proxyMethod; IDynamicMethod targetMethod = new SafeMethod(targetMethodInfo); - try + try { AssertUtils.Understands(target, "target", targetMethodInfo); - return targetMethod.Invoke(target, arguments); - } - // Only happens if fallback to standard reflection. - catch (TargetInvocationException ex) - { - throw ReflectionUtils.UnwrapTargetInvocationException(ex); - } + return targetMethod.Invoke(target, arguments); + } + // Only happens if fallback to standard reflection. + catch (TargetInvocationException ex) + { + throw ReflectionUtils.UnwrapTargetInvocationException(ex); + } } /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs index 29474b7d..36830792 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs index 5dd37dfd..2df586d5 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AbstractAopProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs index 925b3b00..30b4267b 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/AdvisedProxy.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs index 52a7e1ad..430ea164 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseAopProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs index 68c92412..c71f6bda 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/BaseCompositionAopProxy.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs index 675e796c..1cb41710 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs index 9ccf511c..eb865cbd 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CompositionAopProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs index e374b15a..5f0ea1b4 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DecoratorAopProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs index cb006139..55ea6a04 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/DefaultAopProxyFactory.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs index f3aaa8ff..3b880216 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAdvisedProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs index c21f0638..8d523839 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IAopProxyTypeGenerator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs index 1446eb0f..0eacca11 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/InheritanceAopProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs index 139ddf92..ba8f51ea 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/IntroductionProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs index 62519fdf..af57e46e 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/TargetAopProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,16 +88,16 @@ namespace Spring.Aop.Framework.DynamicProxy #if DEBUG target.SetLocalSymInfo("target"); #endif - } - - /// - /// Generates the IL instructions that pushes - /// the target instance on which calls should be delegated to. - /// - /// The IL generator to use. - protected override void PushTarget(ILGenerator il) - { - il.Emit(OpCodes.Ldloc, target); + } + + /// + /// Generates the IL instructions that pushes + /// the target instance on which calls should be delegated to. + /// + /// The IL generator to use. + protected override void PushTarget(ILGenerator il) + { + il.Emit(OpCodes.Ldloc, target); } /// @@ -110,17 +110,17 @@ namespace Spring.Aop.Framework.DynamicProxy /// protected override void GenerateMethodLogic( ILGenerator il, MethodInfo method, MethodInfo interfaceMethod) - { - PushAdvisedProxy(il); - il.Emit(OpCodes.Ldfld, References.TargetSourceField); - il.EmitCall(OpCodes.Callvirt, References.GetTargetMethod, null); + { + PushAdvisedProxy(il); + il.Emit(OpCodes.Ldfld, References.TargetSourceField); + il.EmitCall(OpCodes.Callvirt, References.GetTargetMethod, null); il.Emit(OpCodes.Stloc, target); - base.GenerateMethodLogic(il, method, interfaceMethod); - - PushAdvisedProxy(il); - il.Emit(OpCodes.Ldfld, References.TargetSourceField); - PushTarget(il); + base.GenerateMethodLogic(il, method, interfaceMethod); + + PushAdvisedProxy(il); + il.Emit(OpCodes.Ldfld, References.TargetSourceField); + PushTarget(il); il.EmitCall(OpCodes.Callvirt, References.GetReleaseTargetMethod, null); } diff --git a/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs index 2e10f490..af1b0406 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/HashtableCachingAdvisorChainFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ namespace Spring.Aop.Framework /// Aleksandar Seovic (.NET) [Serializable] public sealed class HashtableCachingAdvisorChainFactory : IAdvisorChainFactory - { + { private readonly IDictionary methodCache = new ListDictionary(); /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs index e5e225f8..adb601d8 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvised.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs index 3df7f1b2..ae9be3d1 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvisedSupportListener.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs index 95f14c2e..22d53a81 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAdvisorChainFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs b/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs index e4bc35ad..84718074 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAopProxy.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs index caddb888..d33f3cbc 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/IAopProxyFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs b/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs index d5fcbd53..da6d57fd 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ITargetAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs index 98b54635..8ee81040 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/InterceptorAndDynamicMethodMatcher.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs index aa6bcc66..bfceeadd 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyConfig.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,11 @@ #region Imports using System; -using System.Text; +using System.Text; using System.Reflection; using Spring.Aop.Framework.DynamicProxy; using Spring.Core.TypeResolution; -using Spring.Util; +using Spring.Util; using Spring.Reflection.Dynamic; #endregion @@ -52,16 +52,16 @@ namespace Spring.Aop.Framework [Serializable] public class ProxyConfig { - #region Fields - - private static readonly IDynamicConstructor cachedAopProxyFactoryDynCtor = + #region Fields + + private static readonly IDynamicConstructor cachedAopProxyFactoryDynCtor = new SafeConstructor(typeof(ProxyConfig).Assembly.GetType("Spring.Aop.Framework.DynamicProxy.CachedAopProxyFactory", false, false).GetConstructor(Type.EmptyTypes)); private bool proxyTargetType; private bool proxyTargetAttributes = true; private bool optimize; - private bool frozen; - + private bool frozen; + private IAopProxyFactory aopProxyFactory = cachedAopProxyFactoryDynCtor.Invoke(ObjectUtils.EmptyObjects) as IAopProxyFactory; private bool exposeProxy; diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs index 20b7cffb..7b851877 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,36 +74,36 @@ namespace Spring.Aop.Framework /// /// The interfaces to implement. public ProxyFactory(Type[] interfaces) : base(interfaces) - { - } - - /// - /// Creates a new instance of the class for the - /// given interface and interceptor. - /// - /// Convenience method for creating a proxy for a single interceptor - /// , assuming that the interceptor handles all calls itself rather than delegating - /// to a target, like in the case of remoting proxies. - /// The interface that the proxy should implement. - /// The interceptor that the proxy should invoke. - public ProxyFactory(Type proxyInterface, IInterceptor interceptor) - { - AddInterface(proxyInterface); - AddAdvice(interceptor); - } - - - /// - /// Create a new instance of the class for the specified - /// making the proxy implement the specified interface. - /// - /// - /// The interface that the proxy should implement. - /// The target source that the proxy should invoek. + { + } + + /// + /// Creates a new instance of the class for the + /// given interface and interceptor. + /// + /// Convenience method for creating a proxy for a single interceptor + /// , assuming that the interceptor handles all calls itself rather than delegating + /// to a target, like in the case of remoting proxies. + /// The interface that the proxy should implement. + /// The interceptor that the proxy should invoke. + public ProxyFactory(Type proxyInterface, IInterceptor interceptor) + { + AddInterface(proxyInterface); + AddAdvice(interceptor); + } + + + /// + /// Create a new instance of the class for the specified + /// making the proxy implement the specified interface. + /// + /// + /// The interface that the proxy should implement. + /// The target source that the proxy should invoek. public ProxyFactory(Type proxyInterface, ITargetSource targetSource) - { - AddInterface(proxyInterface); - TargetSource = targetSource; + { + AddInterface(proxyInterface); + TargetSource = targetSource; } /// diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs index 7aa4349f..c75ee568 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs b/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs index 01fb1923..5f06d76e 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ReflectiveMethodInvocation.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,9 +91,9 @@ namespace Spring.Aop.Framework protected override object InvokeJoinpoint() { try - { - MethodInfo targetMethodInfo = ((this.proxyMethod == null)) ? method : this.proxyMethod; - + { + MethodInfo targetMethodInfo = ((this.proxyMethod == null)) ? method : this.proxyMethod; + AssertUtils.Understands(target, "target", targetMethodInfo); return targetMethodInfo.Invoke(target, arguments); } @@ -101,7 +101,7 @@ namespace Spring.Aop.Framework { throw ReflectionUtils.UnwrapTargetInvocationException(ex); } - } + } /// /// Creates a new instance diff --git a/src/Spring/Spring.Aop/Aop/IAdvisor.cs b/src/Spring/Spring.Aop/Aop/IAdvisor.cs index 2667ceb3..ed1841cf 100644 --- a/src/Spring/Spring.Aop/Aop/IAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/IAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IAdvisors.cs b/src/Spring/Spring.Aop/Aop/IAdvisors.cs index 4e5695d2..e06efa0e 100644 --- a/src/Spring/Spring.Aop/Aop/IAdvisors.cs +++ b/src/Spring/Spring.Aop/Aop/IAdvisors.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs b/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs index 5c7c3362..c634c20c 100644 --- a/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IAfterReturningAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs b/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs index 75ae53aa..a865326a 100644 --- a/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IBeforeAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs b/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs index 0cf3d2d6..cb7b20fa 100644 --- a/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/IIntroductionAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs b/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs index a510feaa..7ab3f605 100644 --- a/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/IIntroductionInterceptor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs b/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs index 9bee8d3d..3057bf70 100644 --- a/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IMethodBeforeAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs index 10e264be..35fe4b3b 100644 --- a/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/IMethodMatcher.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IPointcut.cs b/src/Spring/Spring.Aop/Aop/IPointcut.cs index 8271e578..346edbad 100644 --- a/src/Spring/Spring.Aop/Aop/IPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/IPointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs index f4b34843..13915f01 100644 --- a/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/IPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/ITargetSource.cs b/src/Spring/Spring.Aop/Aop/ITargetSource.cs index d421b8ca..4d1ba7e7 100644 --- a/src/Spring/Spring.Aop/Aop/ITargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/ITargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs b/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs index c125f2f5..b7db9921 100644 --- a/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs +++ b/src/Spring/Spring.Aop/Aop/IThrowsAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/ITypeFilter.cs b/src/Spring/Spring.Aop/Aop/ITypeFilter.cs index f92158c6..c142c61d 100644 --- a/src/Spring/Spring.Aop/Aop/ITypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/ITypeFilter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs index eb6419cc..39f047e8 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AbstractRegularExpressionMethodPointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs index e58e4e5a..2c252d29 100644 --- a/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/AttributeMatchMethodPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,15 +63,15 @@ namespace Spring.Aop.Support /// Creates a new instance of the /// class /// for the supplied . - /// - /// - /// The to match. - /// - /// - /// Flag that controls whether or not the inheritance tree of the - /// method to be included in the search for the ? - /// - /// the advice to apply if the pointcut matches + /// + /// + /// The to match. + /// + /// + /// Flag that controls whether or not the inheritance tree of the + /// method to be included in the search for the ? + /// + /// the advice to apply if the pointcut matches public AttributeMatchMethodPointcutAdvisor(Type attribute, bool inherit, IAdvice advice) :base(attribute, inherit) { diff --git a/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs b/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs index db796094..fab2ba1a 100644 --- a/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/ComposablePointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs index 99e22c2d..1ab41417 100644 --- a/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/ControlFlowPointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs index 97655908..2a5f7e09 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DefaultIntroductionAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -237,44 +237,44 @@ namespace Spring.Aop.Support } } - /// - /// 2 IntroductionAdvisors are considered equal if - /// a) they are of the same type - /// b) their introduction advices are equal - /// c) they introduce the same interfaces - /// - public bool Equals(DefaultIntroductionAdvisor other) - { - if (ReferenceEquals(null, other)) return false; - if (ReferenceEquals(this, other)) return true; - if (other.GetType() != this.GetType()) - return false; - return Equals(other._introduction, _introduction) && Equals(other._interfaces, _interfaces); - } - - /// - /// 2 IntroductionAdvisors are considered equal if - /// a) they are of the same type - /// b) their introduction advices are equal - /// c) they introduce the same interfaces - /// - public override bool Equals(object obj) - { - return Equals(obj as DefaultIntroductionAdvisor); - } - - /// - /// 2 IntroductionAdvisors are considered equal if - /// a) they are of the same type - /// b) their introduction advices are equal - /// c) they introduce the same interfaces - /// - public override int GetHashCode() - { - unchecked - { - return ((_introduction != null ? _introduction.GetHashCode() : 0)*397) ^ (_interfaces != null ? _interfaces.GetHashCode() : 0); - } + /// + /// 2 IntroductionAdvisors are considered equal if + /// a) they are of the same type + /// b) their introduction advices are equal + /// c) they introduce the same interfaces + /// + public bool Equals(DefaultIntroductionAdvisor other) + { + if (ReferenceEquals(null, other)) return false; + if (ReferenceEquals(this, other)) return true; + if (other.GetType() != this.GetType()) + return false; + return Equals(other._introduction, _introduction) && Equals(other._interfaces, _interfaces); + } + + /// + /// 2 IntroductionAdvisors are considered equal if + /// a) they are of the same type + /// b) their introduction advices are equal + /// c) they introduce the same interfaces + /// + public override bool Equals(object obj) + { + return Equals(obj as DefaultIntroductionAdvisor); + } + + /// + /// 2 IntroductionAdvisors are considered equal if + /// a) they are of the same type + /// b) their introduction advices are equal + /// c) they introduce the same interfaces + /// + public override int GetHashCode() + { + unchecked + { + return ((_introduction != null ? _introduction.GetHashCode() : 0)*397) ^ (_interfaces != null ? _interfaces.GetHashCode() : 0); + } } } } \ No newline at end of file diff --git a/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs index 80e6a803..88d8027d 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DefaultPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,27 +89,27 @@ namespace Spring.Aop.Support { get { return pointcut; } set { pointcut = value;} - } - - - /// - /// 2 s are considered equal, if - /// a) their pointcuts are equal - /// b) their advices are equal - /// - public override bool Equals(object obj) - { - return base.Equals(obj as DefaultPointcutAdvisor); - } - - /// - /// Calculates a unique hashcode based on advice + pointcut - /// - public override int GetHashCode() - { - return base.GetHashCode(); + } + + + /// + /// 2 s are considered equal, if + /// a) their pointcuts are equal + /// b) their advices are equal + /// + public override bool Equals(object obj) + { + return base.Equals(obj as DefaultPointcutAdvisor); } - + + /// + /// Calculates a unique hashcode based on advice + pointcut + /// + public override int GetHashCode() + { + return base.GetHashCode(); + } + /// /// Returns a that represents the current /// . diff --git a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs index cc507663..4f72ced2 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcher.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,8 +32,8 @@ namespace Spring.Aop.Support /// care about arguments at runtime. /// /// Rod Johnson - /// Aleksandar Seovic (.NET) - [Serializable] + /// Aleksandar Seovic (.NET) + [Serializable] public abstract class DynamicMethodMatcher : IMethodMatcher { #region Constructor (s) / Destructor diff --git a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs index d61f728e..03e3ec2f 100644 --- a/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/DynamicMethodMatcherPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs b/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs index 441d40b0..84e8e61d 100644 --- a/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs +++ b/src/Spring/Spring.Aop/Aop/Support/MethodMatchers.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs index bb08c266..5018ebdf 100644 --- a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs index 5b046f3b..e965f4f1 100644 --- a/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/NameMatchMethodPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs b/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs index dd81be7e..8d43c3f2 100644 --- a/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs +++ b/src/Spring/Spring.Aop/Aop/Support/Pointcuts.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs index 9f284730..da837609 100644 --- a/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/RegularExpressionMethodPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs b/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs index 47648997..401bcf97 100644 --- a/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/Support/RootTypeFilter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs index 709aa550..dd520593 100644 --- a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcher.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #region Imports using System; -using System.Reflection; +using System.Reflection; using System.Runtime.Serialization; #endregion @@ -98,23 +98,23 @@ namespace Spring.Aop.Support /// /// if this this method matches statically. /// - public abstract bool Matches(MethodInfo method, Type targetType); - - - #region Serialization Support - - void IDeserializationCallback.OnDeserialization(object sender) - { - OnDeserialization(sender); - } - - /// - /// Override in case you need to initialized non-serialized fields on deserialization. - /// - protected virtual void OnDeserialization(object sender) - { + public abstract bool Matches(MethodInfo method, Type targetType); + + + #region Serialization Support + + void IDeserializationCallback.OnDeserialization(object sender) + { + OnDeserialization(sender); } - - #endregion + + /// + /// Override in case you need to initialized non-serialized fields on deserialization. + /// + protected virtual void OnDeserialization(object sender) + { + } + + #endregion } } \ No newline at end of file diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs index dadae07c..fd6aba77 100644 --- a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs index b018e349..d3b03b7b 100644 --- a/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs +++ b/src/Spring/Spring.Aop/Aop/Support/StaticMethodMatcherPointcutAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs b/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs index cc63e6d8..92cec090 100644 --- a/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs +++ b/src/Spring/Spring.Aop/Aop/Support/TypeFilters.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs b/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs index 3cde3dda..4121a88a 100644 --- a/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/Support/TypeNameTypeFilter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,11 +27,11 @@ using Spring.Util; namespace Spring.Aop.Support { - /// - /// Simple implementation that matches + /// + /// Simple implementation that matches /// a given 's against . - /// For a list of supported pattern syntax see . - /// + /// For a list of supported pattern syntax see . + /// /// Erich Eichinger /// public class TypeNameTypeFilter : ITypeFilter @@ -58,14 +58,14 @@ namespace Spring.Aop.Support _typeNamePatterns = patterns; } - /// - /// Does the supplied type's match any of the ? - /// - /// - /// The candidate . - /// - /// - /// if the matches any of the . + /// + /// Does the supplied type's match any of the ? + /// + /// + /// The candidate . + /// + /// + /// if the matches any of the . /// public bool Matches(Type type) { diff --git a/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs index be2bec89..a9b1fdcc 100644 --- a/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/UnionPointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,7 +85,7 @@ namespace Spring.Aop.Support /// /// Internal method matcher class for union pointcut. - /// + /// [Serializable] private sealed class PointcutUnionMethodMatcher : IMethodMatcher { diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs index 757b00ac..7e3e017f 100644 --- a/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPoolingTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs index 1fb9c892..d03dd4fb 100644 --- a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs index 6c2f891f..fcef3f08 100644 --- a/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/EmptyTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs index 2aff8064..5777f281 100644 --- a/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/HotSwappableTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,12 +67,12 @@ namespace Spring.Aop.Target /// public virtual Type TargetType { - get - { - lock(this) - { - return _target.GetType(); - } + get + { + lock(this) + { + return _target.GetType(); + } } } diff --git a/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs b/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs index 7f6f5fd5..0a3619a4 100644 --- a/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs +++ b/src/Spring/Spring.Aop/Aop/Target/IThreadLocalTargetSourceStats.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs b/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs index d52da674..0e261cd3 100644 --- a/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs +++ b/src/Spring/Spring.Aop/Aop/Target/PoolingConfig.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs index 0e97ce09..c142631c 100644 --- a/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/PrototypeTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs index 24e81f8d..4721b570 100644 --- a/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs index 8644e166..582591bf 100644 --- a/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/SingletonTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ namespace Spring.Aop.Target [Serializable] public sealed class SingletonTargetSource : ITargetSource { - private readonly object target; + private readonly object target; private readonly Type targetType; /// @@ -67,7 +67,7 @@ namespace Spring.Aop.Target /// for the specified target object. /// /// The target object to expose. - /// The type of to expose. + /// The type of to expose. /// /// If the supplied is /// . @@ -76,7 +76,7 @@ namespace Spring.Aop.Target { AssertUtils.ArgumentNotNull(target, "target"); AssertUtils.ArgumentNotNull(targetType, "targetType"); - this.target = target; + this.target = target; this.targetType = targetType; } diff --git a/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs index 05b4dabe..79d2b19a 100644 --- a/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/ThreadLocalTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs b/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs index 8f8f3d43..c8dc33c5 100644 --- a/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs +++ b/src/Spring/Spring.Aop/Aop/TrueMethodMatcher.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/TruePointcut.cs b/src/Spring/Spring.Aop/Aop/TruePointcut.cs index 7f29540b..0ccf7f5a 100644 --- a/src/Spring/Spring.Aop/Aop/TruePointcut.cs +++ b/src/Spring/Spring.Aop/Aop/TruePointcut.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs b/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs index bf558866..56f8c4d0 100644 --- a/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs +++ b/src/Spring/Spring.Aop/Aop/TrueTypeFilter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs index 111722a3..cc591d2f 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs index 0cec6697..43db0ffc 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheAspect.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs index 32f0d89f..91d624f4 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ #region Imports -using System; -using System.Collections; +using System; +using System.Collections; using System.Reflection; using Common.Logging; using Spring.Aop; @@ -52,41 +52,41 @@ namespace Spring.Aspects.Cache /// /// /// Aleksandar Seovic - public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice - { - #region CacheParameterAttribute caching - + public class CacheParameterAdvice : BaseCacheAdvice, IAfterReturningAdvice + { + #region CacheParameterAttribute caching + private class CacheParameterInfo - { - public readonly ParameterInfo[] Parameters; - public readonly CacheParameterAttribute[][] CacheParameterAttributes; - - public CacheParameterInfo(ParameterInfo[] parameters, CacheParameterAttribute[][] cacheParameterAttributes) - { - Parameters = parameters; - CacheParameterAttributes = cacheParameterAttributes; - } + { + public readonly ParameterInfo[] Parameters; + public readonly CacheParameterAttribute[][] CacheParameterAttributes; + + public CacheParameterInfo(ParameterInfo[] parameters, CacheParameterAttribute[][] cacheParameterAttributes) + { + Parameters = parameters; + CacheParameterAttributes = cacheParameterAttributes; + } } - private readonly Hashtable _cacheParameterInfoCache = new Hashtable(); - - private CacheParameterInfo GetCacheParameterInfo(MethodInfo method) - { - CacheParameterInfo cpi = (CacheParameterInfo)_cacheParameterInfoCache[method]; - if (cpi == null) - { - ParameterInfo[] parameters = method.GetParameters(); - CacheParameterAttribute[][] parameterInfos = new CacheParameterAttribute[parameters.Length][]; - for (int i = 0; i < parameters.Length; i++) - { - ParameterInfo p = parameters[i]; - CacheParameterAttribute[] paramInfoArray = (CacheParameterAttribute[])GetCustomAttributes(p, typeof(CacheParameterAttribute)); - parameterInfos[i] = paramInfoArray; - } - cpi = new CacheParameterInfo(parameters, parameterInfos); - _cacheParameterInfoCache[method] = cpi; - } - return cpi; + private readonly Hashtable _cacheParameterInfoCache = new Hashtable(); + + private CacheParameterInfo GetCacheParameterInfo(MethodInfo method) + { + CacheParameterInfo cpi = (CacheParameterInfo)_cacheParameterInfoCache[method]; + if (cpi == null) + { + ParameterInfo[] parameters = method.GetParameters(); + CacheParameterAttribute[][] parameterInfos = new CacheParameterAttribute[parameters.Length][]; + for (int i = 0; i < parameters.Length; i++) + { + ParameterInfo p = parameters[i]; + CacheParameterAttribute[] paramInfoArray = (CacheParameterAttribute[])GetCustomAttributes(p, typeof(CacheParameterAttribute)); + parameterInfos[i] = paramInfoArray; + } + cpi = new CacheParameterInfo(parameters, parameterInfos); + _cacheParameterInfoCache[method] = cpi; + } + return cpi; } #endregion @@ -112,42 +112,42 @@ namespace Spring.Aspects.Cache /// The intercepted method's arguments. /// The target object. /// - public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target) - { - #region Instrumentation - bool isLogDebugEnabled = logger.IsDebugEnabled; - #endregion - - CacheParameterInfo cpi = GetCacheParameterInfo(method); - CacheParameterAttribute[][] cacheParameterAttributes = cpi.CacheParameterAttributes; - - if (cacheParameterAttributes.Length > 0) - { - IDictionary vars = PrepareVariables(method, arguments); - for (int i = 0; i < cacheParameterAttributes.Length; i++) - { - foreach (CacheParameterAttribute paramInfo in cacheParameterAttributes[i]) - { - AssertUtils.ArgumentNotNull(paramInfo.KeyExpression, "Key", - "The cache attribute is missing the key definition."); - - if (EvalCondition(paramInfo.Condition, paramInfo.ConditionExpression, arguments[i], vars)) - { - ICache cache = GetCache(paramInfo.CacheName); - - object key = paramInfo.KeyExpression.GetValue(arguments[i], vars); - - #region Instrumentation - if (isLogDebugEnabled) - { - logger.Debug(string.Format("Caching parameter for key [{0}] into cache [{1}].", key, paramInfo.CacheName)); - } - #endregion - - cache.Insert(key, arguments[i], paramInfo.TimeToLiveTimeSpan); - } - } - } + public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target) + { + #region Instrumentation + bool isLogDebugEnabled = logger.IsDebugEnabled; + #endregion + + CacheParameterInfo cpi = GetCacheParameterInfo(method); + CacheParameterAttribute[][] cacheParameterAttributes = cpi.CacheParameterAttributes; + + if (cacheParameterAttributes.Length > 0) + { + IDictionary vars = PrepareVariables(method, arguments); + for (int i = 0; i < cacheParameterAttributes.Length; i++) + { + foreach (CacheParameterAttribute paramInfo in cacheParameterAttributes[i]) + { + AssertUtils.ArgumentNotNull(paramInfo.KeyExpression, "Key", + "The cache attribute is missing the key definition."); + + if (EvalCondition(paramInfo.Condition, paramInfo.ConditionExpression, arguments[i], vars)) + { + ICache cache = GetCache(paramInfo.CacheName); + + object key = paramInfo.KeyExpression.GetValue(arguments[i], vars); + + #region Instrumentation + if (isLogDebugEnabled) + { + logger.Debug(string.Format("Caching parameter for key [{0}] into cache [{1}].", key, paramInfo.CacheName)); + } + #endregion + + cache.Insert(key, arguments[i], paramInfo.TimeToLiveTimeSpan); + } + } + } } } } diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs index f4ab8e21..48335baf 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheParameterAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs index 5ea3362f..c3f2fa50 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs index e3b4adcd..bd063b78 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/CacheResultAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs index a3108801..4453f9dd 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,25 +53,25 @@ namespace Spring.Aspects.Cache /// /// /// Aleksandar Seovic - public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice - { - #region InvalidateCacheAttribute caching - - private readonly Hashtable _invalidateCacheAttributeCache = new Hashtable(); - - private InvalidateCacheAttribute[] GetInvalidateCacheInfo(MethodInfo method) - { - InvalidateCacheAttribute[] cacheInfoArray = (InvalidateCacheAttribute[])_invalidateCacheAttributeCache[method]; - if (cacheInfoArray == null) - { - cacheInfoArray = (InvalidateCacheAttribute[])GetCustomAttributes(method, typeof(InvalidateCacheAttribute)); - _invalidateCacheAttributeCache[method] = cacheInfoArray; - } - return cacheInfoArray; - } - - #endregion - + public class InvalidateCacheAdvice : BaseCacheAdvice, IAfterReturningAdvice + { + #region InvalidateCacheAttribute caching + + private readonly Hashtable _invalidateCacheAttributeCache = new Hashtable(); + + private InvalidateCacheAttribute[] GetInvalidateCacheInfo(MethodInfo method) + { + InvalidateCacheAttribute[] cacheInfoArray = (InvalidateCacheAttribute[])_invalidateCacheAttributeCache[method]; + if (cacheInfoArray == null) + { + cacheInfoArray = (InvalidateCacheAttribute[])GetCustomAttributes(method, typeof(InvalidateCacheAttribute)); + _invalidateCacheAttributeCache[method] = cacheInfoArray; + } + return cacheInfoArray; + } + + #endregion + /// /// Executes after /// returns successfully. @@ -94,9 +94,9 @@ namespace Spring.Aspects.Cache /// The target object. /// public void AfterReturning(object returnValue, MethodInfo method, object[] arguments, object target) - { - #region Instrumentation - bool isLogDebugEnabled = logger.IsDebugEnabled; + { + #region Instrumentation + bool isLogDebugEnabled = logger.IsDebugEnabled; #endregion InvalidateCacheAttribute[] cacheInfoArray = GetInvalidateCacheInfo(method); @@ -111,36 +111,36 @@ namespace Spring.Aspects.Cache ICache cache = GetCache(cacheInfo.CacheName); if (cacheInfo.KeysExpression != null) - { + { object keys = cacheInfo.KeysExpression.GetValue(returnValue, vars); if (keys is ICollection) - { - #region Instrumentation - if (isLogDebugEnabled) - { - logger.Debug(string.Format("Removing objects for keys [{0}] from cache [{1}].", keys, cacheInfo.CacheName)); - } + { + #region Instrumentation + if (isLogDebugEnabled) + { + logger.Debug(string.Format("Removing objects for keys [{0}] from cache [{1}].", keys, cacheInfo.CacheName)); + } #endregion cache.RemoveAll(keys as ICollection); } else - { - #region Instrumentation - if (isLogDebugEnabled) - { - logger.Debug(string.Format("Removing object for key [{0}] from cache [{1}].", keys, cacheInfo.CacheName)); - } + { + #region Instrumentation + if (isLogDebugEnabled) + { + logger.Debug(string.Format("Removing object for key [{0}] from cache [{1}].", keys, cacheInfo.CacheName)); + } #endregion cache.Remove(keys); } } else - { - #region Instrumentation - if (isLogDebugEnabled) - { - logger.Debug(string.Format("Invalidate cache [{0}].", cacheInfo.CacheName)); - } + { + #region Instrumentation + if (isLogDebugEnabled) + { + logger.Debug(string.Format("Invalidate cache [{0}].", cacheInfo.CacheName)); + } #endregion cache.Clear(); } diff --git a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs index 115b1c79..fb00cfb2 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/InvalidateCacheAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs index abd62c70..a7877517 100644 --- a/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs +++ b/src/Spring/Spring.Aop/Aspects/Validation/ParameterValidationAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/AssemblyInfo.cs b/src/Spring/Spring.Core/AssemblyInfo.cs index f93bbce6..47df9e64 100644 --- a/src/Spring/Spring.Core/AssemblyInfo.cs +++ b/src/Spring/Spring.Core/AssemblyInfo.cs @@ -1,43 +1,43 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + using System; -using System.Reflection; -using System.Runtime.InteropServices; +using System.Reflection; +using System.Runtime.InteropServices; using System.Security; - -[assembly: ComVisible(false)] -[assembly: AssemblyTitle("Spring.Core")] -[assembly: AssemblyDescription("Core functionality for Spring.Net IoC container")] - -// -// Security Permissions -// + +[assembly: ComVisible(false)] +[assembly: AssemblyTitle("Spring.Core")] +[assembly: AssemblyDescription("Core functionality for Spring.Net IoC container")] + +// +// Security Permissions +// // we need full, unrestricted access to reflection metadata... //[assembly: ReflectionPermission(SecurityAction.RequestMinimum, Unrestricted = true)] -//[assembly: AssemblyKeyFile(@"C:\users\aseovic\projects\OpenSource\Spring.Net\Spring.Net.PrivateKey.keys")] -//[assembly: AssemblyKeyFile(@"C:\projects\Spring.Net\Spring.Net.snk")] - -#if !NET_4_0 -[assembly: AllowPartiallyTrustedCallers] - +//[assembly: AssemblyKeyFile(@"C:\users\aseovic\projects\OpenSource\Spring.Net\Spring.Net.PrivateKey.keys")] +//[assembly: AssemblyKeyFile(@"C:\projects\Spring.Net\Spring.Net.snk")] + +#if !NET_4_0 +[assembly: AllowPartiallyTrustedCallers] + [assembly: SecurityCritical] #endif diff --git a/src/Spring/Spring.Core/Collections/AbstractQueue.cs b/src/Spring/Spring.Core/Collections/AbstractQueue.cs index 8317d12e..50190f4d 100644 --- a/src/Spring/Spring.Core/Collections/AbstractQueue.cs +++ b/src/Spring/Spring.Core/Collections/AbstractQueue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/DictionarySet.cs b/src/Spring/Spring.Core/Collections/DictionarySet.cs index 6e811185..ee9373c7 100644 --- a/src/Spring/Spring.Core/Collections/DictionarySet.cs +++ b/src/Spring/Spring.Core/Collections/DictionarySet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs b/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs index 1b7c8d42..f426f7cb 100644 --- a/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/DictionarySet.cs @@ -1,4 +1,4 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #if NET_2_0 diff --git a/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs b/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs index b568b76a..54d6cbce 100644 --- a/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/HashedSet.cs @@ -1,4 +1,4 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #if NET_2_0 diff --git a/src/Spring/Spring.Core/Collections/Generic/ISet.cs b/src/Spring/Spring.Core/Collections/Generic/ISet.cs index 86f100da..2552ffa6 100644 --- a/src/Spring/Spring.Core/Collections/Generic/ISet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/ISet.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs b/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs index 22a7a771..e4f1b3fd 100644 --- a/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/ImmutableSet.cs @@ -1,4 +1,4 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #if NET_2_0 diff --git a/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs b/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs index 7e084bb4..b0e89f11 100644 --- a/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/OrderedSet.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Collections/Generic/Set.cs b/src/Spring/Spring.Core/Collections/Generic/Set.cs index b81c3f79..2e331f55 100644 --- a/src/Spring/Spring.Core/Collections/Generic/Set.cs +++ b/src/Spring/Spring.Core/Collections/Generic/Set.cs @@ -1,4 +1,4 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #if NET_2_0 diff --git a/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs b/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs index 49f9ad0a..48e2624e 100644 --- a/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/SortedSet.cs @@ -1,4 +1,4 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #if NET_2_0 diff --git a/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs b/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs index 33b2acfb..83eed0a4 100644 --- a/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs +++ b/src/Spring/Spring.Core/Collections/Generic/SynchronizedSet.cs @@ -1,4 +1,4 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #if NET_2_0 diff --git a/src/Spring/Spring.Core/Collections/HashedSet.cs b/src/Spring/Spring.Core/Collections/HashedSet.cs index c8824a61..20e467fb 100644 --- a/src/Spring/Spring.Core/Collections/HashedSet.cs +++ b/src/Spring/Spring.Core/Collections/HashedSet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/HybridSet.cs b/src/Spring/Spring.Core/Collections/HybridSet.cs index e4a705ad..a7994ac1 100644 --- a/src/Spring/Spring.Core/Collections/HybridSet.cs +++ b/src/Spring/Spring.Core/Collections/HybridSet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,15 +57,15 @@ namespace Spring.Collections public HybridSet() { InternalDictionary = new HybridDictionary(); - } - - /// - /// Initializes a new instance of the class with a given capacity - /// - /// The size. - public HybridSet(int size) - { - InternalDictionary = new HybridDictionary(size); + } + + /// + /// Initializes a new instance of the class with a given capacity + /// + /// The size. + public HybridSet(int size) + { + InternalDictionary = new HybridDictionary(size); } /// diff --git a/src/Spring/Spring.Core/Collections/IQueue.cs b/src/Spring/Spring.Core/Collections/IQueue.cs index 44c1cb85..0bfa9fc3 100644 --- a/src/Spring/Spring.Core/Collections/IQueue.cs +++ b/src/Spring/Spring.Core/Collections/IQueue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/ISet.cs b/src/Spring/Spring.Core/Collections/ISet.cs index fed239ff..ebe347e2 100644 --- a/src/Spring/Spring.Core/Collections/ISet.cs +++ b/src/Spring/Spring.Core/Collections/ISet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/ImmutableSet.cs b/src/Spring/Spring.Core/Collections/ImmutableSet.cs index 31891590..c2bcc415 100644 --- a/src/Spring/Spring.Core/Collections/ImmutableSet.cs +++ b/src/Spring/Spring.Core/Collections/ImmutableSet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/LinkedList.cs b/src/Spring/Spring.Core/Collections/LinkedList.cs index f8662a86..4f32e057 100644 --- a/src/Spring/Spring.Core/Collections/LinkedList.cs +++ b/src/Spring/Spring.Core/Collections/LinkedList.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/ListSet.cs b/src/Spring/Spring.Core/Collections/ListSet.cs index 8abd2db1..921fa81e 100644 --- a/src/Spring/Spring.Core/Collections/ListSet.cs +++ b/src/Spring/Spring.Core/Collections/ListSet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/NoElementsException.cs b/src/Spring/Spring.Core/Collections/NoElementsException.cs index b237964c..3aeb122b 100644 --- a/src/Spring/Spring.Core/Collections/NoElementsException.cs +++ b/src/Spring/Spring.Core/Collections/NoElementsException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/PriorityQueue.cs b/src/Spring/Spring.Core/Collections/PriorityQueue.cs index 5737939a..1447f6cb 100644 --- a/src/Spring/Spring.Core/Collections/PriorityQueue.cs +++ b/src/Spring/Spring.Core/Collections/PriorityQueue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/Set.cs b/src/Spring/Spring.Core/Collections/Set.cs index a8541b3e..7f053dc4 100644 --- a/src/Spring/Spring.Core/Collections/Set.cs +++ b/src/Spring/Spring.Core/Collections/Set.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/SortedSet.cs b/src/Spring/Spring.Core/Collections/SortedSet.cs index b3218f80..6729ad97 100644 --- a/src/Spring/Spring.Core/Collections/SortedSet.cs +++ b/src/Spring/Spring.Core/Collections/SortedSet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Collections/SynchronizedSet.cs b/src/Spring/Spring.Core/Collections/SynchronizedSet.cs index 17ab4572..5932d3f6 100644 --- a/src/Spring/Spring.Core/Collections/SynchronizedSet.cs +++ b/src/Spring/Spring.Core/Collections/SynchronizedSet.cs @@ -1,9 +1,9 @@ -/* Copyright © 2002-2010 by Aidant Systems, Inc., and by Jason Smith. */ +/* Copyright © 2002-2011 by Aidant Systems, Inc., and by Jason Smith. */ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/ApplicationContextException.cs b/src/Spring/Spring.Core/Context/ApplicationContextException.cs index f00ae730..bbf1e61e 100644 --- a/src/Spring/Spring.Core/Context/ApplicationContextException.cs +++ b/src/Spring/Spring.Core/Context/ApplicationContextException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs b/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs index 9f0e76b2..a3f83974 100644 --- a/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs +++ b/src/Spring/Spring.Core/Context/ApplicationEventArgs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/EventListenerAttribute.cs b/src/Spring/Spring.Core/Context/EventListenerAttribute.cs index 5e792ffb..bf54feca 100644 --- a/src/Spring/Spring.Core/Context/EventListenerAttribute.cs +++ b/src/Spring/Spring.Core/Context/EventListenerAttribute.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs b/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs index aadcac27..bdd4ec8e 100644 --- a/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs +++ b/src/Spring/Spring.Core/Context/Events/ConsoleListener.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs b/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs index 683c9e8d..c4ed3e84 100644 --- a/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs +++ b/src/Spring/Spring.Core/Context/Events/ContextEventArgs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,29 +79,29 @@ namespace Spring.Context.Events CultureInfo.InvariantCulture, "{0} [{1}]", GetType().Name, Event); } - } - - /// - /// Event object sent to listeners registered with an - /// to inform them of - /// context lifecycle event. - /// + } + + /// + /// Event object sent to listeners registered with an + /// to inform them of + /// context lifecycle event. + /// public class ContextRefreshedEventArgs : ContextEventArgs - { - public ContextRefreshedEventArgs() : base(ContextEvent.Refreshed) - { - } - } - - /// - /// Event object sent to listeners registered with an - /// to inform them of - /// context lifecycle event. - /// + { + public ContextRefreshedEventArgs() : base(ContextEvent.Refreshed) + { + } + } + + /// + /// Event object sent to listeners registered with an + /// to inform them of + /// context lifecycle event. + /// public class ContextClosedEventArgs : ContextEventArgs - { - public ContextClosedEventArgs() : base(ContextEvent.Closed) - { - } + { + public ContextClosedEventArgs() : base(ContextEvent.Closed) + { + } } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Context/IApplicationContext.cs b/src/Spring/Spring.Core/Context/IApplicationContext.cs index c63fa958..cb0c819d 100644 --- a/src/Spring/Spring.Core/Context/IApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/IApplicationContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IApplicationContextAware.cs b/src/Spring/Spring.Core/Context/IApplicationContextAware.cs index c84c89e2..a0f46c77 100644 --- a/src/Spring/Spring.Core/Context/IApplicationContextAware.cs +++ b/src/Spring/Spring.Core/Context/IApplicationContextAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IApplicationEventListener.cs b/src/Spring/Spring.Core/Context/IApplicationEventListener.cs index 63ecfc9d..9f20ee3b 100644 --- a/src/Spring/Spring.Core/Context/IApplicationEventListener.cs +++ b/src/Spring/Spring.Core/Context/IApplicationEventListener.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs b/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs index d89756db..8278b382 100644 --- a/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs +++ b/src/Spring/Spring.Core/Context/IApplicationEventPublisher.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs b/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs index 115f2b80..91778551 100644 --- a/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/IConfigurableApplicationContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs b/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs index 4b843045..e76b9f7e 100644 --- a/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs +++ b/src/Spring/Spring.Core/Context/IHierarchicalMessageSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/ILifecycle.cs b/src/Spring/Spring.Core/Context/ILifecycle.cs index 40bcb81f..132ecffc 100644 --- a/src/Spring/Spring.Core/Context/ILifecycle.cs +++ b/src/Spring/Spring.Core/Context/ILifecycle.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IMessageSource.cs b/src/Spring/Spring.Core/Context/IMessageSource.cs index 26ff6cee..f9dc7b1b 100644 --- a/src/Spring/Spring.Core/Context/IMessageSource.cs +++ b/src/Spring/Spring.Core/Context/IMessageSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IMessageSourceAware.cs b/src/Spring/Spring.Core/Context/IMessageSourceAware.cs index f71a8208..130eca0d 100644 --- a/src/Spring/Spring.Core/Context/IMessageSourceAware.cs +++ b/src/Spring/Spring.Core/Context/IMessageSourceAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs b/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs index f7a250ac..35832428 100644 --- a/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs +++ b/src/Spring/Spring.Core/Context/IMessageSourceResolvable.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs b/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs index 41793367..7851e0ee 100644 --- a/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs +++ b/src/Spring/Spring.Core/Context/IResourceLoaderAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/NoSuchMessageException.cs b/src/Spring/Spring.Core/Context/NoSuchMessageException.cs index 43c11386..a6b6c9f6 100644 --- a/src/Spring/Spring.Core/Context/NoSuchMessageException.cs +++ b/src/Spring/Spring.Core/Context/NoSuchMessageException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs index 48588bfb..483e557f 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs index 05142787..447031bb 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs index 3860be5b..f5bac768 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractXmlApplicationContextArgs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs b/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs index 40d2349b..f27e7b83 100644 --- a/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs +++ b/src/Spring/Spring.Core/Context/Support/ApplicationContextAwareProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs b/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs index 4b0d68e3..b535bd80 100644 --- a/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs +++ b/src/Spring/Spring.Core/Context/Support/ApplicationObjectSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs index 387a8235..e04191c1 100644 --- a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs +++ b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs b/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs index dde2428a..ca8fbeb6 100644 --- a/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs +++ b/src/Spring/Spring.Core/Context/Support/DefaultMessageSourceResolvable.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs index e3a9cc14..6b157ec2 100644 --- a/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/DefaultSectionHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs b/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs index cf76f430..ad75cdfd 100644 --- a/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/DelegatingMessageSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs b/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs index ce2b27b1..f665b1c8 100644 --- a/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs +++ b/src/Spring/Spring.Core/Context/Support/MessageSourceAccessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs b/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs index 06d343cd..b697c13b 100644 --- a/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs +++ b/src/Spring/Spring.Core/Context/Support/MessageSourceResolvableVisitor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs index 295f475a..642b7610 100644 --- a/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/NamespaceParsersSectionHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs index 1b992c09..eeeac515 100644 --- a/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/ResourceHandlersSectionHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs b/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs index 3e68dcaf..c22de4cc 100644 --- a/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/ResourceSetMessageSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs index 47c0b7e1..eefe7ca5 100644 --- a/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/StaticApplicationContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ namespace Spring.Context.Support /// /// Creates a new, named instance of the StaticApplicationContext class. - /// + /// /// the context name /// The parent application context. public StaticApplicationContext( string name, IApplicationContext parentContext ) diff --git a/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs b/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs index 95fe5a50..8884961b 100644 --- a/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs index 638d1bd3..df111615 100644 --- a/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/TypeAliasesSectionHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs b/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs index ddc56947..da9c1697 100644 --- a/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/TypeConvertersSectionHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs index ffd61b17..4c2c78f7 100644 --- a/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/XmlApplicationContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs b/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs index 6dbbf2a9..f4dffe1b 100644 --- a/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs +++ b/src/Spring/Spring.Core/Context/Support/XmlApplicationContextArgs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs b/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs index 11331199..ad52c518 100644 --- a/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs +++ b/src/Spring/Spring.Core/Core/CannotLoadObjectTypeException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/ComposedCriteria.cs b/src/Spring/Spring.Core/Core/ComposedCriteria.cs index a3e84db3..8d6e12c9 100644 --- a/src/Spring/Spring.Core/Core/ComposedCriteria.cs +++ b/src/Spring/Spring.Core/Core/ComposedCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/ControlFlowFactory.cs b/src/Spring/Spring.Core/Core/ControlFlowFactory.cs index a2a82df1..28c93d96 100644 --- a/src/Spring/Spring.Core/Core/ControlFlowFactory.cs +++ b/src/Spring/Spring.Core/Core/ControlFlowFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs b/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs index 70af1f77..73ba0332 100644 --- a/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs +++ b/src/Spring/Spring.Core/Core/CriteriaMemberFilter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IControlFlow.cs b/src/Spring/Spring.Core/Core/IControlFlow.cs index 195c8497..36d5390e 100644 --- a/src/Spring/Spring.Core/Core/IControlFlow.cs +++ b/src/Spring/Spring.Core/Core/IControlFlow.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/ICriteria.cs b/src/Spring/Spring.Core/Core/ICriteria.cs index dca1cd9a..72691cab 100644 --- a/src/Spring/Spring.Core/Core/ICriteria.cs +++ b/src/Spring/Spring.Core/Core/ICriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IErrorCoded.cs b/src/Spring/Spring.Core/Core/IErrorCoded.cs index 2196d464..57b654d7 100644 --- a/src/Spring/Spring.Core/Core/IErrorCoded.cs +++ b/src/Spring/Spring.Core/Core/IErrorCoded.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs index da6790b8..5240f3b3 100644 --- a/src/Spring/Spring.Core/Core/IO/AbstractResource.cs +++ b/src/Spring/Spring.Core/Core/IO/AbstractResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -229,13 +229,13 @@ namespace Spring.Core.IO /// /// Returns the handle for this resource. /// - /// - public virtual Uri Uri - { - get - { - return new Uri(resourceName); - } + /// + public virtual Uri Uri + { + get + { + return new Uri(resourceName); + } } #endif /// diff --git a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs index a4ce709d..a210e881 100644 --- a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs +++ b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion @@ -97,8 +97,8 @@ namespace Spring.Core.IO } #if NET_2_0 this._assembly = Assembly.Load(info[0]); -#else - this._assembly = Assembly.LoadWithPartialName(info[0]); +#else + this._assembly = Assembly.LoadWithPartialName(info[0]); #endif if (this._assembly == null) { diff --git a/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs b/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs index 27e41a1b..3e3a3940 100644 --- a/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs +++ b/src/Spring/Spring.Core/Core/IO/ConfigSectionResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -177,13 +177,13 @@ namespace Spring.Core.IO /// public override Stream InputStream { - get - { - if (configElement == null) - { - throw new FileNotFoundException(string.Format("Configuration Section '{0}' does not exist", this.sectionName), this.sectionName); - } - return new MemoryStream(Encoding.UTF8.GetBytes(configElement.OuterXml)); + get + { + if (configElement == null) + { + throw new FileNotFoundException(string.Format("Configuration Section '{0}' does not exist", this.sectionName), this.sectionName); + } + return new MemoryStream(Encoding.UTF8.GetBytes(configElement.OuterXml)); } } diff --git a/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs b/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs index 22cdda4f..c3d9306c 100644 --- a/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs +++ b/src/Spring/Spring.Core/Core/IO/ConfigurableResourceLoader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs b/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs index d83328d5..47445be6 100644 --- a/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs +++ b/src/Spring/Spring.Core/Core/IO/FileSystemResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs b/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs index 59319f42..d8b3f8c5 100644 --- a/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs +++ b/src/Spring/Spring.Core/Core/IO/IInputStreamSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/IResource.cs b/src/Spring/Spring.Core/Core/IO/IResource.cs index 63d1c8bd..03cc97c4 100644 --- a/src/Spring/Spring.Core/Core/IO/IResource.cs +++ b/src/Spring/Spring.Core/Core/IO/IResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs b/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs index 8ed06a4f..7dd977a7 100644 --- a/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs +++ b/src/Spring/Spring.Core/Core/IO/IResourceLoader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs b/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs index 7568ba26..9852c60a 100644 --- a/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs +++ b/src/Spring/Spring.Core/Core/IO/InputStreamResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs index 63d0cc86..244dd81d 100644 --- a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs +++ b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/StringResource.cs b/src/Spring/Spring.Core/Core/IO/StringResource.cs index be448b0b..3966a1b3 100644 --- a/src/Spring/Spring.Core/Core/IO/StringResource.cs +++ b/src/Spring/Spring.Core/Core/IO/StringResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/IO/UrlResource.cs b/src/Spring/Spring.Core/Core/IO/UrlResource.cs index 3ab2b09f..7cbd2c5e 100644 --- a/src/Spring/Spring.Core/Core/IO/UrlResource.cs +++ b/src/Spring/Spring.Core/Core/IO/UrlResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -92,8 +92,8 @@ namespace Spring.Core.IO public UrlResource(string resourceName) : base(resourceName) { if (resourceName.StartsWith("file:///")) - { - resourceName = resourceName.Substring("file:///".Length); + { + resourceName = resourceName.Substring("file:///".Length); } this._uri = new Uri(resourceName); diff --git a/src/Spring/Spring.Core/Core/IOrdered.cs b/src/Spring/Spring.Core/Core/IOrdered.cs index 12a46fd1..a16bb463 100644 --- a/src/Spring/Spring.Core/Core/IOrdered.cs +++ b/src/Spring/Spring.Core/Core/IOrdered.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/InvalidPropertyException.cs b/src/Spring/Spring.Core/Core/InvalidPropertyException.cs index ed27690c..fe9ea053 100644 --- a/src/Spring/Spring.Core/Core/InvalidPropertyException.cs +++ b/src/Spring/Spring.Core/Core/InvalidPropertyException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs b/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs index 65b90222..ef8be559 100644 --- a/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodArgumentsCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,11 +38,11 @@ namespace Spring.Core ///

/// If no array is passed to the overloaded constructor, /// any method that has no parameters will satisfy an instance of this - /// class. The same effect could be achieved by passing the + /// class. The same effect could be achieved by passing the /// array to the overloaded constructor. ///

/// - /// Rick Evans + /// Rick Evans /// Bruno Baia public class MethodArgumentsCriteria : ICriteria { @@ -57,21 +57,21 @@ namespace Spring.Core } /// - /// Creates a new instance of the + /// Creates a new instance of the /// class. - /// - /// - ///

- /// If the supplied array is null, then this - /// constructor uses the array. - ///

- /// + /// + /// + ///

+ /// If the supplied array is null, then this + /// constructor uses the array. + ///

+ /// /// /// The array that this criteria will use to /// check parameter s. - /// + /// public MethodArgumentsCriteria(object[] arguments) - { + { _parameters = ReflectionUtils.GetTypes(arguments); } diff --git a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs index b0d08957..f6e31488 100644 --- a/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodGenericArgumentsCountCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,7 +69,7 @@ namespace Spring.Core /// The number of generic arguments that a /// must have to satisfy this criteria. /// - /// + /// /// If the supplied is less /// than zero. /// diff --git a/src/Spring/Spring.Core/Core/MethodInvocationException.cs b/src/Spring/Spring.Core/Core/MethodInvocationException.cs index ad4ff683..4e865c48 100644 --- a/src/Spring/Spring.Core/Core/MethodInvocationException.cs +++ b/src/Spring/Spring.Core/Core/MethodInvocationException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs b/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs index 56d7c44c..fcc92779 100644 --- a/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodNameMatchCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs b/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs index 8bffb591..0afb865d 100644 --- a/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodParametersCountCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs b/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs index 12ec0a34..5937133a 100644 --- a/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodParametersCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs b/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs index 16c5f1f0..a3d90574 100644 --- a/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs +++ b/src/Spring/Spring.Core/Core/MethodReturnTypeCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs b/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs index 25e2425c..dc184ede 100644 --- a/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs +++ b/src/Spring/Spring.Core/Core/NotReadablePropertyException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs b/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs index 3625e0a7..7920efa2 100644 --- a/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs +++ b/src/Spring/Spring.Core/Core/NotWritablePropertyException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs b/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs index c46cb40f..3302bca0 100644 --- a/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs +++ b/src/Spring/Spring.Core/Core/NullValueInNestedPathException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/OrderComparator.cs b/src/Spring/Spring.Core/Core/OrderComparator.cs index 7782f4e9..7ecb4a33 100644 --- a/src/Spring/Spring.Core/Core/OrderComparator.cs +++ b/src/Spring/Spring.Core/Core/OrderComparator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ namespace Spring.Core ///

/// /// Juergen Hoeller - /// Aleksandar Seovic (.Net) + /// Aleksandar Seovic (.Net) [Serializable] public class OrderComparator : IComparer { @@ -78,18 +78,18 @@ namespace Spring.Core } } - /// - /// Handle the case when both objects have equal sort order priority. By default returns 0, - /// but may be overriden for handling special cases. - /// + /// + /// Handle the case when both objects have equal sort order priority. By default returns 0, + /// but may be overriden for handling special cases. + /// /// The first object to compare. /// The second object to compare. /// /// -1 if first object is less then second, 1 if it is greater, or 0 if they are equal. /// protected virtual int CompareEqualOrder(object o1, object o2) - { - return 0; + { + return 0; } } } diff --git a/src/Spring/Spring.Core/Core/PropertyAccessException.cs b/src/Spring/Spring.Core/Core/PropertyAccessException.cs index 1e9986cf..90e888f4 100644 --- a/src/Spring/Spring.Core/Core/PropertyAccessException.cs +++ b/src/Spring/Spring.Core/Core/PropertyAccessException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs b/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs index 337cab7b..278f92be 100644 --- a/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs +++ b/src/Spring/Spring.Core/Core/PropertyChangeEventArgs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs index 60b0b8f2..795bbac0 100644 --- a/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs +++ b/src/Spring/Spring.Core/Core/RegularExpressionCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs index 53ad02ce..4a92f7da 100644 --- a/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs +++ b/src/Spring/Spring.Core/Core/RegularExpressionEventNameCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs b/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs index a7a6408e..3e576fd7 100644 --- a/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs +++ b/src/Spring/Spring.Core/Core/RegularExpressionMethodNameCriteria.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs index bacda8b8..e7599b42 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/CredentialConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs index c9ea0745..26b34921 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/CustomNumberConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs index 41046f9d..9b17a7af 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/FileInfoConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs index 45f2e961..48e1ca5f 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/NameValueConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs index 35b5fc36..4aa9b3db 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RGBColorConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs index 2c5b61ee..ebcd3ced 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RegexConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs index af1905d9..cfecd81b 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RegistryKeyConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs index 7b29ca22..8c1f9751 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/ResourceManagerConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs index ed036906..f1250f8e 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/RuntimeTypeConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs index 91af9919..3d47e74d 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/StreamConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs index 49913764..15d9ae64 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/StringArrayConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs index 2ab30f1f..98be9ec3 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/TimeSpanConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs index 0e6d894e..924b7eeb 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/UniqueKeyConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs b/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs index f95c5803..dab4325e 100644 --- a/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs +++ b/src/Spring/Spring.Core/Core/TypeConversion/UriConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeMismatchException.cs b/src/Spring/Spring.Core/Core/TypeMismatchException.cs index 9cfb9b85..7447d049 100644 --- a/src/Spring/Spring.Core/Core/TypeMismatchException.cs +++ b/src/Spring/Spring.Core/Core/TypeMismatchException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs index dbcec6f7..8950225d 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/CachedTypeResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs index bd37986e..182a554d 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericArgumentsHolder.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs index 1f2751e3..6ddf290f 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/GenericTypeResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,11 +75,11 @@ namespace Spring.Core.TypeResolution genericArgs[i] = TypeResolutionUtils.ResolveType(unresolvedGenericArgs[i]); } type = type.MakeGenericType(genericArgs); - } - if (genericInfo.IsArrayDeclaration) - { - typeName = string.Format("{0}{1},{2}", type.FullName, genericInfo.GetArrayDeclaration(), type.Assembly.FullName); - type = null; + } + if (genericInfo.IsArrayDeclaration) + { + typeName = string.Format("{0}{1},{2}", type.FullName, genericInfo.GetArrayDeclaration(), type.Assembly.FullName); + type = null; } } } diff --git a/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs index 29a5b7e3..9fbb3835 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/ITypeResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs index 7957dd5e..018d8bd5 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeAssemblyHolder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs index 1be4f9d9..46155a86 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs index c56e86bf..07134a7c 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolutionUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs index 8c1030ed..4e95b8fe 100644 --- a/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs +++ b/src/Spring/Spring.Core/Core/TypeResolution/TypeResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs b/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs index ef524401..b9276b5a 100644 --- a/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs +++ b/src/Spring/Spring.Core/DataBinding/BindingErrorMessage.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs b/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs index 43a83564..bde2738a 100644 --- a/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs +++ b/src/Spring/Spring.Core/DataBinding/SimpleExpressionBinding.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs index 5a9bd2bc..e6a36b91 100644 --- a/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs +++ b/src/Spring/Spring.Core/Expressions/ArrayConstructorNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ using System; using System.Collections; using System.Runtime.Serialization; -using Spring.Core.TypeResolution; +using Spring.Core.TypeResolution; using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions @@ -54,7 +54,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (arrayType == null) diff --git a/src/Spring/Spring.Core/Expressions/AssignNode.cs b/src/Spring/Spring.Core/Expressions/AssignNode.cs index 9db821d9..b8ba7275 100644 --- a/src/Spring/Spring.Core/Expressions/AssignNode.cs +++ b/src/Spring/Spring.Core/Expressions/AssignNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { AST left = getFirstChild(); diff --git a/src/Spring/Spring.Core/Expressions/AttributeNode.cs b/src/Spring/Spring.Core/Expressions/AttributeNode.cs index c3373616..194b0ae4 100644 --- a/src/Spring/Spring.Core/Expressions/AttributeNode.cs +++ b/src/Spring/Spring.Core/Expressions/AttributeNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/BaseNode.cs b/src/Spring/Spring.Core/Expressions/BaseNode.cs index a3d22c4f..17888ad6 100644 --- a/src/Spring/Spring.Core/Expressions/BaseNode.cs +++ b/src/Spring/Spring.Core/Expressions/BaseNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ namespace Spring.Expressions public ArgumentMismatchException(string message) : base(message) { } - } + } #region EvaluationContext class diff --git a/src/Spring/Spring.Core/Expressions/BinaryOperator.cs b/src/Spring/Spring.Core/Expressions/BinaryOperator.cs index 0a123a6d..4ace28ce 100644 --- a/src/Spring/Spring.Core/Expressions/BinaryOperator.cs +++ b/src/Spring/Spring.Core/Expressions/BinaryOperator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,15 +36,15 @@ namespace Spring.Expressions protected BinaryOperator() {} - /// - /// Create a new instance with the supplied operands - /// - /// + /// + /// Create a new instance with the supplied operands + /// + /// /// protected BinaryOperator(BaseNode left, BaseNode right) - { - base.addChild(left); - base.addChild(right); + { + base.addChild(left); + base.addChild(right); } /// @@ -63,12 +63,12 @@ namespace Spring.Expressions get { return (BaseNode) this.getFirstChild(); } } - /// - /// Evaluate the left operand - /// - protected object GetLeftValue(object context, EvaluationContext evalContext) - { - return GetValue(Left, context, evalContext); + /// + /// Evaluate the left operand + /// + protected object GetLeftValue(object context, EvaluationContext evalContext) + { + return GetValue(Left, context, evalContext); } /// /// Gets the right operand. @@ -77,14 +77,14 @@ namespace Spring.Expressions public BaseNode Right { get { return (BaseNode) this.getFirstChild().getNextSibling(); } - } - - /// - /// Evaluate the left operand - /// - protected object GetRightValue(object context, EvaluationContext evalContext) - { - return GetValue(Right, context, evalContext); + } + + /// + /// Evaluate the left operand + /// + protected object GetRightValue(object context, EvaluationContext evalContext) + { + return GetValue(Right, context, evalContext); } } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs b/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs index b64db127..96b0f397 100644 --- a/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/BooleanLiteralNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ namespace Spring.Expressions /// /// This is the entrypoint into evaluating this expression. /// - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (nodeValue == null) diff --git a/src/Spring/Spring.Core/Expressions/ConstructorNode.cs b/src/Spring/Spring.Core/Expressions/ConstructorNode.cs index 9da626ff..a80e8db7 100644 --- a/src/Spring/Spring.Core/Expressions/ConstructorNode.cs +++ b/src/Spring/Spring.Core/Expressions/ConstructorNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object[] argValues = ResolveArguments(evalContext); diff --git a/src/Spring/Spring.Core/Expressions/DefaultNode.cs b/src/Spring/Spring.Core/Expressions/DefaultNode.cs index 90448be0..3c9cf332 100644 --- a/src/Spring/Spring.Core/Expressions/DefaultNode.cs +++ b/src/Spring/Spring.Core/Expressions/DefaultNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,9 +50,9 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) - { + { object leftVal = GetValue(Left, context, evalContext); object rightVal = GetValue(Right, context, evalContext); diff --git a/src/Spring/Spring.Core/Expressions/Expression.cs b/src/Spring/Spring.Core/Expressions/Expression.cs index 7150a4b1..4f42f3f6 100644 --- a/src/Spring/Spring.Core/Expressions/Expression.cs +++ b/src/Spring/Spring.Core/Expressions/Expression.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion @@ -84,7 +84,7 @@ namespace Spring.Expressions { get { return name; } } - } + } private class SpringASTFactory : ASTFactory { diff --git a/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs b/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs index 3cb9254b..e5a83ef9 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs b/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs index 45205618..97494cfa 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionEvaluator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ namespace Spring.Expressions /// Value of the last node in the expression. public static object GetValue(object root, string expression) { - IExpression exp = Expression.Parse(expression); + IExpression exp = Expression.Parse(expression); return exp.GetValue(root, null); } @@ -67,7 +67,7 @@ namespace Spring.Expressions /// Value of the last node in the expression. public static object GetValue(object root, string expression, IDictionary variables) { - IExpression exp = Expression.Parse(expression); + IExpression exp = Expression.Parse(expression); return exp.GetValue(root, variables); } @@ -80,7 +80,7 @@ namespace Spring.Expressions /// Value to set last node to. public static void SetValue(object root, string expression, object newValue) { - IExpression exp = Expression.Parse(expression); + IExpression exp = Expression.Parse(expression); exp.SetValue(root, null, newValue); } @@ -94,7 +94,7 @@ namespace Spring.Expressions /// Value to set last node to. public static void SetValue(object root, string expression, IDictionary variables, object newValue) { - IExpression exp = Expression.Parse(expression); + IExpression exp = Expression.Parse(expression); exp.SetValue(root, variables, newValue); } } diff --git a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs index c60f610d..184b6a7e 100644 --- a/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs +++ b/src/Spring/Spring.Core/Expressions/ExpressionListNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Result of the last expression in a list + /// Result of the last expression in a list protected override object Get(object context, EvaluationContext evalContext) { object result = context; diff --git a/src/Spring/Spring.Core/Expressions/FunctionNode.cs b/src/Spring/Spring.Core/Expressions/FunctionNode.cs index 722ceb47..b3fe8c19 100644 --- a/src/Spring/Spring.Core/Expressions/FunctionNode.cs +++ b/src/Spring/Spring.Core/Expressions/FunctionNode.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs b/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs index bbe5ca31..fb89f58a 100644 --- a/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/HexLiteralNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (nodeValue == null) diff --git a/src/Spring/Spring.Core/Expressions/IExpression.cs b/src/Spring/Spring.Core/Expressions/IExpression.cs index dcc4f0d7..1d132fae 100644 --- a/src/Spring/Spring.Core/Expressions/IExpression.cs +++ b/src/Spring/Spring.Core/Expressions/IExpression.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/IndexerNode.cs b/src/Spring/Spring.Core/Expressions/IndexerNode.cs index 87d17278..365ca141 100644 --- a/src/Spring/Spring.Core/Expressions/IndexerNode.cs +++ b/src/Spring/Spring.Core/Expressions/IndexerNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (context == null) @@ -275,11 +275,11 @@ namespace Spring.Expressions { Type contextType = context.GetType(); Type[] argTypes = ReflectionUtils.GetTypes(indices); - string defaultMember = "Item"; - object[] atts = contextType.GetCustomAttributes(typeof(DefaultMemberAttribute), true); + string defaultMember = "Item"; + object[] atts = contextType.GetCustomAttributes(typeof(DefaultMemberAttribute), true); if (atts != null && atts.Length > 0) - { - defaultMember = ((DefaultMemberAttribute) atts[0]).MemberName; + { + defaultMember = ((DefaultMemberAttribute) atts[0]).MemberName; } PropertyInfo indexerProperty = contextType.GetProperty(defaultMember, BINDING_FLAGS, null, null, argTypes, null); if (indexerProperty == null) diff --git a/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs b/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs index 7eb4f40a..108b9404 100644 --- a/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/IntLiteralNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (nodeValue == null) diff --git a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs index 57921c5e..986871b3 100644 --- a/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs +++ b/src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ using System; using System.Collections; -using System.Runtime.Serialization; +using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions @@ -29,7 +29,7 @@ namespace Spring.Expressions /// Represents lambda expression. /// /// Aleksandar Seovic - [Serializable] + [Serializable] public class LambdaExpressionNode : BaseNode { /// @@ -77,42 +77,42 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if(bodyExpression == null) { InitializeLambda(); - } - + } + object result = GetValue(bodyExpression, context, evalContext); return result; - } - - /// - /// Evaluates this node, switching local variables map to the ones specified in . - /// - protected override object Get(object context, EvaluationContext evalContext, object[] argValues) - { - string[] argNames = this.ArgumentNames; - - if (argValues.Length != argNames.Length) - { - throw new ArgumentMismatchException(string.Format("Invalid number of arguments - expected {0} arguments, but was called with {1}", argNames.Length, argValues.Length)); - } - - IDictionary arguments = new Hashtable(); - for (int i = 0; i < argValues.Length; i++) - { - arguments[argNames[i]] = argValues[i]; - } - - EvaluationContext ec = (EvaluationContext)evalContext; - using (ec.SwitchLocalVariables(arguments)) - { - object result = Get(context, ec); - return result; - } + } + + /// + /// Evaluates this node, switching local variables map to the ones specified in . + /// + protected override object Get(object context, EvaluationContext evalContext, object[] argValues) + { + string[] argNames = this.ArgumentNames; + + if (argValues.Length != argNames.Length) + { + throw new ArgumentMismatchException(string.Format("Invalid number of arguments - expected {0} arguments, but was called with {1}", argNames.Length, argValues.Length)); + } + + IDictionary arguments = new Hashtable(); + for (int i = 0; i < argValues.Length; i++) + { + arguments[argNames[i]] = argValues[i]; + } + + EvaluationContext ec = (EvaluationContext)evalContext; + using (ec.SwitchLocalVariables(arguments)) + { + object result = Get(context, ec); + return result; + } } private void InitializeLambda() diff --git a/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs b/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs index 108c5905..9b1cee6d 100644 --- a/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs +++ b/src/Spring/Spring.Core/Expressions/ListInitializerNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object[] values = ResolveArguments(evalContext); diff --git a/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs b/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs index 853d5f42..d6b813f4 100644 --- a/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs +++ b/src/Spring/Spring.Core/Expressions/LocalFunctionNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Result of the function evaluation. + /// Result of the function evaluation. protected override object Get(object context, EvaluationContext evalContext) { string name = this.getText(); @@ -65,14 +65,14 @@ namespace Spring.Expressions object[] argValues = ResolveArguments(evalContext); - try - { + try + { return GetValueWithArguments(lambda, context, evalContext, argValues); - } - catch (ArgumentMismatchException ame) - { - throw new InvalidOperationException("Failed executing function '" + name + "': " + ame.Message); - } + } + catch (ArgumentMismatchException ame) + { + throw new InvalidOperationException("Failed executing function '" + name + "': " + ame.Message); + } } } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs b/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs index db3590de..fe2458c3 100644 --- a/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs +++ b/src/Spring/Spring.Core/Expressions/LocalVariableNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { string varName = this.getText(); diff --git a/src/Spring/Spring.Core/Expressions/MapEntryNode.cs b/src/Spring/Spring.Core/Expressions/MapEntryNode.cs index 150b0fe5..3bdb2273 100644 --- a/src/Spring/Spring.Core/Expressions/MapEntryNode.cs +++ b/src/Spring/Spring.Core/Expressions/MapEntryNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,11 +50,11 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) - { - BaseNode firstChild = (BaseNode)this.getFirstChild(); - object key = GetValue(firstChild, context, evalContext); + { + BaseNode firstChild = (BaseNode)this.getFirstChild(); + object key = GetValue(firstChild, context, evalContext); object value = GetValue((BaseNode) firstChild.getNextSibling(), context, evalContext); return new DictionaryEntry(key, value); diff --git a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs index a1f4d591..dc7538f1 100644 --- a/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs +++ b/src/Spring/Spring.Core/Expressions/MapInitializerNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ using System; using System.Collections; -using System.Runtime.Serialization; +using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { IDictionary entries = new Hashtable(); diff --git a/src/Spring/Spring.Core/Expressions/MethodNode.cs b/src/Spring/Spring.Core/Expressions/MethodNode.cs index f9038ce2..64f9a774 100644 --- a/src/Spring/Spring.Core/Expressions/MethodNode.cs +++ b/src/Spring/Spring.Core/Expressions/MethodNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs b/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs index cc55319f..1ea98ca8 100644 --- a/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs +++ b/src/Spring/Spring.Core/Expressions/NamedArgumentNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { return GetValue(((BaseNode) this.getFirstChild()), evalContext.RootContext, evalContext); diff --git a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs index 436ab5f3..c971e566 100644 --- a/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs +++ b/src/Spring/Spring.Core/Expressions/NodeWithArguments.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ using System; using System.Collections; -using System.Runtime.Serialization; +using System.Runtime.Serialization; using Spring.Expressions.Parser.antlr.collections; namespace Spring.Expressions @@ -50,13 +50,13 @@ namespace Spring.Expressions this.setText(text); } - /// - /// Append an argument node to the list of child nodes - /// + /// + /// Append an argument node to the list of child nodes + /// /// public void AddArgument(BaseNode argumentNode) - { - base.addChild(argumentNode); + { + base.addChild(argumentNode); } /// @@ -124,17 +124,17 @@ namespace Spring.Expressions /// Current expression evaluation context. /// An array of argument values protected object[] ResolveArguments(EvaluationContext evalContext) - { + { if (args == null) - { - InitializeNode(); + { + InitializeNode(); } - int length = args.Length; + int length = args.Length; object[] values = new object[length]; for (int i = 0; i < length; i++) { - values[i] = ResolveArgumentInternal(i, evalContext); + values[i] = ResolveArgumentInternal(i, evalContext); } return values; } @@ -145,11 +145,11 @@ namespace Spring.Expressions /// Current expression evaluation context. /// A dictionary of argument name to value mappings. protected IDictionary ResolveNamedArguments(EvaluationContext evalContext) - { - if (args == null) - { - InitializeNode(); - } + { + if (args == null) + { + InitializeNode(); + } if (namedArgs.Count == 0) { @@ -171,28 +171,28 @@ namespace Spring.Expressions /// Current expression evaluation context. /// Resolved argument value. protected object ResolveArgument(int position, EvaluationContext evalContext) - { - if (args == null) - { - InitializeNode(); - } + { + if (args == null) + { + InitializeNode(); + } return ResolveArgumentInternal(position, evalContext); - } - - /// - /// Resolves the argument without ensuring was called. - /// - /// Argument position. - /// Current expression evaluation context. - /// Resolved argument value. - private object ResolveArgumentInternal(int position, EvaluationContext evalContext) - { - BaseNode arg = args[position]; + } + + /// + /// Resolves the argument without ensuring was called. + /// + /// Argument position. + /// Current expression evaluation context. + /// Resolved argument value. + private object ResolveArgumentInternal(int position, EvaluationContext evalContext) + { + BaseNode arg = args[position]; if (arg is LambdaExpressionNode) { return arg; - } - return GetValue(arg, evalContext.ThisContext, evalContext); + } + return GetValue(arg, evalContext.ThisContext, evalContext); } /// diff --git a/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs b/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs index f8b78820..5fe826c1 100644 --- a/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/NullLiteralNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/OpADD.cs b/src/Spring/Spring.Core/Expressions/OpADD.cs index 87f13b72..e0a18cc6 100644 --- a/src/Spring/Spring.Core/Expressions/OpADD.cs +++ b/src/Spring/Spring.Core/Expressions/OpADD.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue(context, evalContext); diff --git a/src/Spring/Spring.Core/Expressions/OpAND.cs b/src/Spring/Spring.Core/Expressions/OpAND.cs index b1254fb2..88d3b9ee 100644 --- a/src/Spring/Spring.Core/Expressions/OpAND.cs +++ b/src/Spring/Spring.Core/Expressions/OpAND.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/OpBetween.cs b/src/Spring/Spring.Core/Expressions/OpBetween.cs index 8143f9a0..16c2c306 100644 --- a/src/Spring/Spring.Core/Expressions/OpBetween.cs +++ b/src/Spring/Spring.Core/Expressions/OpBetween.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ namespace Spring.Expressions /// Current expression evaluation context. /// /// true if the left operand is contained within the right operand, false otherwise. - /// + /// protected override object Get(object context, EvaluationContext evalContext) { object value = GetLeftValue(context, evalContext); diff --git a/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs b/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs index 9561de76..24b8c148 100644 --- a/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs +++ b/src/Spring/Spring.Core/Expressions/OpDIVIDE.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue(context, evalContext); diff --git a/src/Spring/Spring.Core/Expressions/OpEqual.cs b/src/Spring/Spring.Core/Expressions/OpEqual.cs index e209cf2c..189b4643 100644 --- a/src/Spring/Spring.Core/Expressions/OpEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpEqual.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Expressions/OpGreater.cs b/src/Spring/Spring.Core/Expressions/OpGreater.cs index f2804d93..9ee9897d 100644 --- a/src/Spring/Spring.Core/Expressions/OpGreater.cs +++ b/src/Spring/Spring.Core/Expressions/OpGreater.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue(context, evalContext); diff --git a/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs b/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs index 385692dd..f243369c 100644 --- a/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpGreaterOrEqual.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpIn.cs b/src/Spring/Spring.Core/Expressions/OpIn.cs index 7f848b55..2634540c 100644 --- a/src/Spring/Spring.Core/Expressions/OpIn.cs +++ b/src/Spring/Spring.Core/Expressions/OpIn.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// Current expression evaluation context. /// /// true if the left operand is contained within the right operand, false otherwise. - /// + /// protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpIs.cs b/src/Spring/Spring.Core/Expressions/OpIs.cs index 20c072ff..5729c4fa 100644 --- a/src/Spring/Spring.Core/Expressions/OpIs.cs +++ b/src/Spring/Spring.Core/Expressions/OpIs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ namespace Spring.Expressions /// Current expression evaluation context. /// /// true if the left operand is contained within the right operand, false otherwise. - /// + /// protected override object Get(object context, EvaluationContext evalContext) { object instance = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpLess.cs b/src/Spring/Spring.Core/Expressions/OpLess.cs index 3b91c9b4..8e6a8d87 100644 --- a/src/Spring/Spring.Core/Expressions/OpLess.cs +++ b/src/Spring/Spring.Core/Expressions/OpLess.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs b/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs index bc8dc32f..3b6f25c4 100644 --- a/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpLessOrEqual.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpLike.cs b/src/Spring/Spring.Core/Expressions/OpLike.cs index 8b555d3b..7113aadd 100644 --- a/src/Spring/Spring.Core/Expressions/OpLike.cs +++ b/src/Spring/Spring.Core/Expressions/OpLike.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ namespace Spring.Expressions /// Current expression evaluation context. /// /// true if the left operand matches the right operand, false otherwise. - /// + /// protected override object Get(object context, EvaluationContext evalContext) { #if NET_2_0 && !MONO_2_0 diff --git a/src/Spring/Spring.Core/Expressions/OpMODULUS.cs b/src/Spring/Spring.Core/Expressions/OpMODULUS.cs index b9fcb8f9..9886f4df 100644 --- a/src/Spring/Spring.Core/Expressions/OpMODULUS.cs +++ b/src/Spring/Spring.Core/Expressions/OpMODULUS.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object leftVal = GetLeftValue(context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs b/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs index bd9d209f..3553728e 100644 --- a/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs +++ b/src/Spring/Spring.Core/Expressions/OpMULTIPLY.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpMatches.cs b/src/Spring/Spring.Core/Expressions/OpMatches.cs index b990d887..fe108b3c 100644 --- a/src/Spring/Spring.Core/Expressions/OpMatches.cs +++ b/src/Spring/Spring.Core/Expressions/OpMatches.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ namespace Spring.Expressions /// Current expression evaluation context. /// /// true if the left operand matches the right operand, false otherwise. - /// + /// protected override object Get(object context, EvaluationContext evalContext) { if (regex == null) diff --git a/src/Spring/Spring.Core/Expressions/OpNOT.cs b/src/Spring/Spring.Core/Expressions/OpNOT.cs index 7a227496..d62de802 100644 --- a/src/Spring/Spring.Core/Expressions/OpNOT.cs +++ b/src/Spring/Spring.Core/Expressions/OpNOT.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ #endregion using System; -using System.Runtime.Serialization; +using System.Runtime.Serialization; using Spring.Util; namespace Spring.Expressions { - /// - /// Represents NOT operator (both, bitwise and logical). + /// + /// Represents NOT operator (both, bitwise and logical). /// /// Aleksandar Seovic [Serializable] @@ -59,23 +59,23 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) - { - object operand = GetValue(Operand, context, evalContext); - if (NumberUtils.IsInteger(operand)) - { - return NumberUtils.BitwiseNot(operand); - } - else if (operand is Enum) - { - Type enumType = operand.GetType(); - Type integralType = Enum.GetUnderlyingType(enumType); - operand = Convert.ChangeType(operand, integralType); - object result = NumberUtils.BitwiseNot(operand); - return Enum.ToObject(enumType, result); - } - else + { + object operand = GetValue(Operand, context, evalContext); + if (NumberUtils.IsInteger(operand)) + { + return NumberUtils.BitwiseNot(operand); + } + else if (operand is Enum) + { + Type enumType = operand.GetType(); + Type integralType = Enum.GetUnderlyingType(enumType); + operand = Convert.ChangeType(operand, integralType); + object result = NumberUtils.BitwiseNot(operand); + return Enum.ToObject(enumType, result); + } + else return !Convert.ToBoolean(operand); } } diff --git a/src/Spring/Spring.Core/Expressions/OpNotEqual.cs b/src/Spring/Spring.Core/Expressions/OpNotEqual.cs index 763a7e41..665e8c1b 100644 --- a/src/Spring/Spring.Core/Expressions/OpNotEqual.cs +++ b/src/Spring/Spring.Core/Expressions/OpNotEqual.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object leftVal = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpOR.cs b/src/Spring/Spring.Core/Expressions/OpOR.cs index f1daaebb..5e5d6960 100644 --- a/src/Spring/Spring.Core/Expressions/OpOR.cs +++ b/src/Spring/Spring.Core/Expressions/OpOR.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/OpPOWER.cs b/src/Spring/Spring.Core/Expressions/OpPOWER.cs index 930b5e85..c5ce8a24 100644 --- a/src/Spring/Spring.Core/Expressions/OpPOWER.cs +++ b/src/Spring/Spring.Core/Expressions/OpPOWER.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs b/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs index 284f05ff..ba3fbf4b 100644 --- a/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs +++ b/src/Spring/Spring.Core/Expressions/OpSUBTRACT.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object left = GetLeftValue( context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs b/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs index 9f659fef..b6d6ef6b 100644 --- a/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs +++ b/src/Spring/Spring.Core/Expressions/OpUnaryMinus.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { object n = GetValue(Operand, context, evalContext ); diff --git a/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs b/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs index baa49ad9..81fe71f7 100644 --- a/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs +++ b/src/Spring/Spring.Core/Expressions/OpUnaryPlus.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,9 +51,9 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) - { + { object n = GetValue(Operand, context, evalContext); if (!NumberUtils.IsNumber(n)) diff --git a/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs index cbacbe8d..59478288 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/AverageAggregator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs index a318ca18..27c99411 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/ConversionProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs index d0adeabe..44fdb55e 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/CountAggregator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs index 08ed0a5b..7083aff2 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/DistinctProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs index f72e6690..3b62d1e8 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/ICollectionProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs index 9780ea77..cc2651b8 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/MaxAggregator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs index 7bc8a8e1..36cb8d18 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/MinAggregator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs index 222d1e8f..e522e06d 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/NonNullProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs index 8d60cf88..97174c44 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/OrderByProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs index 450585cd..6cd5113a 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/ReverseProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs b/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs index 7dfc2823..f9b99587 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/SortProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs b/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs index c7e11da7..2414a81d 100644 --- a/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs +++ b/src/Spring/Spring.Core/Expressions/Processors/SumAggregator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/ProjectionNode.cs b/src/Spring/Spring.Core/Expressions/ProjectionNode.cs index 12a603bd..20141cb5 100644 --- a/src/Spring/Spring.Core/Expressions/ProjectionNode.cs +++ b/src/Spring/Spring.Core/Expressions/ProjectionNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { IEnumerable enumerable = context as IEnumerable; @@ -68,7 +68,7 @@ namespace Spring.Expressions { foreach(object o in enumerable) { - evalContext.ThisContext = o; + evalContext.ThisContext = o; projectedList.Add(GetValue(expression, o, evalContext)); } } diff --git a/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs b/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs index 4552f21e..476e0b30 100644 --- a/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs +++ b/src/Spring/Spring.Core/Expressions/PropertyOrFieldNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs index 183f651c..f2d02a1f 100644 --- a/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs +++ b/src/Spring/Spring.Core/Expressions/QualifiedIdentifier.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs b/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs index 6fc8b0bc..3335a62f 100644 --- a/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/RealLiteralNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (nodeValue == null) diff --git a/src/Spring/Spring.Core/Expressions/ReferenceNode.cs b/src/Spring/Spring.Core/Expressions/ReferenceNode.cs index b501d3bf..27f4c4f3 100644 --- a/src/Spring/Spring.Core/Expressions/ReferenceNode.cs +++ b/src/Spring/Spring.Core/Expressions/ReferenceNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ namespace Spring.Context.Support /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { IApplicationContext ctx; diff --git a/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs b/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs index 9236cf4f..fdeb273f 100644 --- a/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs +++ b/src/Spring/Spring.Core/Expressions/SelectionFirstNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { IEnumerable enumerable = context as IEnumerable; @@ -66,7 +66,7 @@ namespace Spring.Expressions { foreach (object o in enumerable) { - evalContext.ThisContext = o; + evalContext.ThisContext = o; bool isMatch = (bool)GetValue(expression, o, evalContext); if (isMatch) { diff --git a/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs b/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs index 697d55b8..ad7b09f3 100644 --- a/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs +++ b/src/Spring/Spring.Core/Expressions/SelectionLastNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { IList list = context as IList; diff --git a/src/Spring/Spring.Core/Expressions/SelectionNode.cs b/src/Spring/Spring.Core/Expressions/SelectionNode.cs index bcad7fdf..532e49f6 100644 --- a/src/Spring/Spring.Core/Expressions/SelectionNode.cs +++ b/src/Spring/Spring.Core/Expressions/SelectionNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { IEnumerable enumerable = context as IEnumerable; @@ -68,10 +68,10 @@ namespace Spring.Expressions BaseNode maxIndexExpression = (minIndexExpression == null) ? null : (BaseNode)minIndexExpression.getNextSibling(); int minIndex = (int)((minIndexExpression == null) - ? Int32.MinValue + ? Int32.MinValue : GetValue(minIndexExpression, context, evalContext)); int maxIndex = (int)((maxIndexExpression == null) - ? Int32.MaxValue + ? Int32.MaxValue : GetValue(maxIndexExpression, context, evalContext)); IList selectionList = new ArrayList(); @@ -81,7 +81,7 @@ namespace Spring.Expressions int found = 0; foreach (object o in enumerable) { - evalContext.ThisContext = o; + evalContext.ThisContext = o; bool isMatch = (bool)GetValue(expression, o, evalContext); if (isMatch) { diff --git a/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs b/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs index 14b55a0a..760b4038 100644 --- a/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs +++ b/src/Spring/Spring.Core/Expressions/StringLiteralNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { return this.getText(); diff --git a/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs b/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs index 7e1405d7..99a3bde9 100644 --- a/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs +++ b/src/Spring/Spring.Core/Expressions/SyntaxErrorException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/TernaryNode.cs b/src/Spring/Spring.Core/Expressions/TernaryNode.cs index 617e9608..966c16a9 100644 --- a/src/Spring/Spring.Core/Expressions/TernaryNode.cs +++ b/src/Spring/Spring.Core/Expressions/TernaryNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,7 +56,7 @@ namespace Spring.Expressions /// /// Context to evaluate expressions against. /// Current expression evaluation context. - /// Node's value. + /// Node's value. protected override object Get(object context, EvaluationContext evalContext) { if (!initialized) @@ -75,14 +75,14 @@ namespace Spring.Expressions initialized = true; } } - } - + } + if (Convert.ToBoolean(GetValue(condition, context, evalContext))) - { + { return GetValue(trueExp, context, evalContext); } else - { + { return GetValue(falseExp, context, evalContext); } } diff --git a/src/Spring/Spring.Core/Expressions/TypeNode.cs b/src/Spring/Spring.Core/Expressions/TypeNode.cs index ea554f9b..7a621e2c 100644 --- a/src/Spring/Spring.Core/Expressions/TypeNode.cs +++ b/src/Spring/Spring.Core/Expressions/TypeNode.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Expressions/UnaryOperator.cs b/src/Spring/Spring.Core/Expressions/UnaryOperator.cs index 151728b7..8034fa5d 100644 --- a/src/Spring/Spring.Core/Expressions/UnaryOperator.cs +++ b/src/Spring/Spring.Core/Expressions/UnaryOperator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Expressions/VariableNode.cs b/src/Spring/Spring.Core/Expressions/VariableNode.cs index 4488bc4a..822f7065 100644 --- a/src/Spring/Spring.Core/Expressions/VariableNode.cs +++ b/src/Spring/Spring.Core/Expressions/VariableNode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs index ca2410b1..436531aa 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/FilteringFormatter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs b/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs index 79d9a139..3e5eaa75 100644 --- a/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs +++ b/src/Spring/Spring.Core/Globalization/Formatters/HasTextFilteringFormatter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Globalization/ICultureResolver.cs b/src/Spring/Spring.Core/Globalization/ICultureResolver.cs index 1a1797aa..9300639a 100644 --- a/src/Spring/Spring.Core/Globalization/ICultureResolver.cs +++ b/src/Spring/Spring.Core/Globalization/ICultureResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs b/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs index ae8a0500..c3eacdd1 100644 --- a/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs +++ b/src/Spring/Spring.Core/Globalization/Resolvers/DefaultCultureResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs b/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs index 64918874..bd6936e3 100644 --- a/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Events/IEventRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,24 +53,24 @@ namespace Spring.Objects.Events /// /// The target to subscribe to. /// - void Subscribe(object subscriber, Type targetSourceType); - - /// - /// Unsubscribes to all events published, if the subscriber - /// implmenets compatible handler methods. - /// - /// The subscriber to use - void Unsubscribe(object subscriber); - - /// - /// Unsubscribes to the published events of all objects of a given - /// , if the subscriber implements - /// compatible handler methods. - /// - /// The subscriber to use. - /// - /// The target to unsubscribe from - /// + void Subscribe(object subscriber, Type targetSourceType); + + /// + /// Unsubscribes to all events published, if the subscriber + /// implmenets compatible handler methods. + /// + /// The subscriber to use + void Unsubscribe(object subscriber); + + /// + /// Unsubscribes to the published events of all objects of a given + /// , if the subscriber implements + /// compatible handler methods. + /// + /// The subscriber to use. + /// + /// The target to unsubscribe from + /// void Unsubscribe(object subscriber, Type targetSourceType); } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs b/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs index dbe15ce3..04377df8 100644 --- a/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs +++ b/src/Spring/Spring.Core/Objects/Events/IEventRegistryAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs b/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs index d7765814..fb4a096e 100644 --- a/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs +++ b/src/Spring/Spring.Core/Objects/Events/Support/EventManipulationUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -78,11 +78,11 @@ namespace Spring.Objects.Events.Support /// public static MethodInfo GetMethodInfoMatchingSignature( MethodInfo invoke, Type subscriberType) - { + { ParameterInfo[] parameters = invoke.GetParameters(); ComposedCriteria criteria = new ComposedCriteria(); - criteria.Add(new MethodReturnTypeCriteria(invoke.ReturnType)); + criteria.Add(new MethodReturnTypeCriteria(invoke.ReturnType)); criteria.Add(new MethodParametersCountCriteria(parameters.Length)); criteria.Add(new MethodParametersCriteria(ReflectionUtils.GetParameterTypes(parameters))); diff --git a/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs b/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs index 7ab2a702..a3087afb 100644 --- a/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Events/Support/EventRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,39 +97,39 @@ namespace Spring.Objects.Events.Support currentPublisher, currentSubscriberType, subscriber, true); } } - } - - /// - /// Unsubscribes to all events published, if the subscriber - /// implmenets compatible handler methods. - /// - /// The subscriber to use + } + + /// + /// Unsubscribes to all events published, if the subscriber + /// implmenets compatible handler methods. + /// + /// The subscriber to use public virtual void Unsubscribe(object subscriber) - { - Unsubscribe(subscriber, null); - } - - /// - /// Unsubscribes to the published events of all objects of a given - /// , if the subscriber implements - /// compatible handler methods. - /// - /// The subscriber to use. - /// The target to unsubscribe from + { + Unsubscribe(subscriber, null); + } + + /// + /// Unsubscribes to the published events of all objects of a given + /// , if the subscriber implements + /// compatible handler methods. + /// + /// The subscriber to use. + /// The target to unsubscribe from public virtual void Unsubscribe(object subscriber, Type sourceType) - { - Type currentSubscriberType = subscriber.GetType(); - foreach (object currentPublisher in _publishers) - { - if (null == sourceType - || sourceType.IsAssignableFrom(currentPublisher.GetType())) - { - WireOrUnwireSubscriberToPublisher( - currentPublisher, currentSubscriberType, subscriber, false); - } - } - } - + { + Type currentSubscriberType = subscriber.GetType(); + foreach (object currentPublisher in _publishers) + { + if (null == sourceType + || sourceType.IsAssignableFrom(currentPublisher.GetType())) + { + WireOrUnwireSubscriberToPublisher( + currentPublisher, currentSubscriberType, subscriber, false); + } + } + } + private static void WireOrUnwireSubscriberToPublisher( object currentPublisher, Type currentSubscriberType, object subscriber, bool wire) { @@ -143,23 +143,23 @@ namespace Spring.Objects.Events.Support = EventManipulationUtils.GetMethodInfoMatchingSignature( invoke, currentSubscriberType); if (eventHandler != null) - { - if (wire) - { - currentEvent.AddEventHandler( - currentPublisher, - EventManipulationUtils.GetHandlerDelegate( - eventHandlerType, subscriber, eventHandler)); - } - else - { - currentEvent.RemoveEventHandler( - currentPublisher, - EventManipulationUtils.GetHandlerDelegate( - eventHandlerType, subscriber, eventHandler)); + { + if (wire) + { + currentEvent.AddEventHandler( + currentPublisher, + EventManipulationUtils.GetHandlerDelegate( + eventHandlerType, subscriber, eventHandler)); + } + else + { + currentEvent.RemoveEventHandler( + currentPublisher, + EventManipulationUtils.GetHandlerDelegate( + eventHandlerType, subscriber, eventHandler)); } } } - } + } } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs index fb0eedc8..3ff99188 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttribute.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs index 6ed64e5e..caf4f148 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/RequiredAttributeObjectPostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs index 699d7280..4e00537e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs index 0ac9d599..fa8ff45b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/AbstractFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs b/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs index fda7f486..370e4be2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/AutoWiringMode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs index 9a0558d0..39df90a0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/CommandLineArgsVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,24 +89,24 @@ namespace Spring.Objects.Factory.Config set { valueSeparator = value; } } - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve - /// true if the variable can be resolved, false otherwise - public bool CanResolveVariable(string name) - { - lock (objectMonitor) - { - if (arguments == null) - { - InitArguments(); - } - return arguments.Contains(name); - } - } - + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve + /// true if the variable can be resolved, false otherwise + public bool CanResolveVariable(string name) + { + lock (objectMonitor) + { + if (arguments == null) + { + InitArguments(); + } + return arguments.Contains(name); + } + } + /// /// Resolves variable value for the specified variable name. /// @@ -117,14 +117,14 @@ namespace Spring.Objects.Factory.Config /// The variable value if able to resolve, null otherwise. /// public string ResolveVariable(string name) - { - lock (objectMonitor) - { - if (arguments == null) - { - InitArguments(); - } - return (string) this.arguments[name]; + { + lock (objectMonitor) + { + if (arguments == null) + { + InitArguments(); + } + return (string) this.arguments[name]; } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs index db7c8bc4..b6cb7647 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigSectionVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -93,25 +93,25 @@ namespace Spring.Objects.Factory.Config set { sectionNames = new string[] { value }; } } - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve - /// true if the variable can be resolved, false otherwise - public bool CanResolveVariable(string name) - { - lock (objectMonitor) - { - if (variables == null) - { - variables = new NameValueCollection(); - InitVariables(); - } - return CollectionUtils.Contains(variables.AllKeys, name); - } - } - + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve + /// true if the variable can be resolved, false otherwise + public bool CanResolveVariable(string name) + { + lock (objectMonitor) + { + if (variables == null) + { + variables = new NameValueCollection(); + InitVariables(); + } + return CollectionUtils.Contains(variables.AllKeys, name); + } + } + /// /// Resolves variable value for the specified variable name. /// @@ -122,15 +122,15 @@ namespace Spring.Objects.Factory.Config /// The variable value if able to resolve, null otherwise. /// public string ResolveVariable(string name) - { - lock (objectMonitor) - { - if (variables == null) - { - variables = new NameValueCollection(); - InitVariables(); - } - return variables.Get(name); + { + lock (objectMonitor) + { + if (variables == null) + { + variables = new NameValueCollection(); + InitVariables(); + } + return variables.Get(name); } } @@ -147,20 +147,20 @@ namespace Spring.Objects.Factory.Config { variables.Add((NameValueCollection) section); } -#if NET_2_0 - else if (section is System.Configuration.ClientSettingsSection) - { - System.Configuration.ClientSettingsSection clientSettingsSection = (System.Configuration.ClientSettingsSection)section; - foreach (SettingElement setting in clientSettingsSection.Settings) - { - variables.Add(setting.Name, setting.Value.ValueXml.InnerText); - } - } -#endif - else - { - throw new ArgumentException("Section [" + sectionName + - "] is not handled by the NameValueSectionHandler."); +#if NET_2_0 + else if (section is System.Configuration.ClientSettingsSection) + { + System.Configuration.ClientSettingsSection clientSettingsSection = (System.Configuration.ClientSettingsSection)section; + foreach (SettingElement setting in clientSettingsSection.Settings) + { + variables.Add(setting.Name, setting.Value.ValueXml.InnerText); + } + } +#endif + else + { + throw new ArgumentException("Section [" + sectionName + + "] is not handled by the NameValueSectionHandler."); } } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs index cab9f74a..daa46214 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs index 875b09c3..6d287252 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConnectionStringsVariableSource.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs index cceb90c8..6135da89 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConstructorArgumentValues.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -180,44 +180,44 @@ namespace Spring.Objects.Factory.Config GenericArgumentValues.Add(o); } foreach (DictionaryEntry entry in other.IndexedArgumentValues) - { - ValueHolder vh = entry.Value as ValueHolder; - if (vh != null) - { - AddOrMergeIndexedArgumentValues( (int) entry.Key, vh.Copy()); + { + ValueHolder vh = entry.Value as ValueHolder; + if (vh != null) + { + AddOrMergeIndexedArgumentValues( (int) entry.Key, vh.Copy()); } } foreach (DictionaryEntry entry in other.NamedArgumentValues) - { + { AddOrMergeNamedArgumentValues(entry.Key, entry.Value); //NamedArgumentValues.Add(entry.Key, entry.Value); } } - } - - private void AddOrMergeNamedArgumentValues(object key, object newValue) - { - if (_namedArgumentValues.Contains(key) ) - { - _namedArgumentValues[key] = newValue; - } else - { - _namedArgumentValues.Add(key, newValue); - } - } - - private void AddOrMergeIndexedArgumentValues(int key, ValueHolder newValue) - { - ValueHolder currentValue = _indexedArgumentValues[key] as ValueHolder; - IMergable mergable = newValue.Value as IMergable; - if (currentValue != null && mergable != null ) - { - if (mergable.MergeEnabled) - { - newValue.Value = mergable.Merge(currentValue.Value); - } - } - _indexedArgumentValues[key] = newValue; + } + + private void AddOrMergeNamedArgumentValues(object key, object newValue) + { + if (_namedArgumentValues.Contains(key) ) + { + _namedArgumentValues[key] = newValue; + } else + { + _namedArgumentValues.Add(key, newValue); + } + } + + private void AddOrMergeIndexedArgumentValues(int key, ValueHolder newValue) + { + ValueHolder currentValue = _indexedArgumentValues[key] as ValueHolder; + IMergable mergable = newValue.Value as IMergable; + if (currentValue != null && mergable != null ) + { + if (mergable.MergeEnabled) + { + newValue.Value = mergable.Merge(currentValue.Value); + } + } + _indexedArgumentValues[key] = newValue; } /// @@ -629,12 +629,12 @@ namespace Spring.Objects.Factory.Config #endregion - #region Methods - - public ValueHolder Copy() - { - ValueHolder copy = new ValueHolder(this._ctorValue, this.typeName); - return copy; + #region Methods + + public ValueHolder Copy() + { + ValueHolder copy = new ValueHolder(this._ctorValue, this.typeName); + return copy; } /// @@ -686,7 +686,7 @@ namespace Spring.Objects.Factory.Config private object _ctorValue; private string typeName; - #endregion + #endregion } #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs index bfd0e29f..355d6075 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/CustomConverterConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs index 8e6e6136..40623529 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DelegateFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs index a33c6318..432c0892 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/DictionaryFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs index 4bb85fab..657f61bd 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableMode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs index 942bbfb0..8d104205 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/EnvironmentVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,17 +30,17 @@ namespace Spring.Objects.Factory.Config [Serializable] public class EnvironmentVariableSource : IVariableSource { - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve - /// true if the variable can be resolved, false otherwise - public bool CanResolveVariable(string name) - { - return (Environment.GetEnvironmentVariable(name) != null); - } - + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve + /// true if the variable can be resolved, false otherwise + public bool CanResolveVariable(string name) + { + return (Environment.GetEnvironmentVariable(name) != null); + } + /// /// Resolves variable value for the specified variable name. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs b/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs index b6454840..4c733e65 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/EventValues.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs index 4bb9bc37..fb16d129 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ExpressionHolder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs index f81def52..282484e1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/FieldRetrievingFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs index 715afe31..c7163d89 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IAutowireCapableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs index 3a3011ca..464fa43d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs index 404ad133..615e64f7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableListableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -105,7 +105,7 @@ namespace Spring.Objects.Factory.Config /// /// If the object definition is invalid. /// - void RegisterObjectDefinition(string name, IObjectDefinition definition); + void RegisterObjectDefinition(string name, IObjectDefinition definition); /// /// Injects dependencies into the supplied instance diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs index 78575310..52678387 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IConfigurableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ namespace Spring.Objects.Factory.Config /// Juergen Hoeller /// Rick Evans (.NET) public interface IConfigurableObjectFactory : IHierarchicalObjectFactory, ISingletonObjectRegistry - { + { /// /// Set the parent of this object factory. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs index 2b678ab1..40ffc039 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IDestructionAwareObjectPostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs index c5d0ad45..b9d5673c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IInstantiationAwareObjectPostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,21 +26,21 @@ namespace Spring.Objects.Factory.Config { /// /// Subinterface of /// - /// that adds a before-instantiation callback and a callback after instantiation but before + /// that adds a before-instantiation callback and a callback after instantiation but before /// explicit properties are set or autowiring occurs. /// /// /// - /// Typically used to suppress default instantiation for specific target objects, + /// Typically used to suppress default instantiation for specific target objects, /// for example to create proxies with special Spring.Aop.ITargetSources (pooling targets, - /// lazily initializing targets, etc), or to implement additional injection strategies such as field + /// lazily initializing targets, etc), or to implement additional injection strategies such as field /// injection. - /// - /// - /// This interface is a special purpose interface, mainly for internal use within the framework. - /// It is recommended to implement the plain interface as far as - /// possible, or to derive from in order to be shielded - /// from extension to this interface. + /// + /// + /// This interface is a special purpose interface, mainly for internal use within the framework. + /// It is recommended to implement the plain interface as far as + /// possible, or to derive from in order to be shielded + /// from extension to this interface. /// /// /// Juergen Hoeller diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs index c534e38c..c9f39fbf 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IManagedCollection.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #region Imports using System; -using System.Collections; +using System.Collections; using Spring.Objects.Factory.Config; #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs index 105ef05d..f61d8f1f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs index 611a404a..1e80e848 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectFactoryPostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs index 3736e1f3..2893a61a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IObjectPostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs index 20bc967a..cb523f82 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/IVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ namespace Spring.Objects.Factory.Config ///

/// Users can always write their own variable sources implementations, /// that will allow them to load variable values from the database or - /// other proprietary data source.

+ /// other proprietary data source.

/// /// /// @@ -45,11 +45,11 @@ namespace Spring.Objects.Factory.Config /// Aleksandar Seovic public interface IVariableSource { - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve /// true if the variable can be resolved, false otherwise bool CanResolveVariable(string name); diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs b/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs index 193fcada..d96f4557 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/InstantiationAwareObjectPostProcessorAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs index 2189740c..db56a9d4 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ListFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs index 4e8c1d8c..3510902f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs index 4933c946..a2fb2c18 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedDictionary.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs index 67b191e4..0030c833 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedList.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs index 41521f78..cdcebe45 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedNameValueCollection.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs index 10ffc423..85b13f3e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ManagedSet.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ using System.Collections; using Spring.Collections; using Spring.Core; using Spring.Core.TypeConversion; -using Spring.Core.TypeResolution; +using Spring.Core.TypeResolution; using Spring.Util; #endregion @@ -41,28 +41,28 @@ namespace Spring.Objects.Factory.Config [Serializable] public class ManagedSet : HybridSet, IManagedCollection, IMergable { - private string elementTypeName; - - private bool mergeEnabled; + private string elementTypeName; + + private bool mergeEnabled; /// /// Creates a new set instance based on either a list or a hash table, /// depending on which will be more efficient based on the data-set /// size. - /// - public ManagedSet() - { - } - - /// - /// Initializes a new instance of the class with a given capacity - /// - /// The size. - public ManagedSet(int size) : base(size) - { - } - + /// + public ManagedSet() + { + } + + /// + /// Initializes a new instance of the class with a given capacity + /// + /// The size. + public ManagedSet(int size) : base(size) + { + } + /// /// Gets or sets the unresolved name for the /// of the elements of this managed set. @@ -127,57 +127,57 @@ namespace Spring.Objects.Factory.Config } return set; - } - - /// - /// Gets a value indicating whether this instance is merge enabled for this instance - /// - /// - /// true if this instance is merge enabled; otherwise, false. - /// - public bool MergeEnabled - { - get { return this.mergeEnabled; } - set { this.mergeEnabled = value; } - } - - /// - /// Merges the current value set with that of the supplied object. - /// - /// The supplied object is considered the parent, and values in the - /// callee's value set must override those of the supplied object. - /// - /// The parent object to merge with - /// The result of the merge operation - /// If the supplied parent is null - /// If merging is not enabled for this instance, - /// (i.e. MergeEnabled equals false. - public object Merge(object parent) - { - if (!this.mergeEnabled) - { - throw new InvalidOperationException( - "Not allowed to merge when the 'MergeEnabled' property is set to 'false'"); - } - if (parent == null) - { - return this; - } - ISet pSet = parent as ISet; - if (pSet == null) - { - throw new InvalidOperationException("Cannot merge with object of type [" + parent.GetType() + "]"); - } - ISet merged = new ManagedSet(); - foreach (object element in pSet) - { - merged.Add(element); - } - foreach (object o in this) - { - merged.Add(o); - } - return merged; - } + } + + /// + /// Gets a value indicating whether this instance is merge enabled for this instance + /// + /// + /// true if this instance is merge enabled; otherwise, false. + /// + public bool MergeEnabled + { + get { return this.mergeEnabled; } + set { this.mergeEnabled = value; } + } + + /// + /// Merges the current value set with that of the supplied object. + /// + /// The supplied object is considered the parent, and values in the + /// callee's value set must override those of the supplied object. + /// + /// The parent object to merge with + /// The result of the merge operation + /// If the supplied parent is null + /// If merging is not enabled for this instance, + /// (i.e. MergeEnabled equals false. + public object Merge(object parent) + { + if (!this.mergeEnabled) + { + throw new InvalidOperationException( + "Not allowed to merge when the 'MergeEnabled' property is set to 'false'"); + } + if (parent == null) + { + return this; + } + ISet pSet = parent as ISet; + if (pSet == null) + { + throw new InvalidOperationException("Cannot merge with object of type [" + parent.GetType() + "]"); + } + ISet merged = new ManagedSet(); + foreach (object element in pSet) + { + merged.Add(element); + } + foreach (object o in this) + { + merged.Add(o); + } + return merged; + } } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs index bf9cd5d8..6ec09699 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/MethodInvokingFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs index 244a2684..082842b5 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectDefinitionHolder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs index d212a0d8..0ac45700 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectFactoryCreatingFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs index e3941120..01ace460 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ObjectReferenceFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,23 +50,23 @@ namespace Spring.Objects.Factory.Config private string _targetObjectName; private IObjectFactory _objectFactory; - /// - /// Initialize a new default instance + /// + /// Initialize a new default instance /// public ObjectReferenceFactoryObject() - { - } - /// - /// Initialize this instance with the predefined and . - /// - /// - /// + { + } + /// + /// Initialize this instance with the predefined and . + /// + /// + /// public ObjectReferenceFactoryObject(string targetObjectName, IObjectFactory objectFactory) - { - this.TargetObjectName = targetObjectName; - this.ObjectFactory = objectFactory; - } - + { + this.TargetObjectName = targetObjectName; + this.ObjectFactory = objectFactory; + } + /// /// The name of the target object. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs index 74483e6f..41c44e7e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyFileVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ namespace Spring.Objects.Factory.Config public class PropertyFileVariableSource : IVariableSource { private IResource[] locations; - protected Properties properties; + protected Properties properties; private readonly object objectMonitor = new object(); private bool ignoreMissingResources; @@ -63,39 +63,39 @@ namespace Spring.Objects.Factory.Config public IResource Location { set { locations = new IResource[] { value} ;} - } - - /// - /// Sets a value indicating whether to ignore resource locations that do not exist. This will call - /// the Exists property. - /// - /// - /// true if one should ignore missing resources; otherwise, false. - /// - public bool IgnoreMissingResources - { - set { ignoreMissingResources = value; } } - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve - /// true if the variable can be resolved, false otherwise - public bool CanResolveVariable(string name) - { - lock (objectMonitor) - { - if (properties == null) - { - properties = new Properties(); - InitProperties(); - } - return properties.Contains(name); - } - } - + /// + /// Sets a value indicating whether to ignore resource locations that do not exist. This will call + /// the Exists property. + /// + /// + /// true if one should ignore missing resources; otherwise, false. + /// + public bool IgnoreMissingResources + { + set { ignoreMissingResources = value; } + } + + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve + /// true if the variable can be resolved, false otherwise + public bool CanResolveVariable(string name) + { + lock (objectMonitor) + { + if (properties == null) + { + properties = new Properties(); + InitProperties(); + } + return properties.Contains(name); + } + } + /// /// Resolves variable value for the specified variable name. /// @@ -106,15 +106,15 @@ namespace Spring.Objects.Factory.Config /// The variable value if able to resolve, null otherwise. /// public string ResolveVariable(string name) - { - lock (objectMonitor) - { - if (properties == null) - { - properties = new Properties(); - InitProperties(); - } - return properties.GetProperty(name); + { + lock (objectMonitor) + { + if (properties == null) + { + properties = new Properties(); + InitProperties(); + } + return properties.GetProperty(name); } } @@ -123,18 +123,18 @@ namespace Spring.Objects.Factory.Config /// property file locations. /// protected virtual void InitProperties() - { - foreach (IResource location in locations) - { - bool exists = location.Exists; - if (!exists && ignoreMissingResources) - { - continue; - } - using (Stream input = location.InputStream) - { - properties.Load(input); - } + { + foreach (IResource location in locations) + { + bool exists = location.Exists; + if (!exists && ignoreMissingResources) + { + continue; + } + using (Stream input = location.InputStream) + { + properties.Load(input); + } } } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs index 9e33cac5..1b9dde51 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs index 53e2b06e..014a1eca 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPathFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs index 282634a3..88ea1636 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -159,12 +159,12 @@ namespace Spring.Objects.Factory.Config private string placeholderSuffix = DefaultPlaceholderSuffix; private EnvironmentVariableMode environmentVariableMode = EnvironmentVariableMode.Fallback; - /// - /// Initializes the new instance + /// + /// Initializes the new instance /// - public PropertyPlaceholderConfigurer() - { - logger = LogManager.GetLogger(this.GetType()); + public PropertyPlaceholderConfigurer() + { + logger = LogManager.GetLogger(this.GetType()); } #region Properties @@ -226,8 +226,8 @@ namespace Spring.Objects.Factory.Config /// If an error occured. /// protected override void ProcessProperties(IConfigurableListableObjectFactory factory, NameValueCollection props) - { - PlaceholderResolveHandlerAdapter resolveAdapter = new PlaceholderResolveHandlerAdapter(this, props); + { + PlaceholderResolveHandlerAdapter resolveAdapter = new PlaceholderResolveHandlerAdapter(this, props); ObjectDefinitionVisitor visitor = new ObjectDefinitionVisitor(new ObjectDefinitionVisitor.ResolveHandler(resolveAdapter.ParseAndResolveVariables)); string[] objectDefinitionNames = factory.GetObjectDefinitionNames(); @@ -402,20 +402,20 @@ namespace Spring.Objects.Factory.Config private class PlaceholderResolveHandlerAdapter { private readonly PropertyPlaceholderConfigurer ppc; - private readonly NameValueCollection props; - + private readonly NameValueCollection props; + public PlaceholderResolveHandlerAdapter(PropertyPlaceholderConfigurer outerPPC, NameValueCollection props) { ppc = outerPPC; this.props = props; } - + public string ParseAndResolveVariables(string name) { return ppc.ParseString(props, name, new HashedSet()); } } - #endregion - } + #endregion + } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs index 918e139a..e4cef88a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs index 123d627b..8eab3de8 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyRetrievingFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs index 0ec961e5..e67ba677 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/RegistryVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,17 +45,17 @@ namespace Spring.Objects.Factory.Config set { key = value; } } - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve - /// true if the variable can be resolved, false otherwise - public bool CanResolveVariable(string name) - { - return (key != null && key.GetValue(name, NULL) != NULL); - } - + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve + /// true if the variable can be resolved, false otherwise + public bool CanResolveVariable(string name) + { + return (key != null && key.GetValue(name, NULL) != NULL); + } + /// /// Resolves variable value for the specified variable name. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs index 52ae149b..ee56711e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceHandlerConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs index b0f9076d..1dc5cd1f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ResourceManagerFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs b/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs index af21dba3..5901e064 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/RuntimeObjectReference.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs index 65a3ec05..4fdf9e74 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SetFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs index b1b30d90..446828d7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs index 1636158c..5bf161bc 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SmartInstantiationAwareObjectPostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs index 272b4247..30d3b8fb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SpecialFolderVariableSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,17 +31,17 @@ namespace Spring.Objects.Factory.Config [Serializable] public class SpecialFolderVariableSource : IVariableSource { - /// - /// Before requesting a variable resolution, a client should - /// ask, whether the source can resolve a particular variable name. - /// - /// the name of the variable to resolve - /// true if the variable can be resolved, false otherwise - public bool CanResolveVariable(string name) - { - return ResolveVariable(name) != null; - } - + /// + /// Before requesting a variable resolution, a client should + /// ask, whether the source can resolve a particular variable name. + /// + /// the name of the variable to resolve + /// true if the variable can be resolved, false otherwise + public bool CanResolveVariable(string name) + { + return ResolveVariable(name) != null; + } + /// /// Resolves specified special folder to its full path. /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs index ddf167bb..69d8991f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/TypeAliasConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs b/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs index 9c35d743..99fdc7a0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/TypedStringValue.cs @@ -1,29 +1,29 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - -#region Imports - -using System; +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + +#region Imports + +using System; using Spring.Util; -using Spring.Core.TypeResolution; - +using Spring.Core.TypeResolution; + #endregion namespace Spring.Objects.Factory.Config diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs index b8c0d470..dd6b99d2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/VariableAccessor.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs b/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs index 316f224b..112e85fc 100644 --- a/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/FactoryObjectNotInitializedException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs index 9dea4ae0..bea29aa2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs index 1965f5ea..6585586b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IGenericObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs index 3423aefe..6c928d01 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IHierarchicalObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs b/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs index fdea6183..def90c5c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IInitializingObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs index d945ba41..084c9027 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ namespace Spring.Objects.Factory /// Rod Johnson /// Rick Evans (.NET) public interface IListableObjectFactory : IObjectFactory - { + { /// /// Check if this object factory contains an object definition with the given name. /// @@ -132,11 +132,11 @@ namespace Spring.Objects.Factory /// s will be instantiated). ///

///

- /// Does not consider any hierarchy this factory may participate in. - /// Use - /// to include beans in ancestor factories too. - /// <p>Note: Does <i>not</i> ignore singleton objects that have been registered - /// by other means than bean definitions. + /// Does not consider any hierarchy this factory may participate in. + /// Use + /// to include beans in ancestor factories too. + /// <p>Note: Does <i>not</i> ignore singleton objects that have been registered + /// by other means than bean definitions. ///

/// /// diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs index 8c344fde..e8860d31 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectDefinitionFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs index 16deed0f..8f643188 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs index 5e1cb1ee..398b7df7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectFactoryAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs b/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs index 709ff655..48771255 100644 --- a/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs +++ b/src/Spring/Spring.Core/Objects/Factory/IObjectNameAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs b/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs index 87d0f9a0..777bae92 100644 --- a/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/NoSuchObjectDefinitionException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs index 315e3b90..bb1bd09a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectCreationException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs index 3d171061..432c6319 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectCurrentlyInCreationException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs index 57b4cf67..3da58c2b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectDefinitionException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs index eba7a55e..e38561d7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectFactoryUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs index f7d3597e..2ba4d759 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectInitializationException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs index 4257e126..4648a97d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectIsNotAFactoryException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs b/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs index ac0ec6a1..342f07da 100644 --- a/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/ObjectNotOfRequiredTypeException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs index 17794eab..f89167ac 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs index 56aac5bd..efcefced 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/IProblemReporter.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs index d3cac720..dd6c0fc3 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/Location.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs index 7752305a..6086010b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/ObjectDefinitionParsingException.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs index a4490403..8201811e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/Problem.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs index 7890e49b..b4d6dadb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractAutowireCapableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs index ac08f923..eb11e18e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractMethodReplacer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs index 18242451..ee48e420 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs index 61a39255..668a983e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs index 80f17783..50c58383 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs index 6078e4b5..3ad46d96 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AutowireUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs index 11515cd5..b202a88c 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ChildObjectDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -193,7 +193,7 @@ namespace Spring.Objects.Factory.Support /// public override string ParentName { - get { return parentName; } + get { return parentName; } set { parentName = value; } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs index 96d297c8..9409db72 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultListableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs index f2195e44..c4512ce3 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DefaultObjectDefinitionFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs index aa9ba8e9..cd1d7a08 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingMethodReplacer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs index b5ec7e58..a45e6ac7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DependencyCheckingMode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs index f06e2543..008684c2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IConfigurableObjectDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs index 362b475b..2827021d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IInstantiationStrategy.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs index ba66c771..9f2c4eeb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IMethodReplacer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs index 2ef56617..2ac183a0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionReader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs index bb45ae36..e80a6de7 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,10 +45,10 @@ namespace Spring.Objects.Factory.Support /// Rick Evans (.NET) public interface IObjectDefinitionRegistry { - /// - /// Determine whether the given object name is already in use within this registry, - /// i.e. whether there is a local object or alias registered under this name. - /// + /// + /// Determine whether the given object name is already in use within this registry, + /// i.e. whether there is a local object or alias registered under this name. + /// bool IsObjectNameInUse(string objectName); /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs index 269280a4..60d5da78 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/IObjectDefinitionRegistryPostProcessor.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs index ed2cc47f..1ceef99b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodOverride.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs index fedb3933..48d8b75b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/LookupMethodReplacer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs index d2084bab..3e19c2fa 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodInjectingInstantiationStrategy.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs index f2230e0f..c198cfa3 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverride.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs index 4397967b..c037759b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/MethodOverrides.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs index 93888b15..878cb901 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionReaderUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs index 37a195ef..5b652415 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValidationException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs index b6c78a3d..a0121890 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectScope.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs index 7ab92bd7..705056ba 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/PropertiesObjectDefinitionReader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs index b70a5f0d..fc8c89c4 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/RootObjectDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -253,29 +253,29 @@ namespace Spring.Objects.Factory.Support public RootObjectDefinition(IObjectDefinition other) : base(other) {} - #endregion - - /// - /// Is always null for a . - /// - /// - /// It is safe to request this property's value. Setting any other value than null will - /// raise an . - /// - /// Raised on any attempt to set a non-null value on this property. - public override string ParentName - { - get - { - return null; - } - set - { - if (value != null) - { - throw new ArgumentException("Root Object cannot be changed into a child oject with parent reference"); - } - } + #endregion + + /// + /// Is always null for a . + /// + /// + /// It is safe to request this property's value. Setting any other value than null will + /// raise an . + /// + /// Raised on any attempt to set a non-null value on this property. + public override string ParentName + { + get + { + return null; + } + set + { + if (value != null) + { + throw new ArgumentException("Root Object cannot be changed into a child oject with parent reference"); + } + } } /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs index 5b1eb8e6..ad9bcddb 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs index 1e783930..90b6fc3a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/StaticListableObjectFactory.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,14 +58,14 @@ namespace Spring.Objects.Factory.Support /// private Hashtable objects = new Hashtable(); - /// - /// Determine whether this object factory treats object names case-sensitive or not. - /// - public bool IsCaseSensitive - { - get { return true; } - } - + /// + /// Determine whether this object factory treats object names case-sensitive or not. + /// + public bool IsCaseSensitive + { + get { return true; } + } + /// /// Return the number of objects defined in the factory. /// @@ -92,9 +92,9 @@ namespace Spring.Objects.Factory.Support /// This method is not supported by . /// /// - public object CreateObject(string name, Type requiredType, object[] arguments) - { - throw new NotSupportedException("StaticListableObjectFactory does not support this method."); + public object CreateObject(string name, Type requiredType, object[] arguments) + { + throw new NotSupportedException("StaticListableObjectFactory does not support this method."); } /// diff --git a/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs b/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs index fce36193..246982de 100644 --- a/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs +++ b/src/Spring/Spring.Core/Objects/Factory/UnsatisfiedDependencyException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs index 05b4e3ec..eccaa27d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/DocumentDefaultsDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ namespace Spring.Objects.Factory.Xml { private string autowire; private string dependencyCheck; - private string lazyInit; + private string lazyInit; private string merge; /// @@ -62,16 +62,16 @@ namespace Spring.Objects.Factory.Xml { get { return lazyInit; } set { lazyInit = value; } - } - - /// - /// Gets or sets the merge setting for the document that's currently parsed. - /// - /// The merge. - public string Merge - { - get { return merge; } - set { merge = value; } + } + + /// + /// Gets or sets the merge setting for the document that's currently parsed. + /// + /// The merge. + public string Merge + { + get { return merge; } + set { merge = value; } } } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs index f8a0a9cf..296e049e 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/INamespaceParser.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ namespace Spring.Objects.Factory.Xml /// for actually parsing a DOM document or /// fragment. ///

- /// + /// /// Juergen Hoeller /// Rick Evans (.NET) /// Sandu Turcan (.NET) diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs index 9ed31adc..14670c3f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionDocumentReader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs index 971c5a2b..797a8ea3 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/IObjectDefinitionParser.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs index 9a158aaa..c4d36054 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/NamespaceParserRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs index f240e530..064e02e9 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionConstants.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -88,11 +88,11 @@ namespace Spring.Objects.Factory.Xml /// /// Specifies the default autowire mode. /// - public const string DefaultAutowireAttribute = "default-autowire"; - - /// - /// Specifies the default collection merge mode. - /// + public const string DefaultAutowireAttribute = "default-autowire"; + + /// + /// Specifies the default collection merge mode. + /// public const string DefaultMergeAttribute = "default-merge"; @@ -591,11 +591,11 @@ namespace Spring.Objects.Factory.Xml /// Shortcut alternative to specifying a value element in a /// dictionary entry element with <ref object="..."/>. /// - public const string DictionaryValueRefShortcutAttribute = "value-ref"; - - /// - /// Specify if the collection values should be merged with the parent. - /// + public const string DictionaryValueRefShortcutAttribute = "value-ref"; + + /// + /// Specify if the collection values should be merged with the parent. + /// public const string MergeAttribute = "merge"; /// diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs index 14e0e9ec..20b68990 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs index 7017bdfb..b8e53040 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectFactorySectionHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs index 23ad6c94..86113b86 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ReplacedMethodOverride.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs index d29e695a..0180762f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/FatalObjectException.cs b/src/Spring/Spring.Core/Objects/FatalObjectException.cs index 983f3e88..9bb0b7af 100644 --- a/src/Spring/Spring.Core/Objects/FatalObjectException.cs +++ b/src/Spring/Spring.Core/Objects/FatalObjectException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs index 0384b8f2..d873da47 100644 --- a/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/IEventHandlerValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/IMergable.cs b/src/Spring/Spring.Core/Objects/IMergable.cs index fd33e890..27ac8bb8 100644 --- a/src/Spring/Spring.Core/Objects/IMergable.cs +++ b/src/Spring/Spring.Core/Objects/IMergable.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Objects/IObjectWrapper.cs b/src/Spring/Spring.Core/Objects/IObjectWrapper.cs index 0a3ee236..78d61452 100644 --- a/src/Spring/Spring.Core/Objects/IObjectWrapper.cs +++ b/src/Spring/Spring.Core/Objects/IObjectWrapper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/IPropertyValues.cs b/src/Spring/Spring.Core/Objects/IPropertyValues.cs index 20dad3a7..34416d06 100644 --- a/src/Spring/Spring.Core/Objects/IPropertyValues.cs +++ b/src/Spring/Spring.Core/Objects/IPropertyValues.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/ISharedStateAware.cs b/src/Spring/Spring.Core/Objects/ISharedStateAware.cs index 356b0c1e..7a981f2b 100644 --- a/src/Spring/Spring.Core/Objects/ISharedStateAware.cs +++ b/src/Spring/Spring.Core/Objects/ISharedStateAware.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs b/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs index c146e4ed..8cc46abd 100644 --- a/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs +++ b/src/Spring/Spring.Core/Objects/ISharedStateFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs b/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs index a3d7ca71..5f7b989b 100644 --- a/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs +++ b/src/Spring/Spring.Core/Objects/MutablePropertyValues.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs index 3736e524..56a5ce3b 100644 --- a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs +++ b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ using System.Text; using Common.Logging; using Spring.Core; using Spring.Expressions; -using Spring.Expressions.Parser.antlr; +using Spring.Expressions.Parser.antlr; using Spring.Util; using StringUtils=Spring.Util.StringUtils; diff --git a/src/Spring/Spring.Core/Objects/ObjectsException.cs b/src/Spring/Spring.Core/Objects/ObjectsException.cs index 77c3b952..5e02312b 100644 --- a/src/Spring/Spring.Core/Objects/ObjectsException.cs +++ b/src/Spring/Spring.Core/Objects/ObjectsException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs b/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs index 2003f023..817e6d28 100644 --- a/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs +++ b/src/Spring/Spring.Core/Objects/PropertyAccessExceptionsException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/PropertyValue.cs b/src/Spring/Spring.Core/Objects/PropertyValue.cs index 36a95ba5..a24bcd05 100644 --- a/src/Spring/Spring.Core/Objects/PropertyValue.cs +++ b/src/Spring/Spring.Core/Objects/PropertyValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ using System; using System.Globalization; using Spring.Core; using Spring.Expressions; -using Spring.Expressions.Parser.antlr; +using Spring.Expressions.Parser.antlr; using Spring.Util; namespace Spring.Objects @@ -49,8 +49,8 @@ namespace Spring.Objects [Serializable] public class PropertyValue { - private readonly string propertyName; - private readonly object propertyValue; + private readonly string propertyName; + private readonly object propertyValue; private IExpression propertyExpression; /// diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs index 4d921665..7cf867d0 100644 --- a/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AbstractEventHandlerValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs b/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs index 56ea541c..fe1243ed 100644 --- a/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs +++ b/src/Spring/Spring.Core/Objects/Support/AbstractSharedStateFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs index d940df6c..6fa32575 100644 --- a/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AbstractWiringEventHandlerValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs index 59966756..c46a61eb 100644 --- a/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs +++ b/src/Spring/Spring.Core/Objects/Support/ArgumentConvertingMethodInvoker.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs index 64549204..8179e9e1 100644 --- a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs b/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs index 01b2b2ae..c9562282 100644 --- a/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs +++ b/src/Spring/Spring.Core/Objects/Support/ByTypeSharedStateFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs b/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs index 20bf5df5..1aacf4d0 100644 --- a/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Support/ISortDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs index 664837f4..4c5354ee 100644 --- a/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/InstanceEventHandlerValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs index 199ec4a0..939bae54 100644 --- a/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs +++ b/src/Spring/Spring.Core/Objects/Support/MethodInvoker.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs b/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs index 4ad4bb1f..d6b84268 100644 --- a/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs +++ b/src/Spring/Spring.Core/Objects/Support/MutableSortDefinition.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs index 7504dcda..7fb2c843 100644 --- a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs +++ b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -191,14 +191,14 @@ namespace Spring.Objects.Support /// public static void Sort(IList source, ISortDefinition sortDefinition) { -// ArrayList.Adapter(source).Sort(new PropertyComparator(sortDefinition)); - ICollection coll = CollectionUtils.StableSort(source, new PropertyComparator(sortDefinition)); - int index = 0; +// ArrayList.Adapter(source).Sort(new PropertyComparator(sortDefinition)); + ICollection coll = CollectionUtils.StableSort(source, new PropertyComparator(sortDefinition)); + int index = 0; IEnumerator it = coll.GetEnumerator(); while(it.MoveNext()) - { - source[index] = it.Current; - index++; + { + source[index] = it.Current; + index++; } } } diff --git a/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs index 9539480f..2906ec7d 100644 --- a/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/StaticEventHandlerValue.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Pool/IObjectPool.cs b/src/Spring/Spring.Core/Pool/IObjectPool.cs index 07d99650..3315e0ba 100644 --- a/src/Spring/Spring.Core/Pool/IObjectPool.cs +++ b/src/Spring/Spring.Core/Pool/IObjectPool.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs b/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs index 6d81d365..5237a4a2 100644 --- a/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs +++ b/src/Spring/Spring.Core/Pool/IPoolableObjectFactory.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Pool/PoolException.cs b/src/Spring/Spring.Core/Pool/PoolException.cs index d4114d81..502d6723 100644 --- a/src/Spring/Spring.Core/Pool/PoolException.cs +++ b/src/Spring/Spring.Core/Pool/PoolException.cs @@ -1,6 +1,6 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Pool/Support/SimplePool.cs b/src/Spring/Spring.Core/Pool/Support/SimplePool.cs index 568b8819..4e017a97 100644 --- a/src/Spring/Spring.Core/Pool/Support/SimplePool.cs +++ b/src/Spring/Spring.Core/Pool/Support/SimplePool.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs index c0cc67df..3f509126 100644 --- a/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/AbstractProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs index fc0ef94e..34d81a81 100644 --- a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs index e0e829f8..7dac8f63 100644 --- a/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/BaseProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs index ddd137eb..9a0059ff 100644 --- a/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/CompositionProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs b/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs index f2eaeb2a..d3869c9e 100644 --- a/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs +++ b/src/Spring/Spring.Core/Proxy/DynamicProxyManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs index d451df91..e38c5b34 100644 --- a/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/IProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs index 26864638..f2cf8e2b 100644 --- a/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/IProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs b/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs index e78677de..a5815586 100644 --- a/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs +++ b/src/Spring/Spring.Core/Proxy/IProxyTypeGenerator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs index 77e03cc1..486b6b4e 100644 --- a/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/InheritanceProxyTypeBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs b/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs index bb858d60..866b20ca 100644 --- a/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs +++ b/src/Spring/Spring.Core/Proxy/ProxyIgnoreAttribute.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs b/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs index c5414ab9..67a90ab0 100644 --- a/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/TargetProxyMethodBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs index aa54a553..f537f32f 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/BaseDynamicMember.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs index ec5550f3..264bc6e0 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicConstructor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #region Imports using System; -using System.Collections; +using System.Collections; using System.Reflection; using System.Reflection.Emit; using Spring.Util; @@ -110,10 +110,10 @@ namespace Spring.Reflection.Dynamic /// /// /// A constructor value. - /// - public object Invoke(object[] arguments) - { - return constructor(arguments); + /// + public object Invoke(object[] arguments) + { + return constructor(arguments); } #else private IDynamicConstructor dynamicConstructor; @@ -133,7 +133,7 @@ namespace Spring.Reflection.Dynamic this.isOptimized = true; } } - + /// /// Invokes dynamic constructor. /// @@ -173,19 +173,19 @@ namespace Spring.Reflection.Dynamic /// /// Factory class for dynamic constructors. /// - /// Aleksandar Seovic - public class DynamicConstructor : BaseDynamicMember - { + /// Aleksandar Seovic + public class DynamicConstructor : BaseDynamicMember + { /// /// Creates dynamic constructor instance for the specified . /// /// Constructor info to create dynamic constructor for. /// Dynamic constructor for the specified . public static IDynamicConstructor Create(ConstructorInfo constructorInfo) - { + { AssertUtils.ArgumentNotNull(constructorInfo, "You cannot create a dynamic constructor for a null value."); - - return new SafeConstructor(constructorInfo); + + return new SafeConstructor(constructorInfo); } } @@ -238,8 +238,8 @@ namespace Spring.Reflection.Dynamic ILGenerator il = invokeMethod.GetILGenerator(); DynamicReflectionManager.EmitInvokeConstructor(il, constructor, true); - } + } #endregion } -#endif +#endif } diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs index f29df28d..8bb22aa1 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicField.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -262,18 +262,18 @@ namespace Spring.Reflection.Dynamic throw new InvalidOperationException("Cannot set value of a read-only field or a constant."); } - try - { + try + { fieldInfo.SetValue(target, value); - } - catch(ArgumentException) - { - if (value != null && !fieldInfo.GetType().IsAssignableFrom(value.GetType())) - { - throw new InvalidCastException(); - } - throw; - } + } + catch(ArgumentException) + { + if (value != null && !fieldInfo.GetType().IsAssignableFrom(value.GetType())) + { + throw new InvalidCastException(); + } + throw; + } } #endif internal FieldInfo FieldInfo diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs index 57ca980b..a680e763 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicIndexer.cs @@ -1,7 +1,7 @@ -#region License - +#region License + /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,278 +14,278 @@ * 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. - */ - -#endregion - -#region Imports - -using System; -using System.Collections; -using System.Reflection; -using System.Reflection.Emit; -using Spring.Reflection.Dynamic; -using Spring.Util; - -#endregion - -namespace Spring.Reflection.Dynamic -{ - #region IDynamicIndexer interface - - /// - /// Defines methods that dynamic indexer class has to implement. - /// - public interface IDynamicIndexer - { - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to get the indexer value from. - /// - /// - /// Indexer argument. - /// - /// - /// A indexer value. - /// - object GetValue( object target, int index ); - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to get the indexer value from. - /// - /// - /// Indexer argument. - /// - /// - /// A indexer value. - /// - object GetValue( object target, object index ); - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to get the indexer value from. - /// - /// - /// Indexer arguments. - /// - /// - /// A indexer value. - /// - object GetValue( object target, object[] index ); - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to set the indexer value on. - /// - /// - /// Indexer argument. - /// - /// - /// A new indexer value. - /// - void SetValue( object target, int index, object value ); - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to set the indexer value on. - /// - /// - /// Indexer argument. - /// - /// - /// A new indexer value. - /// - void SetValue( object target, object index, object value ); - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to set the indexer value on. - /// - /// - /// Indexer arguments. - /// - /// - /// A new indexer value. - /// - void SetValue( object target, object[] index, object value ); - } - - #endregion - - #region Safe wrapper - -#if NET_2_0 - /// - /// Safe wrapper for the dynamic indexer. - /// - /// - /// will attempt to use dynamic - /// indexer if possible, but it will fall back to standard - /// reflection if necessary. - /// - [Obsolete("Use SafeProperty instead", false)] - public class SafeIndexer : IDynamicIndexer - { - private PropertyInfo indexerProperty; - - /// - /// Internal PropertyInfo accessor. - /// - internal PropertyInfo IndexerProperty - { - get { return indexerProperty; } - } - - private SafeProperty property; - - /// - /// Creates a new instance of the safe indexer wrapper. - /// - /// Indexer to wrap. - public SafeIndexer( PropertyInfo indexerInfo ) - { - AssertUtils.ArgumentNotNull( indexerInfo, "You cannot create a dynamic indexer for a null value." ); - - this.indexerProperty = indexerInfo; - this.property = new SafeProperty( indexerInfo ); - } - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to get indexer value from. - /// - /// - /// Indexer arguments. - /// - /// - /// A indexer value. - /// - public object GetValue( object target, int index ) - { - return property.GetValue( target, index ); - } - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to get the indexer value from. - /// - /// - /// Indexer argument. - /// - /// - /// A indexer value. - /// - public object GetValue( object target, object index ) - { - return property.GetValue( target, index ); - } - - /// - /// Gets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to get indexer value from. - /// - /// - /// Indexer arguments. - /// - /// - /// A indexer value. - /// - public object GetValue( object target, object[] index ) - { - return property.GetValue( target, index ); - } - - /// - /// Sets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to set indexer value on. - /// - /// - /// Indexer arguments. - /// - /// - /// A new indexer value. - /// - public void SetValue( object target, int index, object value ) - { - property.SetValue( target, value, index ); - } - - /// - /// Sets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to set indexer value on. - /// - /// - /// Indexer arguments. - /// - /// - /// A new indexer value. - /// - public void SetValue( object target, object index, object value ) - { - property.SetValue( target, value, index ); - } - - /// - /// Sets the value of the dynamic indexer for the specified target object. - /// - /// - /// Target object to set indexer value on. - /// - /// - /// Indexer arguments. - /// - /// - /// A new indexer value. - /// - public void SetValue( object target, object[] index, object value ) - { - property.SetValue( target, value, index ); - } - } - + */ + +#endregion + +#region Imports + +using System; +using System.Collections; +using System.Reflection; +using System.Reflection.Emit; +using Spring.Reflection.Dynamic; +using Spring.Util; + +#endregion + +namespace Spring.Reflection.Dynamic +{ + #region IDynamicIndexer interface + + /// + /// Defines methods that dynamic indexer class has to implement. + /// + public interface IDynamicIndexer + { + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to get the indexer value from. + /// + /// + /// Indexer argument. + /// + /// + /// A indexer value. + /// + object GetValue( object target, int index ); + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to get the indexer value from. + /// + /// + /// Indexer argument. + /// + /// + /// A indexer value. + /// + object GetValue( object target, object index ); + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to get the indexer value from. + /// + /// + /// Indexer arguments. + /// + /// + /// A indexer value. + /// + object GetValue( object target, object[] index ); + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to set the indexer value on. + /// + /// + /// Indexer argument. + /// + /// + /// A new indexer value. + /// + void SetValue( object target, int index, object value ); + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to set the indexer value on. + /// + /// + /// Indexer argument. + /// + /// + /// A new indexer value. + /// + void SetValue( object target, object index, object value ); + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to set the indexer value on. + /// + /// + /// Indexer arguments. + /// + /// + /// A new indexer value. + /// + void SetValue( object target, object[] index, object value ); + } + + #endregion + + #region Safe wrapper + +#if NET_2_0 + /// + /// Safe wrapper for the dynamic indexer. + /// + /// + /// will attempt to use dynamic + /// indexer if possible, but it will fall back to standard + /// reflection if necessary. + /// + [Obsolete("Use SafeProperty instead", false)] + public class SafeIndexer : IDynamicIndexer + { + private PropertyInfo indexerProperty; + + /// + /// Internal PropertyInfo accessor. + /// + internal PropertyInfo IndexerProperty + { + get { return indexerProperty; } + } + + private SafeProperty property; + + /// + /// Creates a new instance of the safe indexer wrapper. + /// + /// Indexer to wrap. + public SafeIndexer( PropertyInfo indexerInfo ) + { + AssertUtils.ArgumentNotNull( indexerInfo, "You cannot create a dynamic indexer for a null value." ); + + this.indexerProperty = indexerInfo; + this.property = new SafeProperty( indexerInfo ); + } + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to get indexer value from. + /// + /// + /// Indexer arguments. + /// + /// + /// A indexer value. + /// + public object GetValue( object target, int index ) + { + return property.GetValue( target, index ); + } + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to get the indexer value from. + /// + /// + /// Indexer argument. + /// + /// + /// A indexer value. + /// + public object GetValue( object target, object index ) + { + return property.GetValue( target, index ); + } + + /// + /// Gets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to get indexer value from. + /// + /// + /// Indexer arguments. + /// + /// + /// A indexer value. + /// + public object GetValue( object target, object[] index ) + { + return property.GetValue( target, index ); + } + + /// + /// Sets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to set indexer value on. + /// + /// + /// Indexer arguments. + /// + /// + /// A new indexer value. + /// + public void SetValue( object target, int index, object value ) + { + property.SetValue( target, value, index ); + } + + /// + /// Sets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to set indexer value on. + /// + /// + /// Indexer arguments. + /// + /// + /// A new indexer value. + /// + public void SetValue( object target, object index, object value ) + { + property.SetValue( target, value, index ); + } + + /// + /// Sets the value of the dynamic indexer for the specified target object. + /// + /// + /// Target object to set indexer value on. + /// + /// + /// Indexer arguments. + /// + /// + /// A new indexer value. + /// + public void SetValue( object target, object[] index, object value ) + { + property.SetValue( target, value, index ); + } + } + #else - /// - /// Safe wrapper for the dynamic indexer. - /// - /// - /// will attempt to use dynamic - /// indexer if possible, but it will fall back to standard - /// reflection if necessary. - /// - public class SafeIndexer : IDynamicIndexer - { - private PropertyInfo indexerProperty; - - /// - /// Internal PropertyInfo accessor. - /// - internal PropertyInfo IndexerProperty - { - get { return indexerProperty; } + /// + /// Safe wrapper for the dynamic indexer. + /// + /// + /// will attempt to use dynamic + /// indexer if possible, but it will fall back to standard + /// reflection if necessary. + /// + public class SafeIndexer : IDynamicIndexer + { + private PropertyInfo indexerProperty; + + /// + /// Internal PropertyInfo accessor. + /// + internal PropertyInfo IndexerProperty + { + get { return indexerProperty; } } private IDynamicIndexer dynamicIndexer; @@ -486,37 +486,37 @@ namespace Spring.Reflection.Dynamic indexerProperty.SetValue(target, value, index); } } - } -#endif - - #endregion - -#if NET_2_0 - /// - /// Factory class for dynamic indexers. - /// - /// Aleksandar Seovic - [Obsolete( "Use DynamicProperty instead", false )] - public sealed class DynamicIndexer : BaseDynamicMember - { - /// - /// Prevent instantiation - /// - private DynamicIndexer() { } - - /// - /// Creates dynamic indexer instance for the specified . - /// - /// Indexer info to create dynamic indexer for. - /// Dynamic indexer for the specified . - public static IDynamicIndexer Create( PropertyInfo indexer ) - { - AssertUtils.ArgumentNotNull( indexer, "You cannot create a dynamic indexer for a null value." ); - - IDynamicIndexer dynamicIndexer = new SafeIndexer( indexer ); - return dynamicIndexer; - } - } + } +#endif + + #endregion + +#if NET_2_0 + /// + /// Factory class for dynamic indexers. + /// + /// Aleksandar Seovic + [Obsolete( "Use DynamicProperty instead", false )] + public sealed class DynamicIndexer : BaseDynamicMember + { + /// + /// Prevent instantiation + /// + private DynamicIndexer() { } + + /// + /// Creates dynamic indexer instance for the specified . + /// + /// Indexer info to create dynamic indexer for. + /// Dynamic indexer for the specified . + public static IDynamicIndexer Create( PropertyInfo indexer ) + { + AssertUtils.ArgumentNotNull( indexer, "You cannot create a dynamic indexer for a null value." ); + + IDynamicIndexer dynamicIndexer = new SafeIndexer( indexer ); + return dynamicIndexer; + } + } #else /// /// Factory class for dynamic indexers. @@ -683,6 +683,6 @@ namespace Spring.Reflection.Dynamic #endregion } -#endif - +#endif + } // namespace \ No newline at end of file diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs index d8f44e73..1e2e43e1 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicMethod.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ using System; using System.Collections; -using System.Collections.Specialized; +using System.Collections.Specialized; using System.Reflection; -using System.Reflection.Emit; -using Spring.Collections; +using System.Reflection.Emit; +using Spring.Collections; using Spring.Util; namespace Spring.Reflection.Dynamic @@ -87,24 +87,24 @@ namespace Spring.Reflection.Dynamic this.method = method; this.nullArguments = nullArguments; } - } - - private class IdentityTable : Hashtable - { - public IdentityTable() - {} - - protected override int GetHash(object key) - { - return key.GetHashCode(); - } - - protected override bool KeyEquals(object item, object key) - { - return ReferenceEquals(item, key); - } - } - + } + + private class IdentityTable : Hashtable + { + public IdentityTable() + {} + + protected override int GetHash(object key) + { + return key.GetHashCode(); + } + + protected override bool KeyEquals(object item, object key) + { + return ReferenceEquals(item, key); + } + } + private static readonly Hashtable stateCache = new IdentityTable(); #endregion diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs index 0c33f07f..97134591 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,7 +67,7 @@ namespace Spring.Reflection.Dynamic /// /// Target object to get property value from. /// - /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. + /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. /// /// A property value. /// @@ -82,7 +82,7 @@ namespace Spring.Reflection.Dynamic /// /// A new property value. /// - /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. + /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. void SetValue(object target, object value, params object[] index); } @@ -181,13 +181,13 @@ namespace Spring.Reflection.Dynamic /// /// Target object to get property value from. /// - /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. + /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. /// /// A property value. /// public object GetValue(object target, params object[] index) - { - return getter(target, index); + { + return getter(target, index); } /// @@ -213,10 +213,10 @@ namespace Spring.Reflection.Dynamic /// /// A new property value. /// - /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. + /// Optional index values for indexed properties. This value should be null reference for non-indexed properties. public void SetValue(object target, object value, params object[] index) - { - setter(target, value, index); + { + setter(target, value, index); } #else @@ -634,7 +634,7 @@ namespace Spring.Reflection.Dynamic } } - private static OpCode[] LdArgOpCodes = { OpCodes.Ldarg_0, OpCodes.Ldarg_1, OpCodes.Ldarg_2, OpCodes.Ldarg_3 }; + private static OpCode[] LdArgOpCodes = { OpCodes.Ldarg_0, OpCodes.Ldarg_1, OpCodes.Ldarg_2, OpCodes.Ldarg_3 }; private static void SetupIndexerArgument(ILGenerator il, int indexArgumentPosition, Type argumentType, int argumentPosition, bool isObjectArray) { diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs index a3481d71..f3d09c8f 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicReflectionManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/ISync.cs b/src/Spring/Spring.Core/Threading/ISync.cs index 1485f08f..2253742d 100644 --- a/src/Spring/Spring.Core/Threading/ISync.cs +++ b/src/Spring/Spring.Core/Threading/ISync.cs @@ -1,6 +1,6 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/Latch.cs b/src/Spring/Spring.Core/Threading/Latch.cs index 15a05014..8df115ce 100644 --- a/src/Spring/Spring.Core/Threading/Latch.cs +++ b/src/Spring/Spring.Core/Threading/Latch.cs @@ -1,6 +1,6 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs b/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs index 9980dd14..35c809ac 100644 --- a/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs +++ b/src/Spring/Spring.Core/Threading/LogicalThreadContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/Semaphore.cs b/src/Spring/Spring.Core/Threading/Semaphore.cs index d4669d97..8ce8f62f 100644 --- a/src/Spring/Spring.Core/Threading/Semaphore.cs +++ b/src/Spring/Spring.Core/Threading/Semaphore.cs @@ -1,6 +1,6 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/SyncHolder.cs b/src/Spring/Spring.Core/Threading/SyncHolder.cs index 912f2d48..4681d5df 100644 --- a/src/Spring/Spring.Core/Threading/SyncHolder.cs +++ b/src/Spring/Spring.Core/Threading/SyncHolder.cs @@ -1,6 +1,6 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/TimeoutException.cs b/src/Spring/Spring.Core/Threading/TimeoutException.cs index 969e9576..4fee4cb1 100644 --- a/src/Spring/Spring.Core/Threading/TimeoutException.cs +++ b/src/Spring/Spring.Core/Threading/TimeoutException.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/TimeoutSync.cs b/src/Spring/Spring.Core/Threading/TimeoutSync.cs index 67d9011f..c7445cb0 100644 --- a/src/Spring/Spring.Core/Threading/TimeoutSync.cs +++ b/src/Spring/Spring.Core/Threading/TimeoutSync.cs @@ -1,6 +1,6 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Threading/Utils.cs b/src/Spring/Spring.Core/Threading/Utils.cs index 49d49309..96646d2a 100644 --- a/src/Spring/Spring.Core/Threading/Utils.cs +++ b/src/Spring/Spring.Core/Threading/Utils.cs @@ -1,7 +1,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/ArrayUtils.cs b/src/Spring/Spring.Core/Util/ArrayUtils.cs index 37e31155..00851572 100644 --- a/src/Spring/Spring.Core/Util/ArrayUtils.cs +++ b/src/Spring/Spring.Core/Util/ArrayUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,30 +40,30 @@ namespace Spring.Util /// the collection to be checked. /// true if the collection has a length and contains only non-null elements. public static bool HasElements(ICollection collection) - { - if (!HasLength(collection)) return false; - IEnumerator it = collection.GetEnumerator(); - while(it.MoveNext()) - { - if (it.Current == null ) return false; - } - return true; + { + if (!HasLength(collection)) return false; + IEnumerator it = collection.GetEnumerator(); + while(it.MoveNext()) + { + if (it.Current == null ) return false; + } + return true; } - /// - /// Use this sort method instead of to overcome - /// bugs in Mono. - /// + /// + /// Use this sort method instead of to overcome + /// bugs in Mono. + /// public static void Sort(Array array, IComparer comparer) - { - if (SystemUtils.MonoRuntime) - { - ArrayList list = new ArrayList(array); - list.Sort(comparer); - list.ToArray().CopyTo(array, list.Count); - return; - } - Array.Sort(array, comparer); + { + if (SystemUtils.MonoRuntime) + { + ArrayList list = new ArrayList(array); + list.Sort(comparer); + list.ToArray().CopyTo(array, list.Count); + return; + } + Array.Sort(array, comparer); } /// /// Checks if the given array or collection is null or has no elements. @@ -190,37 +190,37 @@ namespace Spring.Util return sb.ToString(); } - /// - /// Concatenates 2 arrays of compatible element types - /// - /// - /// If either of the arguments is null, the other array is returned as the result. - /// The array element types may differ as long as they are assignable. The result array will be of the "smaller" element type. - /// + /// + /// Concatenates 2 arrays of compatible element types + /// + /// + /// If either of the arguments is null, the other array is returned as the result. + /// The array element types may differ as long as they are assignable. The result array will be of the "smaller" element type. + /// public static Array Concat(Array first, Array second) - { - if (first == null) return second; - if (second == null) return first; - - Type resultElementType; - Type firstElementType = first.GetType().GetElementType(); - Type secondElementType = second.GetType().GetElementType(); - if (firstElementType.IsAssignableFrom(secondElementType)) - { - resultElementType = firstElementType; - } - else if (secondElementType.IsAssignableFrom(firstElementType)) - { - resultElementType = secondElementType; - } - else - { - throw new ArgumentException(string.Format("Array element types '{0}' and '{1}' are not compatible", firstElementType, secondElementType)); - } - Array result = Array.CreateInstance(resultElementType, first.Length + second.Length); - Array.Copy( first, result, first.Length ); - Array.Copy(second, 0, result, first.Length, second.Length); - return result; + { + if (first == null) return second; + if (second == null) return first; + + Type resultElementType; + Type firstElementType = first.GetType().GetElementType(); + Type secondElementType = second.GetType().GetElementType(); + if (firstElementType.IsAssignableFrom(secondElementType)) + { + resultElementType = firstElementType; + } + else if (secondElementType.IsAssignableFrom(firstElementType)) + { + resultElementType = secondElementType; + } + else + { + throw new ArgumentException(string.Format("Array element types '{0}' and '{1}' are not compatible", firstElementType, secondElementType)); + } + Array result = Array.CreateInstance(resultElementType, first.Length + second.Length); + Array.Copy( first, result, first.Length ); + Array.Copy(second, 0, result, first.Length, second.Length); + return result; } } } \ No newline at end of file diff --git a/src/Spring/Spring.Core/Util/AssertUtils.cs b/src/Spring/Spring.Core/Util/AssertUtils.cs index d61c2bab..bee76fc6 100644 --- a/src/Spring/Spring.Core/Util/AssertUtils.cs +++ b/src/Spring/Spring.Core/Util/AssertUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +22,10 @@ using System; using System.Collections; -using System.Globalization; -using System.Reflection; -using System.Runtime.Remoting; -using System.Runtime.Remoting.Proxies; +using System.Globalization; +using System.Reflection; +using System.Runtime.Remoting; +using System.Runtime.Remoting.Proxies; using System.Runtime.Serialization; #endregion @@ -44,121 +44,121 @@ namespace Spring.Util /// Erich Eichinger public sealed class AssertUtils { - /// - /// Checks, whether may be invoked on . - /// Supports testing transparent proxies. - /// - ///the target instance or null - ///the name of the target to be used in error messages - ///the method to test for - /// - /// if is null - /// - /// - /// if it is not possible to invoke on - /// + /// + /// Checks, whether may be invoked on . + /// Supports testing transparent proxies. + /// + ///the target instance or null + ///the name of the target to be used in error messages + ///the method to test for + /// + /// if is null + /// + /// + /// if it is not possible to invoke on + /// public static void Understands(object target, string targetName, MethodBase method) - { - ArgumentNotNull(method, "method"); - - if (target==null ) - { - if (method.IsStatic) - { - return; - } - throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' is null and target method '{1}.{2}' is not static.", targetName, method.DeclaringType.FullName, method.Name)); - } - - Understands(target, targetName, method.DeclaringType); - } - - /// - /// checks, whether supports the methods of . - /// Supports testing transparent proxies. - /// - ///the target instance or null - ///the name of the target to be used in error messages - ///the type to test for - /// - /// if is null - /// - /// - /// if it is not possible to invoke methods of - /// type on - /// + { + ArgumentNotNull(method, "method"); + + if (target==null ) + { + if (method.IsStatic) + { + return; + } + throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' is null and target method '{1}.{2}' is not static.", targetName, method.DeclaringType.FullName, method.Name)); + } + + Understands(target, targetName, method.DeclaringType); + } + + /// + /// checks, whether supports the methods of . + /// Supports testing transparent proxies. + /// + ///the target instance or null + ///the name of the target to be used in error messages + ///the type to test for + /// + /// if is null + /// + /// + /// if it is not possible to invoke methods of + /// type on + /// public static void Understands(object target, string targetName, Type requiredType) - { - ArgumentNotNull(requiredType, "requiredType"); - - if (target == null) - { - throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' is null.", targetName)); - } - - Type targetType; - if (RemotingServices.IsTransparentProxy(target)) - { - RealProxy rp = RemotingServices.GetRealProxy(target); - IRemotingTypeInfo rti = rp as IRemotingTypeInfo; - if (rti != null) - { - if (rti.CanCastTo(requiredType, target)) - { - return; - } - throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' is a transparent proxy that does not support methods of '{1}'.", targetName, requiredType.FullName)); - } - targetType = rp.GetProxiedType(); - } - else - { - targetType = target.GetType(); - } - - if (!requiredType.IsAssignableFrom(targetType)) - { - throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' of type '{1}' does not support methods of '{2}'.", targetName, targetType, requiredType.FullName)); - } - } - - #region checking casts on transparent proxies (From BCL via Reflector) - // private static bool CheckCast(RealProxy rp, Type castType) -// { -// bool flag = false; -// if (castType == typeof(object)) -// { -// return true; -// } -// if (!castType.IsInterface && !castType.IsMarshalByRef) -// { -// return false; -// } -// if (castType != typeof(IObjectReference)) -// { -// IRemotingTypeInfo typeInfo = rp as IRemotingTypeInfo; -// if (typeInfo != null) -// { -// return typeInfo.CanCastTo(castType, rp.GetTransparentProxy()); -// } -// Identity identityObject = rp.IdentityObject; -// if (identityObject != null) -// { -// ObjRef objectRef = identityObject.ObjectRef; -// if (objectRef != null) -// { -// typeInfo = objectRef.TypeInfo; -// if (typeInfo != null) -// { -// flag = typeInfo.CanCastTo(castType, rp.GetTransparentProxy()); -// } -// } -// } -// } -// return flag; - // } - #endregion - + { + ArgumentNotNull(requiredType, "requiredType"); + + if (target == null) + { + throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' is null.", targetName)); + } + + Type targetType; + if (RemotingServices.IsTransparentProxy(target)) + { + RealProxy rp = RemotingServices.GetRealProxy(target); + IRemotingTypeInfo rti = rp as IRemotingTypeInfo; + if (rti != null) + { + if (rti.CanCastTo(requiredType, target)) + { + return; + } + throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' is a transparent proxy that does not support methods of '{1}'.", targetName, requiredType.FullName)); + } + targetType = rp.GetProxiedType(); + } + else + { + targetType = target.GetType(); + } + + if (!requiredType.IsAssignableFrom(targetType)) + { + throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, "Target '{0}' of type '{1}' does not support methods of '{2}'.", targetName, targetType, requiredType.FullName)); + } + } + + #region checking casts on transparent proxies (From BCL via Reflector) + // private static bool CheckCast(RealProxy rp, Type castType) +// { +// bool flag = false; +// if (castType == typeof(object)) +// { +// return true; +// } +// if (!castType.IsInterface && !castType.IsMarshalByRef) +// { +// return false; +// } +// if (castType != typeof(IObjectReference)) +// { +// IRemotingTypeInfo typeInfo = rp as IRemotingTypeInfo; +// if (typeInfo != null) +// { +// return typeInfo.CanCastTo(castType, rp.GetTransparentProxy()); +// } +// Identity identityObject = rp.IdentityObject; +// if (identityObject != null) +// { +// ObjRef objectRef = identityObject.ObjectRef; +// if (objectRef != null) +// { +// typeInfo = objectRef.TypeInfo; +// if (typeInfo != null) +// { +// flag = typeInfo.CanCastTo(castType, rp.GetTransparentProxy()); +// } +// } +// } +// } +// return flag; + // } + #endregion + /// /// Checks the value of the supplied and throws an /// if it is . @@ -299,7 +299,7 @@ namespace Spring.Util /// contains no elements or only null elements. /// public static void ArgumentHasElements(ICollection argument, string name) - { + { if (!ArrayUtils.HasElements(argument)) { throw new ArgumentException( @@ -307,7 +307,7 @@ namespace Spring.Util string.Format( CultureInfo.InvariantCulture, "Argument '{0}' must not be null or resolve to an empty collection and must contain non-null elements", name)); - } + } } @@ -334,37 +334,37 @@ namespace Spring.Util { throw new ArgumentException(message, argumentName); } - } - - - /// - /// Assert a boolean expression, throwing ArgumentException - /// if the test result is false. - /// - /// a boolean expression. - /// The exception message to use if the assertion fails. - /// - /// if expression is false - /// + } + + + /// + /// Assert a boolean expression, throwing ArgumentException + /// if the test result is false. + /// + /// a boolean expression. + /// The exception message to use if the assertion fails. + /// + /// if expression is false + /// public static void IsTrue(bool expression, string message) - { - if (!expression) - { - throw new ArgumentException(message); - } - } - - /// - /// Assert a boolean expression, throwing ArgumentException - /// if the test result is false. - /// - /// a boolean expression. - /// - /// if expression is false - /// - public static void IsTrue(bool expression) - { - IsTrue(expression, "[Assertion failed] - this expression must be true"); + { + if (!expression) + { + throw new ArgumentException(message); + } + } + + /// + /// Assert a boolean expression, throwing ArgumentException + /// if the test result is false. + /// + /// a boolean expression. + /// + /// if expression is false + /// + public static void IsTrue(bool expression) + { + IsTrue(expression, "[Assertion failed] - this expression must be true"); } /// diff --git a/src/Spring/Spring.Core/Util/CollectionUtils.cs b/src/Spring/Spring.Core/Util/CollectionUtils.cs index 083b96c6..c9b9bed3 100644 --- a/src/Spring/Spring.Core/Util/CollectionUtils.cs +++ b/src/Spring/Spring.Core/Util/CollectionUtils.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion @@ -55,7 +55,7 @@ namespace Spring.Util public static bool HasLength(ICollection collection) { return ArrayUtils.HasLength(collection); - } + } /// /// Determine whether a given collection only contains diff --git a/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs b/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs index fce5de41..cc15f170 100644 --- a/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs +++ b/src/Spring/Spring.Core/Util/ConfigXmlAttribute.cs @@ -1,27 +1,27 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - -#region Imports - -using System.Xml; - +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + +#region Imports + +using System.Xml; + #endregion namespace Spring.Util diff --git a/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs b/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs index a54114f9..044bce00 100644 --- a/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs +++ b/src/Spring/Spring.Core/Util/ConfigXmlDocument.cs @@ -1,31 +1,31 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - -#region Imports - +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + +#region Imports + using System; using System.IO; using System.Net; -using System.Xml; - -#endregion +using System.Xml; + +#endregion namespace Spring.Util { diff --git a/src/Spring/Spring.Core/Util/ConfigXmlElement.cs b/src/Spring/Spring.Core/Util/ConfigXmlElement.cs index 78cafdad..3b5a8a95 100644 --- a/src/Spring/Spring.Core/Util/ConfigXmlElement.cs +++ b/src/Spring/Spring.Core/Util/ConfigXmlElement.cs @@ -1,27 +1,27 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - -#region Imports - -using System.Xml; - +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + +#region Imports + +using System.Xml; + #endregion namespace Spring.Util diff --git a/src/Spring/Spring.Core/Util/DelegateInfo.cs b/src/Spring/Spring.Core/Util/DelegateInfo.cs index 49faa431..6f35e78d 100644 --- a/src/Spring/Spring.Core/Util/DelegateInfo.cs +++ b/src/Spring/Spring.Core/Util/DelegateInfo.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/DynamicCodeManager.cs b/src/Spring/Spring.Core/Util/DynamicCodeManager.cs index 0c2804fd..58beb81f 100644 --- a/src/Spring/Spring.Core/Util/DynamicCodeManager.cs +++ b/src/Spring/Spring.Core/Util/DynamicCodeManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/EventUtils.cs b/src/Spring/Spring.Core/Util/EventUtils.cs index dcfac70c..5b2e822e 100644 --- a/src/Spring/Spring.Core/Util/EventUtils.cs +++ b/src/Spring/Spring.Core/Util/EventUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/FatalReflectionException.cs b/src/Spring/Spring.Core/Util/FatalReflectionException.cs index fcf8e6ab..b24c9c34 100644 --- a/src/Spring/Spring.Core/Util/FatalReflectionException.cs +++ b/src/Spring/Spring.Core/Util/FatalReflectionException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs index a03d7cc2..256190f4 100644 --- a/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs +++ b/src/Spring/Spring.Core/Util/Generic/CollectionUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -133,26 +133,26 @@ namespace Spring.Util.Generic /// Removes all the elements from the target collection that are contained in the source collection. /// /// Collection where the elements will be removed. - /// Elements to remove from the target collection. - public static void RemoveAll(ICollection targetCollection, ICollection sourceCollection) - { - if (targetCollection == null) - { - throw new ArgumentNullException("targetCollection", "Collection cannot be null."); - } - - if (sourceCollection == null) - { - throw new ArgumentNullException("sourceCollection", "Collection cannot be null."); - } - foreach (T element in sourceCollection) - { - if (targetCollection.Contains(element)) - { - targetCollection.Remove(element); - } - } - } + /// Elements to remove from the target collection. + public static void RemoveAll(ICollection targetCollection, ICollection sourceCollection) + { + if (targetCollection == null) + { + throw new ArgumentNullException("targetCollection", "Collection cannot be null."); + } + + if (sourceCollection == null) + { + throw new ArgumentNullException("sourceCollection", "Collection cannot be null."); + } + foreach (T element in sourceCollection) + { + if (targetCollection.Contains(element)) + { + targetCollection.Remove(element); + } + } + } #endregion } } diff --git a/src/Spring/Spring.Core/Util/NumberUtils.cs b/src/Spring/Spring.Core/Util/NumberUtils.cs index e5c8a575..1e280134 100644 --- a/src/Spring/Spring.Core/Util/NumberUtils.cs +++ b/src/Spring/Spring.Core/Util/NumberUtils.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Util/PathMatcher.cs b/src/Spring/Spring.Core/Util/PathMatcher.cs index da2e39b5..a7e9b5a0 100644 --- a/src/Spring/Spring.Core/Util/PathMatcher.cs +++ b/src/Spring/Spring.Core/Util/PathMatcher.cs @@ -2,7 +2,7 @@ #region License /* -* Copyright © 2002-2010 the original author or authors. +* Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/PatternMatchUtils.cs b/src/Spring/Spring.Core/Util/PatternMatchUtils.cs index 5d28871e..758d64bf 100644 --- a/src/Spring/Spring.Core/Util/PatternMatchUtils.cs +++ b/src/Spring/Spring.Core/Util/PatternMatchUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ #region Imports using System; -using System.Collections; +using System.Collections; using Spring.Objects.Factory; #endregion diff --git a/src/Spring/Spring.Core/Util/Properties.cs b/src/Spring/Spring.Core/Util/Properties.cs index 690708e9..3b8772a2 100644 --- a/src/Spring/Spring.Core/Util/Properties.cs +++ b/src/Spring/Spring.Core/Util/Properties.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,25 +30,25 @@ namespace Spring.Util { /// /// An implementation of the Java Properties class. - /// - /// - /// For the complete syntax see java.util.Properties JavaDoc. - /// This class supports an extended syntax. There may also be sole keys on a line, in that case values are treated as null. - /// - /// - /// key1 = value - /// key2: - /// key3 - /// - /// will result in the name/value pairs: - /// - /// key1:="value" - /// key2:=string.Empty - /// key3:=<null> - /// - /// note, that to specify a null value, the key must not be followed by any character except newline. - /// - /// + /// + /// + /// For the complete syntax see java.util.Properties JavaDoc. + /// This class supports an extended syntax. There may also be sole keys on a line, in that case values are treated as null. + /// + /// + /// key1 = value + /// key2: + /// key3 + /// + /// will result in the name/value pairs: + /// + /// key1:="value" + /// key2:=string.Empty + /// key3:=<null> + /// + /// note, that to specify a null value, the key must not be followed by any character except newline. + /// + /// /// Simon White [Serializable] public class Properties : Hashtable @@ -173,7 +173,7 @@ namespace Spring.Util /// The string. /// The string with all leading whitespace removed. private static string RemoveLeadingWhitespace(string line) - { + { if (line == null) return null; string trimmed = string.Empty; @@ -224,17 +224,17 @@ namespace Spring.Util index++; if (index > len) { - // this is an extension to support key-only lines and specifying null values + // this is an extension to support key-only lines and specifying null values value = null; - } - else if (index == len) - { - value = string.Empty; - } - else - { - value = line.Substring(index); - value = RemoveLeadingWhitespace(value); + } + else if (index == len) + { + value = string.Empty; + } + else + { + value = line.Substring(index); + value = RemoveLeadingWhitespace(value); } if (value != null && value.Length > 0 diff --git a/src/Spring/Spring.Core/Util/ReflectionException.cs b/src/Spring/Spring.Core/Util/ReflectionException.cs index 78785db7..ae9403ce 100644 --- a/src/Spring/Spring.Core/Util/ReflectionException.cs +++ b/src/Spring/Spring.Core/Util/ReflectionException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/ReflectionUtils.cs b/src/Spring/Spring.Core/Util/ReflectionUtils.cs index 693db48a..d866fdfe 100644 --- a/src/Spring/Spring.Core/Util/ReflectionUtils.cs +++ b/src/Spring/Spring.Core/Util/ReflectionUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/SecurityCritical.cs b/src/Spring/Spring.Core/Util/SecurityCritical.cs index 37df8d5d..11d06db0 100644 --- a/src/Spring/Spring.Core/Util/SecurityCritical.cs +++ b/src/Spring/Spring.Core/Util/SecurityCritical.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Util/StringUtils.cs b/src/Spring/Spring.Core/Util/StringUtils.cs index 49d110d3..bc0a85e7 100644 --- a/src/Spring/Spring.Core/Util/StringUtils.cs +++ b/src/Spring/Spring.Core/Util/StringUtils.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Core/Util/TextPositionInfo.cs b/src/Spring/Spring.Core/Util/TextPositionInfo.cs index f0dd7eba..1089ff00 100644 --- a/src/Spring/Spring.Core/Util/TextPositionInfo.cs +++ b/src/Spring/Spring.Core/Util/TextPositionInfo.cs @@ -1,25 +1,25 @@ -#region License - -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. - */ - -#endregion - -#region Imports - +#region License + +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. + */ + +#endregion + +#region Imports + #endregion namespace Spring.Util diff --git a/src/Spring/Spring.Core/Util/UniqueKey.cs b/src/Spring/Spring.Core/Util/UniqueKey.cs index c30568b4..0e6f58c0 100644 --- a/src/Spring/Spring.Core/Util/UniqueKey.cs +++ b/src/Spring/Spring.Core/Util/UniqueKey.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs b/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs index 5b0305b6..2be336ab 100644 --- a/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs +++ b/src/Spring/Spring.Core/Validation/BaseSimpleValidator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/BaseValidator.cs b/src/Spring/Spring.Core/Validation/BaseValidator.cs index faf21a2b..db8a4a11 100644 --- a/src/Spring/Spring.Core/Validation/BaseValidator.cs +++ b/src/Spring/Spring.Core/Validation/BaseValidator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs b/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs index 07bee1a5..dc49d600 100644 --- a/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs +++ b/src/Spring/Spring.Core/Validation/BaseValidatorGroup.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/IValidationAction.cs b/src/Spring/Spring.Core/Validation/IValidationAction.cs index 19a147bb..764d7917 100644 --- a/src/Spring/Spring.Core/Validation/IValidationAction.cs +++ b/src/Spring/Spring.Core/Validation/IValidationAction.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/IValidator.cs b/src/Spring/Spring.Core/Validation/IValidator.cs index 3d6c03b4..6b7db546 100644 --- a/src/Spring/Spring.Core/Validation/IValidator.cs +++ b/src/Spring/Spring.Core/Validation/IValidator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/ValidationErrors.cs b/src/Spring/Spring.Core/Validation/ValidationErrors.cs index 4fdf3e11..fac5089d 100644 --- a/src/Spring/Spring.Core/Validation/ValidationErrors.cs +++ b/src/Spring/Spring.Core/Validation/ValidationErrors.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/ValidationException.cs b/src/Spring/Spring.Core/Validation/ValidationException.cs index 2f084f67..66f20470 100644 --- a/src/Spring/Spring.Core/Validation/ValidationException.cs +++ b/src/Spring/Spring.Core/Validation/ValidationException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs b/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs index 782673bb..6cd74982 100644 --- a/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/ConditionValidator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs b/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs index 092305e3..d4f7cd26 100644 --- a/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/RegularExpressionValidator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs b/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs index 9175d718..187b6690 100644 --- a/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs +++ b/src/Spring/Spring.Core/Validation/Validators/RequiredValidator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs index ad241ac7..577d04e7 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateAdoException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -69,7 +69,7 @@ namespace Spring.Data.NHibernate public HibernateAdoException( string message, ADOException rootCause ) : base( message, rootCause ) {} - /// + /// /// Creates a new instance of the HibernateSystemException class with the specified message /// and root cause. /// @@ -78,7 +78,7 @@ namespace Spring.Data.NHibernate /// /// /// The root exception that is being wrapped. - /// + /// public HibernateAdoException(string message, Exception rootCause) : base(message, rootCause) { } diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs index a1866304..db597a25 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs index bf7912e7..6b10bfae 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateObjectRetrievalFailureException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs index 9a36573d..c80cab9f 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateQueryException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,13 +46,13 @@ namespace Spring.Data.NHibernate { } - /// - /// Creates a new instance of the - /// class. - /// - /// - /// A message about the exception. - /// + /// + /// Creates a new instance of the + /// class. + /// + /// + /// A message about the exception. + /// public HibernateQueryException(string message) : base(message) { } /// @@ -63,7 +63,7 @@ namespace Spring.Data.NHibernate { } - /// + /// /// Creates a new instance of the HibernateQueryException class with the specified message /// and root cause. /// @@ -72,8 +72,8 @@ namespace Spring.Data.NHibernate /// /// /// The root exception that is being wrapped. - /// - public HibernateQueryException(string message, Exception rootCause) + /// + public HibernateQueryException(string message, Exception rootCause) : base(message, rootCause) { } diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs index c0cdbb9c..7612aed7 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateSystemException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,17 +45,17 @@ namespace Spring.Data.NHibernate /// public HibernateSystemException() { - } - - /// - /// Initializes a new instance of the class. - /// - /// The message. + } + + /// + /// Initializes a new instance of the class. + /// + /// The message. public HibernateSystemException(string message): base(message) { } - /// + /// /// Creates a new instance of the HibernateSystemException class with the specified message /// and root cause. /// @@ -64,7 +64,7 @@ namespace Spring.Data.NHibernate /// /// /// The root exception that is being wrapped. - /// + /// public HibernateSystemException(string message, Exception rootCause) : base(message, rootCause) { } diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs index b7dbd982..0db46601 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs index c9cec061..1141f27e 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTransactionManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -236,16 +236,16 @@ namespace Spring.Data.NHibernate } - /// - /// Gets the resource factory that this transaction manager operates on, - /// For the HibenratePlatformTransactionManager this the SessionFactory - /// - /// The SessionFactory. - public object ResourceFactory - { - get { return sessionFactory; } - } - + /// + /// Gets the resource factory that this transaction manager operates on, + /// For the HibenratePlatformTransactionManager this the SessionFactory + /// + /// The SessionFactory. + public object ResourceFactory + { + get { return sessionFactory; } + } + /// /// Set whether to autodetect a ADO.NET connection used by the Hibernate SessionFactory, /// if set via LocalSessionFactoryObject's DbProvider. Default is "true". diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs index 332fc716..2e065643 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/ICommonHibernateOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -234,26 +234,26 @@ namespace Spring.Data.NHibernate /// The actually associated persistent object. /// (either an already loaded instance with the same id, or the given object) /// In case of Hibernate errors - object SaveOrUpdateCopy(object entity); - -#if !NH_1_2 - /// - /// Copy the state of the given object onto the persistent object with the same identifier. - /// If there is no persistent instance currently associated with the session, it will be loaded. - /// Return the persistent instance. If the given instance is unsaved, - /// save a copy of and return it as a newly persistent instance. - /// The given instance does not become associated with the session. - /// This operation cascades to associated instances if the association is mapped with cascade="merge". - /// The semantics of this method are defined by JSR-220. - /// - /// The persistent object to merge. - /// (not necessarily to be associated with the Hibernate Session) - /// - /// An updated persistent instance - /// In case of Hibernate errors - object Merge(object entity); -#endif - - #endregion + object SaveOrUpdateCopy(object entity); + +#if !NH_1_2 + /// + /// Copy the state of the given object onto the persistent object with the same identifier. + /// If there is no persistent instance currently associated with the session, it will be loaded. + /// Return the persistent instance. If the given instance is unsaved, + /// save a copy of and return it as a newly persistent instance. + /// The given instance does not become associated with the session. + /// This operation cascades to associated instances if the association is mapped with cascade="merge". + /// The semantics of this method are defined by JSR-220. + /// + /// The persistent object to merge. + /// (not necessarily to be associated with the Hibernate Session) + /// + /// An updated persistent instance + /// In case of Hibernate errors + object Merge(object entity); +#endif + + #endregion } } diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs index 1ceb1624..7fb2c899 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs index c1e8bfde..df3ee672 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/IHibernateOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs index 37804668..d7427c7b 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/SessionHolder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs index 704ff733..6a51a866 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/ConfigSectionSessionScopeSettings.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs index 0dcdfa5e..dda28710 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/HibernateDaoSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs index 62b9cd86..c210df9e 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs index 68d6341d..c6d35f4b 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScope.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs index 26a47b7c..018bc149 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/SessionScopeSettings.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs index 781b19a6..6518a2d8 100644 --- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs +++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/TemplateFlushMode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs index 4ce3bad0..a5faab19 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/FindHibernateDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs index f46869d0..d01b8536 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDaoSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs index fa8038cd..a9e60987 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs index 15bc727a..08fc3df4 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/HibernateTemplate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs index 2e1415bf..609fc09a 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IFindHibernateCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs index 0e9aeaf4..7af73200 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs index fd6ff229..ac82ff0a 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/Generic/IHibernateOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs index 4ca0a3e3..6dd1fcb0 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateAccessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs index 5989d5cc..fd95c88a 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/HibernateOptimisticLockingFailureException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,12 +53,12 @@ namespace Spring.Data.NHibernate { } - /// + /// /// Creates a new instance of the - /// class. - /// - /// - /// A message about the exception. + /// class. + /// + /// + /// A message about the exception. /// public HibernateOptimisticLockingFailureException(string message) : base(message) { } diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs index ffd14468..6f9be45c 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/LocalSessionFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs index 3d37bcaa..53a009c4 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SessionFactoryUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs index 7a7df250..40d65e8a 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs index 2bf6fabb..3f6a5cea 100644 --- a/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs +++ b/src/Spring/Spring.Data.NHibernate12/Data/NHibernate/SpringSessionSynchronization.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/FilterDefiniitionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/FilterDefiniitionFactoryObject.cs index e8d8bc83..06d460f6 100644 --- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/FilterDefiniitionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/FilterDefiniitionFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateObjectRetrievalFailureException.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateObjectRetrievalFailureException.cs index 6b946773..70928027 100644 --- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateObjectRetrievalFailureException.cs +++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateObjectRetrievalFailureException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,8 +56,8 @@ namespace Spring.Data.NHibernate /// /// The message. public HibernateObjectRetrievalFailureException(string message) - : base(message) - { + : base(message) + { } @@ -97,18 +97,18 @@ namespace Spring.Data.NHibernate } /// - /// Creates a new instance of the HibernateObjectRetrievalFailureException class with the specified message - /// and root cause. - /// - /// - /// A message about the exception. - /// - /// - /// The root exception that is being wrapped. + /// Creates a new instance of the HibernateObjectRetrievalFailureException class with the specified message + /// and root cause. + /// + /// + /// A message about the exception. + /// + /// + /// The root exception that is being wrapped. /// public HibernateObjectRetrievalFailureException(string message, Exception rootCause) - : base(message, rootCause) - { + : base(message, rootCause) + { } diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateOptimisticLockingFailureException.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateOptimisticLockingFailureException.cs index 065fe5df..2374156c 100644 --- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateOptimisticLockingFailureException.cs +++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/HibernateOptimisticLockingFailureException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,18 +80,18 @@ namespace Spring.Data.NHibernate } /// - /// Creates a new instance of the HibernateOptimisticLockingFailureException class with the specified message - /// and root cause. - /// - /// - /// A message about the exception. - /// - /// - /// The root exception that is being wrapped. + /// Creates a new instance of the HibernateOptimisticLockingFailureException class with the specified message + /// and root cause. + /// + /// + /// A message about the exception. + /// + /// + /// The root exception that is being wrapped. /// public HibernateOptimisticLockingFailureException(string message, Exception rootCause) - : base(message, rootCause) - { + : base(message, rootCause) + { } /// diff --git a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs index f1336ffb..6e43d244 100644 --- a/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate20/Data/NHibernate/LocalSessionFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs index 92327096..d9740c6c 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/BytecodeProvider.cs @@ -3,7 +3,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs index 790712eb..31f3cdc7 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/LazyInitializer.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ObjectsFactory.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ObjectsFactory.cs index 45fba5f7..cd19baf0 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ObjectsFactory.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ObjectsFactory.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs index 1702846c..3ba34c28 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactory.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs index e01a3454..cd81e4a0 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ProxyFactoryFactory.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ReflectionOptimizer.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ReflectionOptimizer.cs index 0c5b389b..c816d8b8 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ReflectionOptimizer.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/Bytecode/ReflectionOptimizer.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/HibernateTxScopeTransactionManager.cs b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/HibernateTxScopeTransactionManager.cs index 8c902e3d..be17f2d3 100644 --- a/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/HibernateTxScopeTransactionManager.cs +++ b/src/Spring/Spring.Data.NHibernate21/Data/NHibernate/HibernateTxScopeTransactionManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs b/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs index 3f7c7973..3d9e8ce0 100644 --- a/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs +++ b/src/Spring/Spring.Data/Dao/EmptyResultDataAccessException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs b/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs index ad678cae..029bbc97 100644 --- a/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs +++ b/src/Spring/Spring.Data/Dao/ObjectOptimisticLockingFailureException.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs b/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs index a0344845..7f315f82 100644 --- a/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs +++ b/src/Spring/Spring.Data/Dao/ObjectRetrievalFailureException.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs index 5d4115bd..fd357f18 100644 --- a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs +++ b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs index 1937d64a..cb4e642a 100644 --- a/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs +++ b/src/Spring/Spring.Data/Dao/Support/DataAccessUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,20 +63,20 @@ namespace Spring.Dao.Support IEnumerator enumerator = results.GetEnumerator(); enumerator.MoveNext(); return enumerator.Current; - } - - /// - /// Return a translated exception if this is appropriate, or null if the exception could - /// not be translated. - /// - /// The raw exception we may wish to translate. - /// The PersistenceExceptionTranslator to use to perform the translation. - /// A translated exception if translation is possible, or or null if the exception could - /// not be translated. + } + + /// + /// Return a translated exception if this is appropriate, or null if the exception could + /// not be translated. + /// + /// The raw exception we may wish to translate. + /// The PersistenceExceptionTranslator to use to perform the translation. + /// A translated exception if translation is possible, or or null if the exception could + /// not be translated. public static DataAccessException TranslateIfNecessary(Exception rawException, IPersistenceExceptionTranslator pet) - { - AssertUtils.ArgumentNotNull(pet, "PersistenceExceptionTranslator must not be null"); - return pet.TranslateExceptionIfPossible(rawException); + { + AssertUtils.ArgumentNotNull(pet, "PersistenceExceptionTranslator must not be null"); + return pet.TranslateExceptionIfPossible(rawException); } #endregion diff --git a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs index e64b36b6..bf6de39f 100644 --- a/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs +++ b/src/Spring/Spring.Data/Dao/Support/Generic/DataAccessUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs b/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs index 15c56d55..bad33ed5 100644 --- a/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs +++ b/src/Spring/Spring.Data/Data/BadSqlGrammarException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs b/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs index 97077389..82ddbbbd 100644 --- a/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs +++ b/src/Spring/Spring.Data/Data/CannotGetAdoConnectionException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/CommandDelegate.cs b/src/Spring/Spring.Data/Data/CommandDelegate.cs index 42a768d2..029ae7df 100644 --- a/src/Spring/Spring.Data/Data/CommandDelegate.cs +++ b/src/Spring/Spring.Data/Data/CommandDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs b/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs index f77bfe8a..c66231d6 100644 --- a/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs +++ b/src/Spring/Spring.Data/Data/CommandSetterDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs index 2a907e13..245bfcba 100644 --- a/src/Spring/Spring.Data/Data/Common/DbMetadata.cs +++ b/src/Spring/Spring.Data/Data/Common/DbMetadata.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DbParameter.cs b/src/Spring/Spring.Data/Data/Common/DbParameter.cs index 931a54ea..ee66dd88 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParameter.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParameter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DbParameters.cs b/src/Spring/Spring.Data/Data/Common/DbParameters.cs index 0820aa7a..fae6eb96 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParameters.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParameters.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -246,14 +246,14 @@ namespace Spring.Data.Common public object GetValue(string name) - { - IDataParameter parameter = dataParameterCollection[dbProvider.CreateParameterNameForCollection(name)] as IDataParameter; - if (parameter != null) - { - return parameter.Value; - } - throw new InvalidDataAccessApiUsageException( - "object in IDataParameterCollection is not of the type IDataParameter, it is type [" + + { + IDataParameter parameter = dataParameterCollection[dbProvider.CreateParameterNameForCollection(name)] as IDataParameter; + if (parameter != null) + { + return parameter.Value; + } + throw new InvalidDataAccessApiUsageException( + "object in IDataParameterCollection is not of the type IDataParameter, it is type [" + dataParameterCollection[dbProvider.CreateParameterNameForCollection(name)].GetType() + "]."); } diff --git a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs index 19f52d98..a869815c 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DbProvider.cs b/src/Spring/Spring.Data/Data/Common/DbProvider.cs index f0b7158c..625e1fe8 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProvider.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs b/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs index 45d509d1..699599ef 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs b/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs index f05eadc0..889fde16 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProviderFactoryObject.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs index 79485555..b01b51f5 100644 --- a/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/DelegatingDbProvider.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs index 5adfe71b..b8937d81 100644 --- a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs +++ b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs index b2265377..db19ac66 100644 --- a/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs +++ b/src/Spring/Spring.Data/Data/Common/IDbMetadata.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/IDbParameter.cs b/src/Spring/Spring.Data/Data/Common/IDbParameter.cs index 85440b38..895853d8 100644 --- a/src/Spring/Spring.Data/Data/Common/IDbParameter.cs +++ b/src/Spring/Spring.Data/Data/Common/IDbParameter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/IDbProvider.cs b/src/Spring/Spring.Data/Data/Common/IDbProvider.cs index 529b5ab8..48153d44 100644 --- a/src/Spring/Spring.Data/Data/Common/IDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/IDbProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs index 372b8b6f..6109e1de 100644 --- a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs b/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs index 0eb07017..424197b8 100644 --- a/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/UserCredentialsDbProvider.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs index b188cf2b..dba68c3b 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoAccessor.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs index 7e6b807d..8f1f81be 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1000,18 +1000,18 @@ namespace Spring.Data.Core public virtual object QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse) { return QueryWithCommandCreator(cc, rse, null); - } - + } + public virtual void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback) { QueryWithCommandCreator(cc, rowCallback, null); - } - + } + public virtual IList QueryWithCommandCreator(IDbCommandCreator cc, IRowMapper rowMapper) { return QueryWithCommandCreator(cc, rowMapper, null); - } - + } + public virtual object QueryWithCommandCreator(IDbCommandCreator cc, IResultSetExtractor rse, IDictionary returnedParameters) { if (rse == null) @@ -1020,8 +1020,8 @@ namespace Spring.Data.Core } return Execute(cc, new AdoResultSetExtractorWithOutputParamsCommandCallback(this, rse, returnedParameters)); - } - + } + public virtual void QueryWithCommandCreator(IDbCommandCreator cc, IRowCallback rowCallback, IDictionary returnedParameters) { if (rowCallback == null) @@ -1029,8 +1029,8 @@ namespace Spring.Data.Core throw new ArgumentNullException("RowCallback must not be null"); } Execute(cc, new AdoRowCallbackCommandCallback(this, rowCallback, returnedParameters)); - } - + } + public virtual IList QueryWithCommandCreator(IDbCommandCreator cc, IRowMapper rowMapper, IDictionary returnedParameters) { if (rowMapper == null) @@ -1060,24 +1060,24 @@ namespace Spring.Data.Core DataTable dataTable = CreateDataTable(); DataTableFill(dataTable, commandType, sql); return dataTable; - } - + } + public virtual DataTable DataTableCreate(CommandType commandType, string sql, string tableMappingName) { DataTable dataTable = CreateDataTable(); DataTableFill(dataTable, commandType, sql, tableMappingName); return dataTable; - } - + } + public virtual DataTable DataTableCreate(CommandType commandType, string sql, ITableMapping tableMapping) { DataTable dataTable = CreateDataTable(); DataTableFill(dataTable, commandType, sql, tableMapping); return dataTable; - } - + } + public virtual DataTable DataTableCreate(CommandType commandType, string sql, ITableMapping tableMapping, IDataAdapterSetter setter) @@ -1089,16 +1089,16 @@ namespace Spring.Data.Core #endregion - #region DataTable Create operations with parameters - + #region DataTable Create operations with parameters + public virtual DataTable DataTableCreateWithParams(CommandType commandType, string sql, IDbParameters parameters) { DataTable dataTable = CreateDataTable(); DataTableFillWithParams(dataTable, commandType, sql, parameters); return dataTable; - } - + } + public virtual DataTable DataTableCreateWithParams(CommandType commandType, string sql, IDbParameters parameters, string tableMappingName) @@ -1106,8 +1106,8 @@ namespace Spring.Data.Core DataTable dataTable = CreateDataTable(); DataTableFillWithParams(dataTable, commandType, sql, parameters, tableMappingName); return dataTable; - } - + } + public virtual DataTable DataTableCreateWithParams(CommandType commandType, string sql, IDbParameters parameters, ITableMapping tableMapping) @@ -1115,8 +1115,8 @@ namespace Spring.Data.Core DataTable dataTable = CreateDataTable(); DataTableFillWithParams(dataTable, commandType, sql, parameters, tableMapping); return dataTable; - } - + } + public virtual DataTable DataTableCreateWithParams(CommandType commandType, string sql, IDbParameters parameters, ITableMapping tableMapping, @@ -1137,7 +1137,7 @@ namespace Spring.Data.Core /// The to populate /// The type of command /// SQL query to execute - /// The number of rows successfully added to or refreshed in the + /// The number of rows successfully added to or refreshed in the public virtual int DataTableFill(DataTable dataTable, CommandType commandType, string sql) { ValidateFillArguments(dataTable, sql); @@ -1153,8 +1153,8 @@ namespace Spring.Data.Core return (int)Execute(new DataAdapterFillCallback(dataTable, commandType, sql, mappingCollection, null, null, null)); - } - + } + public virtual int DataTableFill(DataTable dataTable, CommandType commandType, string sql, string tableMappingName) { @@ -1176,8 +1176,8 @@ namespace Spring.Data.Core commandType, sql, mappingCollection, null, null, null)); - } - + } + public virtual int DataTableFill(DataTable dataTable, CommandType commandType, string sql, ITableMapping tableMapping) { @@ -1188,8 +1188,8 @@ namespace Spring.Data.Core return (int)Execute(new DataAdapterFillCallback(dataTable, commandType, sql, mappingCollection, null, null, null)); - } - + } + public virtual int DataTableFill(DataTable dataTable, CommandType commandType, string sql, ITableMapping tableMapping, IDataAdapterSetter setter) @@ -1205,8 +1205,8 @@ namespace Spring.Data.Core #endregion - #region DataTable Fill operations with parameters - + #region DataTable Fill operations with parameters + public virtual int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, IDbParameters parameters) { @@ -1216,8 +1216,8 @@ namespace Spring.Data.Core commandType, sql, mappingCollection, null, null, parameters)); - } - + } + public virtual int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, IDbParameters parameters, string tableMappingName) @@ -1231,8 +1231,8 @@ namespace Spring.Data.Core return (int)Execute(new DataAdapterFillCallback(dataTable, commandType, sql, mappingCollection, null, null, parameters)); - } - + } + public virtual int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, IDbParameters parameters, ITableMapping tableMapping) @@ -1243,8 +1243,8 @@ namespace Spring.Data.Core return (int)Execute(new DataAdapterFillCallback(dataTable, commandType, sql, mappingCollection, null, null, parameters)); - } - + } + public virtual int DataTableFillWithParams(DataTable dataTable, CommandType commandType, string sql, IDbParameters parameters, ITableMapping tableMapping, @@ -1262,8 +1262,8 @@ namespace Spring.Data.Core #endregion #region DataTable Update operations - //TODO conflict options... - + //TODO conflict options... + public virtual int DataTableUpdateWithCommandBuilder(DataTable dataTable, CommandType commandType, string selectSql, @@ -1279,8 +1279,8 @@ namespace Spring.Data.Core selectSql, parameters, null)); - } - + } + public virtual int DataTableUpdateWithCommandBuilder(DataTable dataTable, CommandType commandType, string selectSql, @@ -1297,9 +1297,9 @@ namespace Spring.Data.Core selectSql, parameters, dataAdapterSetter)); - } - - + } + + public virtual int DataTableUpdateWithCommandBuilder(DataTable dataTable, CommandType commandType, string selectSql, @@ -1378,24 +1378,24 @@ namespace Spring.Data.Core #endregion - #region DataSet Create operations without parameters - + #region DataSet Create operations without parameters + public virtual DataSet DataSetCreate(CommandType commandType, string sql) { DataSet dataSet = CreateDataSet(); DataSetFill(dataSet, commandType, sql); return dataSet; - } - - + } + + public virtual DataSet DataSetCreate(CommandType commandType, string sql, string[] tableNames) { DataSet dataSet = CreateDataSet(); DataSetFill(dataSet, commandType, sql, tableNames); return dataSet; - } - + } + public virtual DataSet DataSetCreate(CommandType commandType, string sql, ITableMappingCollection tableMapping) { @@ -2128,14 +2128,14 @@ namespace Spring.Data.Core } } mappingCollection = new DataTableMappingCollection(); - int counter = 0; + int counter = 0; bool isFirstTable = true; foreach (string dataSetTableName in dataSetTableNames) { string sourceTableName; if (isFirstTable) { - sourceTableName = "Table"; + sourceTableName = "Table"; isFirstTable = false; } else diff --git a/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs index 2b70a5ec..34d7f300 100644 --- a/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/Core/RowMapperResultSetExtractor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs index d1ff0d86..d10b0c47 100644 --- a/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Data/Core/ServiceDomainPlatformTransactionManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/DuplicateKeyException.cs b/src/Spring/Spring.Data/Data/DuplicateKeyException.cs index 83a5799a..c95d735b 100644 --- a/src/Spring/Spring.Data/Data/DuplicateKeyException.cs +++ b/src/Spring/Spring.Data/Data/DuplicateKeyException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs index bdb23da6..ff0f13b8 100644 --- a/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs +++ b/src/Spring/Spring.Data/Data/Generic/AdoDaoSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs index 2ef035b7..6386cd61 100644 --- a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs +++ b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs index 0707f53d..ffa53c96 100644 --- a/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/CommandDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs index 2a681a21..4fad55ce 100644 --- a/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/DataAdapterDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs index 29a3dea2..9a66be7e 100644 --- a/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs +++ b/src/Spring/Spring.Data/Data/Generic/IAdoOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs index afa15ab0..5581dcdc 100644 --- a/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs +++ b/src/Spring/Spring.Data/Data/Generic/ICommandCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs index 07002c8a..c312b5a4 100644 --- a/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs +++ b/src/Spring/Spring.Data/Data/Generic/IDataAdapterCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs index d11baca5..908e70ba 100644 --- a/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs +++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs index f6d414d2..3958fd2f 100644 --- a/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/IDbCommandDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs index dccc282d..4fc11a0e 100644 --- a/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/Generic/IResultSetExtractor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs index ec899484..b995368e 100644 --- a/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs +++ b/src/Spring/Spring.Data/Data/Generic/IRowMapper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs b/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs index 60a5b937..2b28ef5b 100644 --- a/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs +++ b/src/Spring/Spring.Data/Data/Generic/NamedResultSetProcessor.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs index 851f6cbd..b5865b77 100644 --- a/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/ResultSetExtractorDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs index 1962ef5c..ef380ae9 100644 --- a/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs +++ b/src/Spring/Spring.Data/Data/Generic/RowMapperDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs index 7e7c1001..d3338b31 100644 --- a/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/Generic/RowMapperResultSetExtractor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IAdoOperations.cs b/src/Spring/Spring.Data/Data/IAdoOperations.cs index 4ea7f03d..46205db8 100644 --- a/src/Spring/Spring.Data/Data/IAdoOperations.cs +++ b/src/Spring/Spring.Data/Data/IAdoOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/ICommandCallback.cs b/src/Spring/Spring.Data/Data/ICommandCallback.cs index c3ff3c59..1c0e5f7c 100644 --- a/src/Spring/Spring.Data/Data/ICommandCallback.cs +++ b/src/Spring/Spring.Data/Data/ICommandCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/ICommandSetter.cs b/src/Spring/Spring.Data/Data/ICommandSetter.cs index 69387060..d0868ca3 100644 --- a/src/Spring/Spring.Data/Data/ICommandSetter.cs +++ b/src/Spring/Spring.Data/Data/ICommandSetter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs b/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs index c49a8047..7afe0ecd 100644 --- a/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs +++ b/src/Spring/Spring.Data/Data/ICommonAdoOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs b/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs index 2f9c4c78..bc9b3eb2 100644 --- a/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs +++ b/src/Spring/Spring.Data/Data/IDataAdapterCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs b/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs index 6439ce94..9de4fccf 100644 --- a/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs +++ b/src/Spring/Spring.Data/Data/IDataAdapterSetter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs b/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs index fcca299c..62137d8f 100644 --- a/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs +++ b/src/Spring/Spring.Data/Data/IDataReaderWrapper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs b/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs index ae921710..7a6351a1 100644 --- a/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs +++ b/src/Spring/Spring.Data/Data/IDataSetFillLifecycleProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDbCommandCreator.cs b/src/Spring/Spring.Data/Data/IDbCommandCreator.cs index e0fd321c..643148f3 100644 --- a/src/Spring/Spring.Data/Data/IDbCommandCreator.cs +++ b/src/Spring/Spring.Data/Data/IDbCommandCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs b/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs index 84b60b1d..f612d676 100644 --- a/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs +++ b/src/Spring/Spring.Data/Data/IDbCommandCreatorFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs b/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs index bf3a65d7..5b176fa5 100644 --- a/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs +++ b/src/Spring/Spring.Data/Data/IDbDataAdapterCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IResultSetExtractor.cs b/src/Spring/Spring.Data/Data/IResultSetExtractor.cs index c98fd0ef..73770b59 100644 --- a/src/Spring/Spring.Data/Data/IResultSetExtractor.cs +++ b/src/Spring/Spring.Data/Data/IResultSetExtractor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/IRowMapper.cs b/src/Spring/Spring.Data/Data/IRowMapper.cs index 68186760..6bfcd4f9 100644 --- a/src/Spring/Spring.Data/Data/IRowMapper.cs +++ b/src/Spring/Spring.Data/Data/IRowMapper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs b/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs index 0299e22a..2161a076 100644 --- a/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs +++ b/src/Spring/Spring.Data/Data/InvalidResultSetAccessException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs b/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs index c609a49d..c7626530 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoNonQuery.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs index f3cea582..cabdad01 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoOperation.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs index c51afd98..14814c7f 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoQuery.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs b/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs index d103b3e3..175b1c09 100644 --- a/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs +++ b/src/Spring/Spring.Data/Data/Objects/AdoScalar.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs index cd864bbd..d593c55d 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoOperation.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs index a3ae2f8b..c7768214 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/AdoQuery.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs index f6584a5d..5290277a 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQuery.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs index 863e9c36..8fed03a3 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/MappingAdoQueryWithContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs b/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs index 55343f23..a564302d 100644 --- a/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs +++ b/src/Spring/Spring.Data/Data/Objects/Generic/StoredProcedure.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs b/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs index c223725d..71b663c7 100644 --- a/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs +++ b/src/Spring/Spring.Data/Data/Objects/MappingAdoQuery.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs b/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs index ba08a762..1637c276 100644 --- a/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs +++ b/src/Spring/Spring.Data/Data/Objects/MappingAdoQueryWithContext.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs b/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs index 9806e74d..98919c2d 100644 --- a/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs +++ b/src/Spring/Spring.Data/Data/Objects/StoredProcedure.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,13 +53,13 @@ namespace Spring.Data.Objects public StoredProcedure() { CommandType = CommandType.StoredProcedure; - } - - /// - /// Initializes a new instance of the class. - /// - /// The db provider. - /// Name of the stored procedure. + } + + /// + /// Initializes a new instance of the class. + /// + /// The db provider. + /// Name of the stored procedure. public StoredProcedure(IDbProvider dbProvider, string procedureName) : base(dbProvider, procedureName) { CommandType = CommandType.StoredProcedure; diff --git a/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs b/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs index 32a018bf..fc9f4eda 100644 --- a/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs +++ b/src/Spring/Spring.Data/Data/ResultSetExtractorDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/RowMapperDelegate.cs b/src/Spring/Spring.Data/Data/RowMapperDelegate.cs index f843994b..bf314c69 100644 --- a/src/Spring/Spring.Data/Data/RowMapperDelegate.cs +++ b/src/Spring/Spring.Data/Data/RowMapperDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs index 89165050..83298db5 100644 --- a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs +++ b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs index 9b0c8dbd..55f54a8a 100644 --- a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion @@ -198,11 +198,11 @@ namespace Spring.Data.Support private static IDbConnection getTargetConnection(IDbConnection con) { IDbConnection conToUse = con; - /* - while (conToUse is ConnectionProxy) - { - conToUse = (ConnectionProxy)conToUse.getTargetConnection(); - } + /* + while (conToUse is ConnectionProxy) + { + conToUse = (ConnectionProxy)conToUse.getTargetConnection(); + } */ return conToUse; } diff --git a/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs b/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs index 56f041b2..9bd573ec 100644 --- a/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs +++ b/src/Spring/Spring.Data/Data/Support/DefaultServiceDomainAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs index 3ed026af..8f8e3454 100644 --- a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs index 0cddfe6e..4a2719f6 100644 --- a/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Data/Support/FallbackExceptionTranslator.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs b/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs index 45c13c68..2c7f1617 100644 --- a/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs +++ b/src/Spring/Spring.Data/Data/Support/IServiceDomainAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs b/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs index c6ccdd42..1c054a4d 100644 --- a/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs +++ b/src/Spring/Spring.Data/Data/Support/NamedResultSetProcessor.cs @@ -1,7 +1,7 @@ #region Licence /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs b/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs index d8e8c880..f5289000 100644 --- a/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs +++ b/src/Spring/Spring.Data/Data/Support/NullMappingDataReader.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs index 45fbae10..e7eff406 100644 --- a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs b/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs index 5631f6f3..ebf75957 100644 --- a/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs +++ b/src/Spring/Spring.Data/Data/Support/SimpleServiceConfig.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs b/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs index 1622e262..6af0396a 100644 --- a/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs +++ b/src/Spring/Spring.Data/Data/UncategorizedAdoException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -106,24 +106,24 @@ namespace Spring.Data #endregion - #region Properties - - /// - /// Return the underlying error code if available from the underlying provider. - /// - public string ErrorCode - { - get { return errorCode; } - } - - /// - /// Return the SQL that resulted in this exception. - /// - public string Sql - { - get { return sql; } - } - + #region Properties + + /// + /// Return the underlying error code if available from the underlying provider. + /// + public string ErrorCode + { + get { return errorCode; } + } + + /// + /// Return the SQL that resulted in this exception. + /// + public string Sql + { + get { return sql; } + } + #endregion #region Methods diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs index e6534137..82982a38 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAttribute.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs b/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs index f89f63c4..5d3466be 100644 --- a/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs +++ b/src/Spring/Spring.Data/Transaction/Support/ITransactionCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs index bdaac95a..a85ad7d8 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionCallbackWithoutResult.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs index bccca28b..4ea87163 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ChainedExceptionListener.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs index cc0c79ed..e28eb2bc 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs index a3c17b39..ea78fdf1 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs index 79b6e1bd..50046846 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs index cec0752c..12c432ce 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SynchedLocalTransactionFailedException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs index 9507ca16..fc1b274f 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessageCreator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs index ba614b27..79f1d70f 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IMessagePostProcessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs index 54ffdc4e..ec14e316 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/INmsOperations.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs index 33608b85..78ca5789 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/IProducerCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs index a6774ab5..13f4db65 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/ISessionCallback.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs index 12e6a882..e4a6397e 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/MessageCreatorDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs index 8f1b20ef..83ec0e5d 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs index 7d05e3c3..a2a58432 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs index 40b2a873..3a8a8d03 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/SessionDelegate.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,9 +30,9 @@ namespace Spring.Messaging.Nms.Core /// Allows you to execute any number of operations /// on a single ISession, possibly returning a result a result. /// - /// - /// A result object from working with the Session, if any (so can be null) - /// + /// + /// A result object from working with the Session, if any (so can be null) + /// /// NMSException if there is any problem /// Mark Pollack public delegate object SessionDelegate(ISession session); diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs index 3d9f7ed3..96e0fc40 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs index 5da0aced..89afa771 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/IMessageConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs index a1c86b81..de286094 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/MessageConversionException.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs index c6d43ebb..6c6e5e3c 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/SimpleMessageConverter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs index fe9d189e..746bc064 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Converter/TypeMapper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs index 84989324..6f2d44e0 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/DynamicDestinationResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs index 8859f0bd..61226255 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/IDestinationResolver.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs index 1e50058c..bbfbdc75 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/Destinations/NmsDestinationAccessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs index b5bce317..1ec611f3 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs index c14cc2a5..8edd03e2 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs b/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs index f611cffb..be41fda4 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs b/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs index 67668e75..722e7f59 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/IMessageQueueFactory.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs index bca0ffa5..aa5551ce 100644 --- a/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs +++ b/src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs index f7ac9209..44c340c4 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactory.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs index fa3b7115..8f4852fa 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs b/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs index 67f7e567..9fd5ff50 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/WebServiceHostFactory.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs index 6971e616..9907430c 100644 --- a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs +++ b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs index 122570f6..00260543 100644 --- a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs +++ b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs index 31635f99..afafd918 100644 --- a/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs +++ b/src/Spring/Spring.Services/ServiceModel/SpringServiceHost.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs b/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs index 53f46073..16ab5f1b 100644 --- a/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs +++ b/src/Spring/Spring.Services/ServiceModel/SpringWebServiceHost.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs index f4cd8b0a..5ec4fab5 100644 --- a/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs +++ b/src/Spring/Spring.Services/ServiceModel/Support/ServiceProxyTypeBuilder.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs index ed1d5a50..4f0e8969 100644 --- a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs +++ b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs b/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs index 015557b8..f2b21c58 100644 --- a/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs +++ b/src/Spring/Spring.Web.Extensions/Web/Script/Services/ScriptHandlerFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs index 36b21fd4..bfb6cf4b 100644 --- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs +++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContextArgs.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContextArgs.cs index 4a51577d..d8828dea 100644 --- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContextArgs.cs +++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContextArgs.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs index eab7ebbf..cfadc4bb 100644 --- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs +++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcContextHandler.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Web.Mvc/SpringActionInvoker.cs b/src/Spring/Spring.Web.Mvc/SpringActionInvoker.cs index 8536619f..d8b9b6bb 100644 --- a/src/Spring/Spring.Web.Mvc/SpringActionInvoker.cs +++ b/src/Spring/Spring.Web.Mvc/SpringActionInvoker.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs b/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs index 8e85fb8c..42bdfd93 100644 --- a/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs +++ b/src/Spring/Spring.Web.Mvc/SpringControllerFactory.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs b/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs index a2455260..1f7f26e9 100644 --- a/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs +++ b/src/Spring/Spring.Web.Mvc/SpringMvcApplication.cs @@ -1,19 +1,19 @@ #region License -/* - * Copyright © 2002-2010 the original author or authors. - * - * 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. +/* + * Copyright © 2002-2011 the original author or authors. + * + * 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. */ #endregion diff --git a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs index 28d5967d..7911ed98 100644 --- a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs +++ b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs index d49fdeb1..cb70737d 100644 --- a/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs +++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContextArgs.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs index a899d031..535a11d7 100644 --- a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs +++ b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs index a12d64c8..abe4084b 100644 --- a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs +++ b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Core/IO/WebResource.cs b/src/Spring/Spring.Web/Core/IO/WebResource.cs index bea8cad6..53655425 100644 --- a/src/Spring/Spring.Web/Core/IO/WebResource.cs +++ b/src/Spring/Spring.Web/Core/IO/WebResource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs index 48f2d86a..ba3c43ff 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Xml/WebObjectsNamespaceParser.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs index 48a02795..01984dcc 100644 --- a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs +++ b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs b/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs index 93df9af7..ce1c05dc 100644 --- a/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs +++ b/src/Spring/Spring.Web/Util/IVirtualEnvironment.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Util/SecurityCritical.cs b/src/Spring/Spring.Web/Util/SecurityCritical.cs index 3899372e..d83fd0d2 100644 --- a/src/Spring/Spring.Web/Util/SecurityCritical.cs +++ b/src/Spring/Spring.Web/Util/SecurityCritical.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs index c75d4166..23b945f7 100644 --- a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs +++ b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Util/WebUtils.cs b/src/Spring/Spring.Web/Util/WebUtils.cs index d8bbc9d2..1c63e96c 100644 --- a/src/Spring/Spring.Web/Util/WebUtils.cs +++ b/src/Spring/Spring.Web/Util/WebUtils.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs index 6f6a00e8..311dbb81 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableActiveDirectoryMembershipProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs index 1b80d2a6..263be8e0 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlMembershipProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs index 9fbfbc78..b896d169 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlProfileProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs index 0ce4814f..3f0d1232 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableSqlRoleProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs index 28486d21..7ed6d787 100644 --- a/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ConfigurableXmlSiteMapProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs index 9fa07638..8a096aed 100644 --- a/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/IRoleProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs index 5592f342..0c876276 100644 --- a/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs +++ b/src/Spring/Spring.Web/Web/Providers/ISiteMapProvider.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs index 7eb4b8af..ff073b9d 100644 --- a/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/MembershipProviderAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs index a0dcdeb5..61cb15ad 100644 --- a/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/RoleProviderAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs index 42f4174c..624f874e 100644 --- a/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs +++ b/src/Spring/Spring.Web/Web/Providers/SiteMapProviderAdapter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs index 21a2904f..b3b90ca1 100644 --- a/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs +++ b/src/Spring/Spring.Web/Web/Services/WebServiceExporter.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs index c111a214..87a692e8 100644 --- a/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Services/WebServiceHandlerFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs index 9b9c1902..2b756f3f 100644 --- a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs b/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs index 33dcf900..6fd4b645 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlAccessor.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs b/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs index 7a079ae2..fc9c8335 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlCollectionAccessor.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs index 70e99721..b15dccfa 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs index 172c8143..83bf28d7 100644 --- a/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/DefaultHandlerFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs b/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs index 2d0a4d29..1094bbc0 100644 --- a/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/DefaultResultFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/HandlerMap.cs b/src/Spring/Spring.Web/Web/Support/HandlerMap.cs index 70691a1d..d34676be 100644 --- a/src/Spring/Spring.Web/Web/Support/HandlerMap.cs +++ b/src/Spring/Spring.Web/Web/Support/HandlerMap.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs b/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs index a86e2871..3e5e879f 100644 --- a/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs +++ b/src/Spring/Spring.Web/Web/Support/HandlerMapEntry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs b/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs index f2ba5cf0..b9ee6d06 100644 --- a/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs +++ b/src/Spring/Spring.Web/Web/Support/IInterceptionStrategy.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs b/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs index 3c1e7574..a156099c 100644 --- a/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs +++ b/src/Spring/Spring.Web/Web/Support/IResultWebNavigator.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs b/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs index abcc4bcb..557702d4 100644 --- a/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs +++ b/src/Spring/Spring.Web/Web/Support/ISupportsWebDependencyInjection.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs index 808107d3..7b50b38c 100644 --- a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs +++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionOwnerStrategy.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs index d073e870..4d4b821e 100644 --- a/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs +++ b/src/Spring/Spring.Web/Web/Support/InterceptControlCollectionStrategy.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs b/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs index 6525949d..54a1e10c 100644 --- a/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs +++ b/src/Spring/Spring.Web/Web/Support/LocalResourceManager.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs index 920784dc..8b324118 100644 --- a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactory.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs index 297719b7..56b5465b 100644 --- a/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs +++ b/src/Spring/Spring.Web/Web/Support/MappingHandlerFactoryConfigurer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs b/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs index 4dd9e011..de9e09dd 100644 --- a/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs +++ b/src/Spring/Spring.Web/Web/Support/MimeMediaType.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/Result.cs b/src/Spring/Spring.Web/Web/Support/Result.cs index 03daffa0..63499489 100644 --- a/src/Spring/Spring.Web/Web/Support/Result.cs +++ b/src/Spring/Spring.Web/Web/Support/Result.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs b/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs index 001ed23c..2d8785f0 100644 --- a/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs +++ b/src/Spring/Spring.Web/Web/Support/ResultFactoryRegistry.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/ResultMode.cs b/src/Spring/Spring.Web/Web/Support/ResultMode.cs index 8d273d4c..a2645e77 100644 --- a/src/Spring/Spring.Web/Web/Support/ResultMode.cs +++ b/src/Spring/Spring.Web/Web/Support/ResultMode.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs index cb3c0fc3..02b9bd96 100644 --- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs +++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionMethodBuilder.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs index b4898483..b2e1f93e 100644 --- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs +++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionOwnerProxy.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs index 02c7cb4f..d6ebca72 100644 --- a/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs +++ b/src/Spring/Spring.Web/Web/Support/SupportsWebDependencyInjectionTypeBuilder.cs @@ -1,6 +1,6 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs index 3c675dcf..9752f81a 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/AbstractValidationControl.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs b/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs index ab3a4852..da21e37d 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Calendar.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs index a48ff1c1..ea4e5458 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Form.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Form.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs b/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs index 9fac39f9..c7692310 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/Panel.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs b/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs index 6b28f06d..9a7747a9 100644 --- a/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs +++ b/src/Spring/Spring.Web/Web/UI/IModelPersistenceMedium.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs b/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs index b9083ca2..fa5dfb5c 100644 --- a/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs +++ b/src/Spring/Spring.Web/Web/UI/IValidationContainer.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs b/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs index 249f0f84..2985137f 100644 --- a/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs +++ b/src/Spring/Spring.Web/Web/UI/SessionModelPersistenceMedium.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs index 9cfc924a..5b8ada4c 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Advice/DebugAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs index 0c3b01e7..206bc5eb 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Config/AopNamespaceParserTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs index c8f0751f..4171f5df 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs index 2cb5e8c6..c3d4eb31 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs index 4ce9959c..32453266 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs index 73483cb7..46ca2191 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/UnknownAdviceTypeExceptionTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs index 3c66bb36..f72337e1 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AopContextTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs index c01f93f8..452ae41f 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs index 13fd7ee7..972ca7e4 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs index 355dccec..1ebe12a8 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AttributeAutoProxyCreatorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs index 96ba67de..bb859e01 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/NoSetterProperties.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs index bfbc0739..729f91c0 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/ObjectNameAutoProxyCreatorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs index c7d536d0..d7727c6d 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/OrderedLogicalThreadContextCheckAdvisor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs index 16db3418..28e32eaa 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/PointcutFilteringAutoProxyCreatorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs index 2762478a..7e973397 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/TypeNameAutoProxyCreatorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs index 09eee2ba..612e5ad4 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingAfterReturningAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs index 19cb9d31..86da270f 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingBeforeAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs index 2b5214af..ddb22005 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingMultiAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs index 4bf04e2f..fe738827 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/CountingThrowsAdvice.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs index db05afc4..0b1f729e 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicMethodInvocationTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs index 434061fe..62d856f9 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs index 3f2c05b8..ce44b58a 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs index 24b2aded..73ef9d7d 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CachedAopProxyFactoryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs index 144c59a1..dc688696 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/CompositionAopProxyTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs index ea5b4216..998bad98 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DecoratorAopProxyTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs index 9f875d2e..3705daaa 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/DefaultAopProxyFactoryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs index d1b187ac..905a61a0 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs index 652a6b97..752eb8d2 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/MockTargetSource.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs index 1bac056e..b7a13371 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/HashtableCachingAdvisorChainFactoryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs index 5cc80087..44e225da 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/IIsModified.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs index ec5874ee..4ab1a2bf 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/IsModifiedMixin.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs index 2223e17a..a67f6c74 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyConfigTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs index aabca58f..31cb7b55 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs index 6c74fd61..60fdf2f5 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs index 67be4583..67fda412 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ReflectiveMethodInvocationTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs index c8c53d2a..b222f2da 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Interceptor/NopInterceptor.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs index de049847..2d920dfb 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/AttributeMatchMethodPointcutTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs index 01326c5a..33bd8334 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/ControlFlowPointcutTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs index 213b7333..4ff14c0d 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/RootTypeFilterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs index 2852da4f..0b19f305 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/EmptyTargetSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs index acdce1be..49c058cd 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/HotSwappableTargetSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs index 5dea0a5b..47a56635 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs index fe6f6f1f..20a9d557 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/SingletonTargetSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs index f68ce503..220d1483 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/TrueMethodMatcherTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs index 96c61477..e55ea121 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/TruePointcutTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs b/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs index a9bbf583..48baa8d8 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/TrueTypeFilterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs index 0e1598f7..fb70d621 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheAspectIntegrationTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs index 4af50b8d..86c677e2 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs index f2fe8626..240dd047 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs index 0a792c4f..1519157c 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs index ea8b361a..f976c324 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs index d8b89cda..907dc56a 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs index 7b385581..4a972f03 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs index 19479d91..079eb12b 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs b/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs index 9b7f2663..342567a9 100644 --- a/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs +++ b/test/Spring/Spring.Core.Tests/Caching/AbstractCacheTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs b/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs index b23b51dc..01f1ba4b 100644 --- a/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Caching/BaseCacheAttributeTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs b/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs index 29de2cb1..6864e318 100644 --- a/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/AbstractQueueTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs b/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs index 9a735a9f..98322e51 100644 --- a/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/CaseInsensitiveHashtableTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs index 604b6778..eca5b979 100644 --- a/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/Generic/ReadOnlyDictionaryTests.cs @@ -2,7 +2,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs b/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs index 39ab9b20..eed931b9 100644 --- a/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/LinkedListTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs b/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs index 8f11e5fa..ded49abf 100644 --- a/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs +++ b/test/Spring/Spring.Core.Tests/Collections/SynchronizedHashtableTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs b/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs index 822156b4..aa826f52 100644 --- a/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs +++ b/test/Spring/Spring.Core.Tests/CompilerOptionsTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs b/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs index 296391c2..ea6415d1 100644 --- a/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/EventListenerAttributeTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs b/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs index 6422220d..55021407 100644 --- a/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Events/ConsoleListenerTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs index 7ba92ddd..7b467f32 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextAwareProcessorTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs index 8932c3a8..60d66383 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationContextExtensionTests.cs @@ -5,7 +5,7 @@ using Spring.Objects; #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs index f12c3be8..5afd3c71 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ApplicationObjectSupportTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs index f5f248df..61cfeef8 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextLocatorHandlerTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs index fb21b3c0..374c4a9c 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ContextRegistryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs index 90ad48ce..dc4baafc 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs index d612f2d2..a2d878cb 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs index 33816545..f2118eb4 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/NamespaceParsersSectionHandlerTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs index e920d536..a74b22ff 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs index a1035ade..1cdf8fba 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/StaticMessageSourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs b/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs index ed5ab9fb..96e9d43f 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/TestObjectConfigParser.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs index 5a4fb54f..b378612d 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/TypeAliasesSectionHandlerTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs b/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs index deff46b4..31c2cf57 100644 --- a/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/ComposedCriteriaTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs index 318cd308..2ecdad29 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceCommonTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs index d4ab00be..e87a9b07 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/FileSystemResourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs index 8cf27402..ce788bb5 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/StringResourceTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs index ce387fe6..3f23464b 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/CredentialConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs index bd8ac49d..32b13b05 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/FileInfoConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs index 88ed09e5..ed753ae2 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RGBColorConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs index 44836351..96ae223e 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegexConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs index e433725c..120d23bf 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/RegistryKeyConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs index 02066f23..8414daf2 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/StringArrayConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs index 71e97271..aa022797 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TimeSpanConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs index 09c1bd40..60cea205 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/TypeConverterRegistryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs index 80100250..94108f29 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeConversion/UniqueKeyConverterTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs index 7b9841bf..a226ebc0 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs index 070274a0..91809806 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/GenericTypeResolverTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs index 038da6da..1ea2f9b2 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeAssemblyHolderTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs index 827918cf..072fbe4b 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeRegistryTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs index dbd9474f..e7c7c4c5 100644 --- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/TypeResolverTests.cs @@ -1,7 +1,7 @@ #region License /* - * Copyright © 2002-2010 the original author or authors. + * Copyright © 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml index 2c5cac97..b394efba 100644 --- a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml +++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Config/PPC-SPRNET-55.xml @@ -1,6 +1,6 @@