Permalink
Browse files

Convert CRLF (dos) to LF (unix)

Prior to this change, roughly 5% (~300 out of 6000+) of files under the
source tree had CRLF line endings as opposed to the majority which have
LF endings.

This change normalizes these files to LF for consistency going forward.

Command used:

$ git ls-files | xargs file | grep CRLF | cut -d":" -f1 | xargs dos2unix

Issue: SPR-5608
  • Loading branch information...
1 parent e1b6453 commit 88913f2b231c7bad0a535dcc11aab4dbf5ad9127 @cbeams cbeams committed Dec 21, 2011
Showing with 31,091 additions and 31,091 deletions.
  1. +4 −4 build.versions
  2. +103 −103 ...ingframework.aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java
  3. +174 −174 ...ework.aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java
  4. +41 −41 org.springframework.aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
  5. +54 −54 ...java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj
  6. +73 −73 org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj
  7. +115 −115 org.springframework.aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj
  8. +197 −197 ...amework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj
  9. +68 −68 ...s/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj
  10. +34 −34 ...gframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java
  11. +75 −75 ...work.aspects/src/main/java/org/springframework/scheduling/aspectj/AbstractAsyncExecutionAspect.aj
  12. +54 −54 ...rk.aspects/src/main/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspect.aj
  13. +93 −93 ...mework.aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj
  14. +75 −75 ...work.aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj
  15. +32 −32 ...s/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java
  16. +36 −36 ...pringframework.aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj
  17. +32 −32 ...rc/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java
  18. +595 −595 ...ringframework.aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
  19. +33 −33 ...pringframework.aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
  20. +137 −137 ...mework.aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
  21. +69 −69 org.springframework.aspects/src/test/java/org/springframework/cache/config/CacheableService.java
  22. +143 −143 ...ringframework.aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
  23. +146 −146 ...test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
  24. +92 −92 org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
  25. +24 −24 org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java
  26. +100 −100 org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj
  27. +178 −178 ...cts/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
  28. +34 −34 ...spects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java
  29. +34 −34 ...ects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java
  30. +10 −10 ...springframework.aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java
  31. +19 −19 ...src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java
  32. +261 −261 ...amework.aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
  33. +20 −20 ...va/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java
  34. +20 −20 org.springframework.aspects/template.mf
  35. +61 −61 org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/Value.java
  36. +84 −84 ...framework.beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionContext.java
  37. +45 −45 ...ramework.beans/src/main/java/org/springframework/beans/factory/config/BeanExpressionResolver.java
  38. +95 −95 ...ork.beans/src/main/java/org/springframework/beans/factory/config/ProviderCreatingFactoryBean.java
  39. +45 −45 org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java
  40. +35 −35 ...mework.beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java
  41. +58 −58 ....beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java
  42. +150 −150 ....beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java
  43. +43 −43 ...springframework.beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java
  44. +46 −46 ...springframework.beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java
  45. +50 −50 org.springframework.beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java
  46. +26 −26 org.springframework.beans/src/test/java/com/foo/Component.java
  47. +52 −52 org.springframework.beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
  48. +73 −73 org.springframework.beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
  49. +35 −35 org.springframework.beans/src/test/java/com/foo/ComponentFactoryBean.java
  50. +10 −10 org.springframework.beans/src/test/java/com/foo/ComponentNamespaceHandler.java
  51. +524 −524 ...eans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
  52. +2 −2 ...springframework.beans/src/test/java/org/springframework/beans/factory/support/security/policy.all
  53. +30 −30 ...ans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java
  54. +30 −30 .../src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java
  55. +39 −39 ...s/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java
  56. +28 −28 ...k.beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java
  57. +36 −36 ...k.beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java
  58. +28 −28 ...work.beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java
  59. +30 −30 ....beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java
  60. +68 −68 org.springframework.beans/src/test/java/test/beans/DummyBean.java
  61. +4 −4 org.springframework.context.support/.settings/org.eclipse.jdt.ui.prefs
  62. +163 −163 ...rk.context.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java
  63. +174 −174 ...ntext.support/src/main/java/org/springframework/scheduling/commonj/TimerManagerTaskScheduler.java
  64. +41 −41 ...springframework.context/src/main/java/org/springframework/context/EmbeddedValueResolverAware.java
  65. +177 −177 ...k.context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
  66. +54 −54 org.springframework.context/src/main/java/org/springframework/context/annotation/DependsOn.java
  67. +111 −111 ...ork.context/src/main/java/org/springframework/context/annotation/Jsr330ScopeMetadataResolver.java
  68. +43 −43 ...ingframework.context/src/main/java/org/springframework/context/annotation/ScopedProxyCreator.java
  69. +73 −73 ...rk.context/src/main/java/org/springframework/context/event/GenericApplicationListenerAdapter.java
  70. +42 −42 ...ngframework.context/src/main/java/org/springframework/context/event/SmartApplicationListener.java
  71. +55 −55 ...k.context/src/main/java/org/springframework/context/expression/BeanExpressionContextAccessor.java
  72. +55 −55 ...ngframework.context/src/main/java/org/springframework/context/expression/BeanFactoryAccessor.java
  73. +51 −51 ...ngframework.context/src/main/java/org/springframework/context/expression/BeanFactoryResolver.java
  74. +84 −84 org.springframework.context/src/main/java/org/springframework/context/expression/MapAccessor.java
  75. +153 −153 ....context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java
  76. +134 −134 ...ework.context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java
  77. +74 −74 ...ingframework.context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java
  78. +128 −128 .../main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java
  79. +33 −33 ...text/src/main/java/org/springframework/instrument/classloading/jboss/JBossClassLoaderAdapter.java
  80. +91 −91 ....context/src/main/java/org/springframework/instrument/classloading/jboss/JBossLoadTimeWeaver.java
  81. +144 −144 ...ework.context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java
  82. +81 −81 ...ext/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java
  83. +70 −70 ....context/src/main/java/org/springframework/instrument/classloading/jboss/JBossModulesAdapter.java
  84. +8 −8 ...amework.context/src/main/java/org/springframework/instrument/classloading/jboss/package-info.java
  85. +87 −87 ...ontext/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java
  86. +94 −94 .../src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java
  87. +111 −111 .../main/java/org/springframework/instrument/classloading/websphere/WebSphereClassLoaderAdapter.java
  88. +100 −100 ...ain/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java
  89. +70 −70 .../src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java
  90. +8 −8 ...ork.context/src/main/java/org/springframework/instrument/classloading/websphere/package-info.java
  91. +69 −69 org.springframework.context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java
  92. +139 −139 org.springframework.context/src/main/java/org/springframework/scheduling/TaskScheduler.java
  93. +41 −41 org.springframework.context/src/main/java/org/springframework/scheduling/Trigger.java
  94. +48 −48 org.springframework.context/src/main/java/org/springframework/scheduling/TriggerContext.java
  95. +49 −49 org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Async.java
  96. +63 −63 org.springframework.context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java
  97. +71 −71 org.springframework.context/src/main/java/org/springframework/scheduling/annotation/Scheduled.java
  98. +187 −187 ...work.context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java
  99. +160 −160 ...context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java
  100. +124 −124 ...amework.context/src/main/java/org/springframework/scheduling/concurrent/ReschedulingRunnable.java
  101. +251 −251 ...work.context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
  102. +213 −213 ...framework.context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
  103. +9 −9 org.springframework.context/src/main/java/org/springframework/scheduling/config/package-info.java
  104. +92 −92 org.springframework.context/src/main/java/org/springframework/scheduling/support/CronTrigger.java
  105. +74 −74 ...amework.context/src/main/java/org/springframework/scheduling/support/ScheduledMethodRunnable.java
  106. +63 −63 ...gframework.context/src/main/java/org/springframework/scheduling/support/SimpleTriggerContext.java
  107. +8 −8 ...springframework.context/src/main/java/org/springframework/validation/annotation/package-info.java
  108. +117 −117 ...text/src/main/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessor.java
  109. +86 −86 ...work.context/src/main/java/org/springframework/validation/beanvalidation/CustomValidatorBean.java
  110. +257 −257 ...ontext/src/main/java/org/springframework/validation/beanvalidation/LocalValidatorFactoryBean.java
  111. +56 −56 ...src/main/java/org/springframework/validation/beanvalidation/LocaleContextMessageInterpolator.java
  112. +55 −55 ...c/main/java/org/springframework/validation/beanvalidation/MessageSourceResourceBundleLocator.java
  113. +53 −53 ...src/main/java/org/springframework/validation/beanvalidation/SpringConstraintValidatorFactory.java
  114. +216 −216 ...k.context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
  115. +11 −11 ...ngframework.context/src/main/java/org/springframework/validation/beanvalidation/package-info.java
  116. +61 −61 org.springframework.context/src/test/java/org/springframework/cache/NoOpCacheManagerTests.java
  117. +39 −39 ...ingframework.context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTests.java
  118. +63 −63 ...rk.context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
  119. +620 −620 ...ringframework.context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java
  120. +137 −137 ...mework.context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java
  121. +44 −44 ...mework.context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
  122. +32 −32 org.springframework.context/src/test/java/org/springframework/cache/config/AnnotationTests.java
  123. +42 −42 ...ngframework.context/src/test/java/org/springframework/cache/config/CacheAdviceNamespaceTests.java
  124. +69 −69 org.springframework.context/src/test/java/org/springframework/cache/config/CacheableService.java
  125. +143 −143 ...ringframework.context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
  126. +23 −23 org.springframework.context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
  127. +61 −61 org.springframework.context/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
  128. +87 −87 ...ingframework.context/src/test/java/org/springframework/cache/vendor/AbstractNativeCacheTests.java
  129. +16 −16 org.springframework.context/src/test/java/org/springframework/context/annotation/BeanAge.java
  130. +95 −95 .../test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
  131. +38 −38 ...rk.context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
  132. +63 −63 ...mework.context/src/test/java/org/springframework/context/annotation/jsr330/SpringAtInjectTck.java
  133. +27 −27 ...springframework.context/src/test/java/org/springframework/context/annotation4/DependencyBean.java
  134. +77 −77 ...amework.context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
  135. +36 −36 org.springframework.context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
  136. +37 −37 org.springframework.context/src/test/java/org/springframework/context/annotation5/MyRepository.java
  137. +432 −432 ...ntext/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
  138. +36 −36 ...ork.context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
  139. +32 −32 org.springframework.context/src/test/java/org/springframework/context/support/ResourceConverter.java
  140. +48 −48 org.springframework.context/src/test/java/org/springframework/context/support/Spr7283Tests.java
  141. +45 −45 ...rk.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java
  142. +25 −25 ...ext/src/test/java/org/springframework/jmx/export/annotation/FactoryCreatedAnnotationTestBean.java
  143. +261 −261 ...ramework.context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
  144. +100 −100 ...work.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectIntegrationTests.java
  145. +101 −101 ...springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyAspectTests.java
  146. +10 −10 org.springframework.context/src/test/java/org/springframework/scripting/groovy/GroovyServiceImpl.grv
  147. +15 −15 org.springframework.context/src/test/java/org/springframework/scripting/groovy/Log.java
  148. +41 −41 org.springframework.context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java
  149. +5 −5 org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestService.java
  150. +8 −8 org.springframework.context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java
  151. +156 −156 ...src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
  152. +270 −270 ...rk.context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
  153. +96 −96 org.springframework.core/src/main/java/org/springframework/core/ExceptionDepthComparator.java
  154. +72 −72 ....core/src/main/java/org/springframework/core/convert/support/ConvertingPropertyEditorAdapter.java
  155. +201 −201 ...springframework.core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
  156. +75 −75 org.springframework.core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java
  157. +252 −252 org.springframework.core/src/main/java/org/springframework/core/io/VfsUtils.java
  158. +52 −52 org.springframework.core/src/main/java/org/springframework/core/io/WritableResource.java
  159. +53 −53 org.springframework.core/src/main/java/org/springframework/core/io/support/VfsPatternUtils.java
  160. +9 −9 org.springframework.core/src/main/java/org/springframework/core/serializer/support/package-info.java
  161. +87 −87 ...ingframework.core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java
  162. +79 −79 org.springframework.core/src/main/java/org/springframework/core/type/MethodMetadata.java
  163. +108 −108 org.springframework.core/src/main/java/org/springframework/core/type/StandardMethodMetadata.java
  164. +150 −150 .../src/main/java/org/springframework/core/type/classreading/AnnotationAttributesReadingVisitor.java
  165. +74 −74 org.springframework.core/src/main/java/org/springframework/util/CompositeIterator.java
  166. +149 −149 org.springframework.core/src/main/java/org/springframework/util/LinkedCaseInsensitiveMap.java
  167. +105 −105 org.springframework.core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
  168. +97 −97 org.springframework.core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
  169. +801 −801 org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
  170. +79 −79 ...ringframework.core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
  171. +98 −98 org.springframework.core/src/test/java/org/springframework/util/CompositeIteratorTests.java
  172. +44 −44 org.springframework.expression/src/main/java/org/springframework/expression/AccessException.java
  173. +37 −37 org.springframework.expression/src/main/java/org/springframework/expression/BeanResolver.java
  174. +45 −45 org.springframework.expression/src/main/java/org/springframework/expression/ConstructorExecutor.java
  175. +44 −44 org.springframework.expression/src/main/java/org/springframework/expression/ConstructorResolver.java
  176. +49 −49 ....expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java
  177. +44 −44 org.springframework.expression/src/main/java/org/springframework/expression/MethodExecutor.java
  178. +45 −45 org.springframework.expression/src/main/java/org/springframework/expression/MethodFilter.java
  179. +44 −44 org.springframework.expression/src/main/java/org/springframework/expression/MethodResolver.java
  180. +29 −29 org.springframework.expression/src/main/java/org/springframework/expression/Operation.java
  181. +81 −81 org.springframework.expression/src/main/java/org/springframework/expression/PropertyAccessor.java
  182. +53 −53 org.springframework.expression/src/main/java/org/springframework/expression/TypeConverter.java
  183. +80 −80 org.springframework.expression/src/main/java/org/springframework/expression/TypedValue.java
  184. +65 −65 ...amework.expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java
  185. +242 −242 ...springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
  186. +38 −38 ...ramework.expression/src/main/java/org/springframework/expression/spel/InternalParseException.java
  187. +92 −92 ...amework.expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java
  188. +156 −156 org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelMessage.java
  189. +95 −95 org.springframework.expression/src/main/java/org/springframework/expression/spel/SpelNode.java
  190. +107 −107 ...ingframework.expression/src/main/java/org/springframework/expression/spel/SpelParseException.java
  191. +47 −47 ...amework.expression/src/main/java/org/springframework/expression/spel/SpelParserConfiguration.java
  192. +72 −72 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java
  193. +84 −84 ...pringframework.expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java
  194. +120 −120 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java
  195. +40 −40 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java
  196. +61 −61 org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java
  197. +268 −268 ...mework.expression/src/main/java/org/springframework/expression/spel/generated/SpringExpressions.g
  198. +850 −850 ...sion/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java
  199. +63 −63 ...k.expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java
  200. +86 −86 org.springframework.expression/src/main/java/org/springframework/expression/spel/standard/Token.java
  201. +57 −57 ...ingframework.expression/src/main/java/org/springframework/expression/spel/standard/TokenKind.java
  202. +507 −507 ...ingframework.expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java
  203. +46 −46 ...ework.expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java
  204. +507 −507 ...mework.expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
  205. +74 −74 ...sion/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorExecutor.java
  206. +120 −120 ...sion/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java
  207. +77 −77 ...xpression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java
  208. +197 −197 ...xpression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodResolver.java
  209. +527 −527 ...ression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java
  210. +38 −38 ...ression/src/main/java/org/springframework/expression/spel/support/StandardOperatorOverloader.java
  211. +76 −76 ...k.expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java
  212. +58 −58 org.springframework.expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java
  213. +44 −44 ...framework.expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java
  214. +106 −106 ...ion/src/test/java/org/springframework/expression/spel/standard/PropertiesConversionSpelTests.java
  215. +370 −370 ...mework.expression/src/test/java/org/springframework/expression/spel/standard/SpelParserTests.java
  216. +79 −79 ...expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java
  217. +21 −21 ...ework.expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
  218. +18 −18 ...mework.expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
  219. +100 −100 org.springframework.integration-tests/src/test/java/test/util/SerializationTestUtils.java
  220. +82 −82 ...ingframework.jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java
  221. +55 −55 ...rk.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java
  222. +42 −42 ...ramework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/OutputStreamFactory.java
  223. +61 −61 ...framework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulatorUtils.java
  224. +60 −60 ...dbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java
  225. +32 −32 org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MessageType.java
  226. +123 −123 ...springframework.orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java
  227. +335 −335 ...springframework.orm/src/main/java/org/springframework/orm/hibernate4/LocalSessionFactoryBean.java
  228. +40 −40 ...ework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/SmartPersistenceUnitInfo.java
  229. +56 −56 ...ramework.orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java
  230. +73 −73 ...ngframework.orm/src/test/java/org/springframework/orm/hibernate3/CglibProxyBridgeMethodTests.java
  231. +39 −39 org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java
  232. +3 −3 org.springframework.oxm/src/main/resources/META-INF/spring.schemas
  233. +70 −70 org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockCacheControl.java
  234. +87 −87 org.springframework.test/src/main/java/org/springframework/mock/web/portlet/MockEvent.java
  235. +145 −145 ...mework.test/src/main/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
  236. +83 −83 ...ramework.test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests.java
  237. +135 −135 ...transaction/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java
  238. +89 −89 ...work.transaction/src/main/java/org/springframework/transaction/jta/ManagedTransactionAdapter.java
  239. +45 −45 ...saction/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
  240. +53 −53 ...gframework.web.portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java
  241. +63 −63 ...work.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java
  242. +52 −52 ...ework.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/EventMapping.java
  243. +62 −62 ...work.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/RenderMapping.java
  244. +49 −49 ...rk.web.portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ResourceMapping.java
  245. +111 −111 ...mework.web.portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java
  246. +64 −64 ....portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterLookupKey.java
  247. +43 −43 ...framework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/EventAwareController.java
  248. +48 −48 ...mework.web.portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java
  249. +70 −70 ...ingframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java
  250. +87 −87 org.springframework.web.portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java
  251. +145 −145 ...web.portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java
  252. +127 −127 ...et/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
  253. +8 −8 ...amework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java
  254. +10 −10 ...web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java
  255. +9 −9 ...gframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java
  256. +112 −112 ...c/main/java/org/springframework/web/servlet/view/tiles2/SpringTilesApplicationContextFactory.java
  257. +66 −66 ...ramework.web.servlet/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
  258. +74 −74 ...amework.web.servlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
  259. +96 −96 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
  260. +197 −197 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockBodyContent.java
  261. +70 −70 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockFilterChain.java
  262. +948 −948 ...pringframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
  263. +246 −246 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
  264. +191 −191 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockJspWriter.java
  265. +134 −134 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
  266. +131 −131 ...ework.web.servlet/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
  267. +370 −370 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockPageContext.java
  268. +91 −91 ...springframework.web.servlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
  269. +103 −103 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletConfig.java
  270. +492 −492 org.springframework.web.servlet/src/test/java/org/springframework/mock/web/MockServletContext.java
  271. +65 −65 org.springframework.web.servlet/src/test/java/org/springframework/util/SerializationTestUtils.java
  272. +52 −52 ...k.web.servlet/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
  273. +50 −50 org.springframework.web/src/main/java/org/springframework/http/MediaTypeEditor.java
  274. +35 −35 ...rk.web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
  275. +88 −88 ...k.web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java
  276. +35 −35 org.springframework.web/src/main/java/org/springframework/web/bind/annotation/Mapping.java
  277. +38 −38 org.springframework.web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java
  278. +77 −77 org.springframework.web/src/main/java/org/springframework/web/context/ContextCleanupListener.java
  279. +54 −54 ...web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java
  280. +111 −111 ...pringframework.web/src/main/java/org/springframework/web/context/support/ServletContextScope.java
  281. +8 −8 org.springframework.web/src/main/java/org/springframework/web/method/annotation/package-info.java
  282. +8 −8 org.springframework.web/src/main/java/org/springframework/web/method/support/package-info.java
  283. +175 −175 .../src/main/java/org/springframework/web/multipart/support/StandardMultipartHttpServletRequest.java
  284. +73 −73 ...web/src/main/java/org/springframework/web/multipart/support/StandardServletMultipartResolver.java
  285. +66 −66 org.springframework.web/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
  286. +71 −71 ...springframework.web/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
  287. +96 −96 org.springframework.web/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
  288. +948 −948 org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
  289. +246 −246 org.springframework.web/src/test/java/org/springframework/mock/web/MockHttpSession.java
  290. +91 −91 org.springframework.web/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
  291. +507 −507 org.springframework.web/src/test/java/org/springframework/mock/web/MockServletContext.java
  292. +100 −100 ...rk.web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
  293. +62 −62 ...k.web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
View
@@ -1,4 +1,4 @@
-# common dependency versions
-aspectj.version=1.6.8.RELEASE
-junit.version=4.9.0
-testng.version=5.12.1
+# common dependency versions
+aspectj.version=1.6.8.RELEASE
+junit.version=4.9.0
+testng.version=5.12.1
@@ -1,103 +1,103 @@
-/*
- * Copyright 2002-2009 the original author 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.
- */
-
-package org.springframework.aop.interceptor;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import org.springframework.core.Ordered;
-import org.springframework.core.task.AsyncTaskExecutor;
-import org.springframework.core.task.support.TaskExecutorAdapter;
-import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * AOP Alliance <code>MethodInterceptor</code> that processes method invocations
- * asynchronously, using a given {@link org.springframework.core.task.AsyncTaskExecutor}.
- * Typically used with the {@link org.springframework.context.task.Async} annotation.
- *
- * <p>In terms of target method signatures, any parameter types are supported.
- * However, the return type is constrained to either <code>void</code> or
- * <code>java.util.concurrent.Future</code>. In the latter case, the Future handle
- * returned from the proxy will be an actual asynchronous Future that can be used
- * to track the result of the asynchronous method execution. However, since the
- * target method needs to implement the same signature, it will have to return
- * a temporary Future handle that just passes the return value through
- * (like Spring's {@link org.springframework.scheduling.annotation.AsyncResult}
- * or EJB 3.1's <code>javax.ejb.AsyncResult</code>).
- *
- * @author Juergen Hoeller
- * @since 3.0
- * @see org.springframework.scheduling.annotation.Async
- * @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor
- */
-public class AsyncExecutionInterceptor implements MethodInterceptor, Ordered {
-
- private final AsyncTaskExecutor asyncExecutor;
-
-
- /**
- * Create a new AsyncExecutionInterceptor.
- * @param asyncExecutor the Spring AsyncTaskExecutor to delegate to
- */
- public AsyncExecutionInterceptor(AsyncTaskExecutor asyncExecutor) {
- Assert.notNull(asyncExecutor, "TaskExecutor must not be null");
- this.asyncExecutor = asyncExecutor;
- }
-
- /**
- * Create a new AsyncExecutionInterceptor.
- * @param asyncExecutor the <code>java.util.concurrent</code> Executor
- * to delegate to (typically a {@link java.util.concurrent.ExecutorService}
- */
- public AsyncExecutionInterceptor(Executor asyncExecutor) {
- this.asyncExecutor = new TaskExecutorAdapter(asyncExecutor);
- }
-
-
- public Object invoke(final MethodInvocation invocation) throws Throwable {
- Future result = this.asyncExecutor.submit(new Callable<Object>() {
- public Object call() throws Exception {
- try {
- Object result = invocation.proceed();
- if (result instanceof Future) {
- return ((Future) result).get();
- }
- }
- catch (Throwable ex) {
- ReflectionUtils.rethrowException(ex);
- }
- return null;
- }
- });
- if (Future.class.isAssignableFrom(invocation.getMethod().getReturnType())) {
- return result;
- }
- else {
- return null;
- }
- }
-
- public int getOrder() {
- return Ordered.HIGHEST_PRECEDENCE;
- }
-
-}
+/*
+ * Copyright 2002-2009 the original author 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.
+ */
+
+package org.springframework.aop.interceptor;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+import org.springframework.core.Ordered;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.core.task.support.TaskExecutorAdapter;
+import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * AOP Alliance <code>MethodInterceptor</code> that processes method invocations
+ * asynchronously, using a given {@link org.springframework.core.task.AsyncTaskExecutor}.
+ * Typically used with the {@link org.springframework.context.task.Async} annotation.
+ *
+ * <p>In terms of target method signatures, any parameter types are supported.
+ * However, the return type is constrained to either <code>void</code> or
+ * <code>java.util.concurrent.Future</code>. In the latter case, the Future handle
+ * returned from the proxy will be an actual asynchronous Future that can be used
+ * to track the result of the asynchronous method execution. However, since the
+ * target method needs to implement the same signature, it will have to return
+ * a temporary Future handle that just passes the return value through
+ * (like Spring's {@link org.springframework.scheduling.annotation.AsyncResult}
+ * or EJB 3.1's <code>javax.ejb.AsyncResult</code>).
+ *
+ * @author Juergen Hoeller
+ * @since 3.0
+ * @see org.springframework.scheduling.annotation.Async
+ * @see org.springframework.scheduling.annotation.AsyncAnnotationAdvisor
+ */
+public class AsyncExecutionInterceptor implements MethodInterceptor, Ordered {
+
+ private final AsyncTaskExecutor asyncExecutor;
+
+
+ /**
+ * Create a new AsyncExecutionInterceptor.
+ * @param asyncExecutor the Spring AsyncTaskExecutor to delegate to
+ */
+ public AsyncExecutionInterceptor(AsyncTaskExecutor asyncExecutor) {
+ Assert.notNull(asyncExecutor, "TaskExecutor must not be null");
+ this.asyncExecutor = asyncExecutor;
+ }
+
+ /**
+ * Create a new AsyncExecutionInterceptor.
+ * @param asyncExecutor the <code>java.util.concurrent</code> Executor
+ * to delegate to (typically a {@link java.util.concurrent.ExecutorService}
+ */
+ public AsyncExecutionInterceptor(Executor asyncExecutor) {
+ this.asyncExecutor = new TaskExecutorAdapter(asyncExecutor);
+ }
+
+
+ public Object invoke(final MethodInvocation invocation) throws Throwable {
+ Future result = this.asyncExecutor.submit(new Callable<Object>() {
+ public Object call() throws Exception {
+ try {
+ Object result = invocation.proceed();
+ if (result instanceof Future) {
+ return ((Future) result).get();
+ }
+ }
+ catch (Throwable ex) {
+ ReflectionUtils.rethrowException(ex);
+ }
+ return null;
+ }
+ });
+ if (Future.class.isAssignableFrom(invocation.getMethod().getReturnType())) {
+ return result;
+ }
+ else {
+ return null;
+ }
+ }
+
+ public int getOrder() {
+ return Ordered.HIGHEST_PRECEDENCE;
+ }
+
+}
Oops, something went wrong.

0 comments on commit 88913f2

Please sign in to comment.