diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml index 612ee53bc4b..5b4f5ef5a9d 100644 --- a/spring-framework-reference/src/aop.xml +++ b/spring-framework-reference/src/aop.xml @@ -3212,8 +3212,10 @@ public class ProfilingAspect { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> +http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <!-- a service object; we will be profiling its methods --> <bean id="entitlementCalculationService" @@ -3437,8 +3439,10 @@ public final class Main { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> +http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <context:load-time-weaver/> @@ -3530,8 +3534,10 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> +http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <context:load-time-weaver weaver-class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"/> @@ -3634,7 +3640,8 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch setup work. <Context path="/myWebApp" docBase="/my/webApp/location"> - <Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader" + <Loader + loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader" useSystemClassLoaderAsParent="false"/> </Context> diff --git a/spring-framework-reference/src/mail.xml b/spring-framework-reference/src/mail.xml index bb1af2b4385..05ffc42cbb9 100644 --- a/spring-framework-reference/src/mail.xml +++ b/spring-framework-reference/src/mail.xml @@ -386,8 +386,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans - resource.loader=class - class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader + resource.loader=class + class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader diff --git a/spring-framework-reference/src/orm.xml b/spring-framework-reference/src/orm.xml index a83ada75fb8..98b0622509a 100644 --- a/spring-framework-reference/src/orm.xml +++ b/spring-framework-reference/src/orm.xml @@ -425,12 +425,14 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you <!-- SessionFactory, DataSource, etc. omitted --> - <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager"> + <bean id="transactionManager" + class="org.springframework.orm.hibernate3.HibernateTransactionManager"> <property name="sessionFactory" ref="sessionFactory"/> </bean> <aop:config> - <aop:pointcut id="productServiceMethods" expression="execution(* product.ProductService.*(..))"/> + <aop:pointcut id="productServiceMethods" + expression="execution(* product.ProductService.*(..))"/> <aop:advisor advice-ref="txAdvice" pointcut-ref="productServiceMethods"/> </aop:config> @@ -459,7 +461,8 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you } // notice the absence of transaction demarcation code in this method - // Spring's declarative transaction infrastructure will be demarcating transactions on your behalf + // Spring's declarative transaction infrastructure will be demarcating + // transactions on your behalf public void increasePriceOfAllProductsInCategory(final String category) { List productsToChange = this.productDao.loadProductsByCategory(category); // ... @@ -515,7 +518,8 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you <!-- SessionFactory, DataSource, etc. omitted --> - <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager"> + <bean id="transactionManager" + class="org.springframework.orm.hibernate3.HibernateTransactionManager"> <property name="sessionFactory" ref="sessionFactory"/> </bean> @@ -633,7 +637,8 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you <jee:jndi-lookup id="dataSource2" jndi-name="java:comp/env/jdbc/myds2"/> - <bean id="mySessionFactory1" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"> + <bean id="mySessionFactory1" + class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"> <property name="dataSource" ref="myDataSource1"/> <property name="mappingResources"> <list> @@ -648,7 +653,8 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you </property> </bean> - <bean id="mySessionFactory2" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"> + <bean id="mySessionFactory2" + class="org.springframework.orm.hibernate3.LocalSessionFactoryBean"> <property name="dataSource" ref="myDataSource2"/> <property name="mappingResources"> <list> @@ -678,7 +684,8 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you </bean> <aop:config> - <aop:pointcut id="productServiceMethods" expression="execution(* product.ProductService.*(..))"/> + <aop:pointcut id="productServiceMethods" + expression="execution(* product.ProductService.*(..))"/> <aop:advisor advice-ref="txAdvice" pointcut-ref="productServiceMethods"/> </aop:config> @@ -1169,7 +1176,8 @@ TR: OK AS IS. Two different callback methhods - one is Spring's (*afterCompletio </tx:advice> <aop:config> - <aop:pointcut id="productServiceMethods" expression="execution(* product.ProductService.*(..))"/> + <aop:pointcut id="productServiceMethods" + expression="execution(* product.ProductService.*(..))"/> <aop:advisor advice-ref="txAdvice" pointcut-ref="productServiceMethods"/> </aop:config> @@ -1504,7 +1512,8 @@ TR: OK AS IS. The requirement is to provide the classloader for the runtime envi file: <Context path="/myWebApp" docBase="/my/webApp/location"> - <Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/> + <Loader + loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/> </Context> Tomcat 5.0.x and 5.5.x series support several context @@ -1539,7 +1548,8 @@ TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended useSystemClassLoaderAsParent to false to fix the problem: <Context path="/myWebApp" docBase="/my/webApp/location"> - <Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader" + <Loader + loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader" useSystemClassLoaderAsParent="false"/> </Context> @@ -1563,7 +1573,8 @@ TR: REVISED, PLS REVIEW. Chnaged the last one to *inside*--> is recommended file: <Context path="/myWebApp" docBase="/my/webApp/location"> - <Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/> + <Loader + loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader"/> </Context> The Tomcat 6.0.x (similar to 5.0.x/5.5.x) series diff --git a/spring-framework-reference/src/validation.xml b/spring-framework-reference/src/validation.xml index 56b78ae718e..fd3bc6f8599 100644 --- a/spring-framework-reference/src/validation.xml +++ b/spring-framework-reference/src/validation.xml @@ -117,7 +117,8 @@ public class Person { public CustomerValidator(Validator addressValidator) { if (addressValidator == null) { - throw new IllegalArgumentException("The supplied [Validator] is required and must not be null."); + throw new IllegalArgumentException( + "The supplied [Validator] is required and must not be null."); } if (!addressValidator.supports(Address.class)) { throw new IllegalArgumentException( @@ -729,7 +730,8 @@ public final class CustomPropertyEditorRegistrar implements PropertyEditorRegist this.customPropertyEditorRegistrar = propertyEditorRegistrar; } - protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception { + protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) + throws Exception { ]]>this.customPropertyEditorRegistrar.registerCustomEditors(binder);