From 610fa618aae58af50c12ee8d0c29d12b7460fd8a Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 30 Jan 2012 17:55:34 -0500 Subject: [PATCH 1/6] SPR-9056 Make DelegatingWebMvcConfiguration config callbacks not final It should be possible to progress from extending WebMvcConfigurerAdapter (w/ @EnableWebMvc) to extending WebMvcConfigurationSupport directly, to extending DelegatingWebMvcConfigurationSupport. This change makes that possible. --- .../DelegatingWebMvcConfiguration.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java index 5571532ed7d..68d2043269b 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java @@ -51,52 +51,52 @@ public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport { } @Override - protected final void addInterceptors(InterceptorRegistry registry) { + protected void addInterceptors(InterceptorRegistry registry) { configurers.addInterceptors(registry); } @Override - protected final void addViewControllers(ViewControllerRegistry registry) { + protected void addViewControllers(ViewControllerRegistry registry) { configurers.addViewControllers(registry); } @Override - protected final void addResourceHandlers(ResourceHandlerRegistry registry) { + protected void addResourceHandlers(ResourceHandlerRegistry registry) { configurers.addResourceHandlers(registry); } @Override - protected final void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { + protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { configurers.configureDefaultServletHandling(configurer); } @Override - protected final void addArgumentResolvers(List argumentResolvers) { + protected void addArgumentResolvers(List argumentResolvers) { configurers.addArgumentResolvers(argumentResolvers); } @Override - protected final void addReturnValueHandlers(List returnValueHandlers) { + protected void addReturnValueHandlers(List returnValueHandlers) { configurers.addReturnValueHandlers(returnValueHandlers); } @Override - protected final void configureMessageConverters(List> converters) { + protected void configureMessageConverters(List> converters) { configurers.configureMessageConverters(converters); } @Override - protected final void addFormatters(FormatterRegistry registry) { + protected void addFormatters(FormatterRegistry registry) { configurers.addFormatters(registry); } @Override - protected final Validator getValidator() { + protected Validator getValidator() { return configurers.getValidator(); } @Override - protected final void configureHandlerExceptionResolvers(List exceptionResolvers) { + protected void configureHandlerExceptionResolvers(List exceptionResolvers) { configurers.configureHandlerExceptionResolvers(exceptionResolvers); } From 21966990c89a51fbcc36a778682b021d983aabd8 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 30 Jan 2012 18:39:20 -0500 Subject: [PATCH 2/6] SPR-9016 Add flag to Redirectview to disable expanding URI vars --- build-spring-framework/resources/changelog.txt | 1 + .../web/servlet/view/RedirectView.java | 15 ++++++++++++++- .../view/RedirectViewUriTemplateTests.java | 12 ++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index eff2824e93e..ce2299703ba 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -27,6 +27,7 @@ Changes in version 3.1.1 (2012-02-06) * allow adding flash attributes in methods with a ModelAndView return value * preserve quotes in MediaType parameters * make flash attributes available in the model of ParameterizableViewController and UrlFilenameViewController +* add property to RedirectView to disable expanding URI variables in redirect URL Changes in version 3.1 GA (2011-12-12) -------------------------------------- diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java index 184c9a32841..0e100ee7f34 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/RedirectView.java @@ -106,6 +106,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { private HttpStatus statusCode; + private boolean expandUriTemplateVariables = true; /** * Constructor for use as a bean. @@ -225,6 +226,18 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { this.statusCode = statusCode; } + /** + * Whether to treat the redirect URL as a URI template. + * Set this flag to false if the redirect URL contains open + * and close curly braces "{", "}" and you don't want them interpreted + * as URI variables. + *

Defaults to true. + * @param expandUriTemplateVariables + */ + public void setExpandUriTemplateVariables(boolean expandUriTemplateVariables) { + this.expandUriTemplateVariables = expandUriTemplateVariables; + } + /** * Returns "true" indicating this view performs a redirect. */ @@ -288,7 +301,7 @@ public class RedirectView extends AbstractUrlBasedView implements SmartView { enc = WebUtils.DEFAULT_CHARACTER_ENCODING; } - if (StringUtils.hasText(targetUrl)) { + if (this.expandUriTemplateVariables && StringUtils.hasText(targetUrl)) { Map variables = getCurrentRequestUriVariables(request); targetUrl = replaceUriTemplateVariables(targetUrl.toString(), model, variables, enc); } diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java index b1e01024b21..87b5d5a3b85 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/RedirectViewUriTemplateTests.java @@ -121,5 +121,17 @@ public class RedirectViewUriTemplateTests { assertEquals("", this.response.getRedirectedUrl()); } + + // SPR-9016 + + @Test + public void dontApplyUriVariables() throws Exception { + String url = "/test#{'one','abc'}"; + RedirectView redirectView = new RedirectView(url, true); + redirectView.setExpandUriTemplateVariables(false); + redirectView.renderMergedOutputModel(new ModelMap(), this.request, this.response); + + assertEquals(url, this.response.getRedirectedUrl()); + } } From e9208981a642f1e98863446174ce5285f5ecf993 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 30 Jan 2012 19:52:20 -0500 Subject: [PATCH 3/6] SPR-9062 Fix bug with ambiguous path and HTTP method request mappings A direct path match with incorrect HTTP request method was causing another request mapping with a pattern and a correct HTTP method to be ignored. The bug affects the new @MVC support classes (i.e. RequestMappingHandlerMapping). --- .../resources/changelog.txt | 1 + .../handler/AbstractHandlerMethodMapping.java | 31 ++++++++++++------- ...nnotationControllerHandlerMethodTests.java | 27 ++++++++++++++++ 3 files changed, 48 insertions(+), 11 deletions(-) diff --git a/build-spring-framework/resources/changelog.txt b/build-spring-framework/resources/changelog.txt index ce2299703ba..c61372a70e7 100644 --- a/build-spring-framework/resources/changelog.txt +++ b/build-spring-framework/resources/changelog.txt @@ -28,6 +28,7 @@ Changes in version 3.1.1 (2012-02-06) * preserve quotes in MediaType parameters * make flash attributes available in the model of ParameterizableViewController and UrlFilenameViewController * add property to RedirectView to disable expanding URI variables in redirect URL +* fix request mapping bug involving direct vs pattern path matches with HTTP methods Changes in version 3.1 GA (2011-12-12) -------------------------------------- diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java index a47814c501b..be8fd6d6107 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java @@ -18,12 +18,14 @@ package org.springframework.web.servlet.handler; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -237,18 +239,16 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap * @see #handleNoMatch(Set, String, HttpServletRequest) */ protected HandlerMethod lookupHandlerMethod(String lookupPath, HttpServletRequest request) throws Exception { - List mappings = urlMap.get(lookupPath); - if (mappings == null) { - mappings = new ArrayList(handlerMethods.keySet()); - } - List matches = new ArrayList(); - - for (T mapping : mappings) { - T match = getMatchingMapping(mapping, request); - if (match != null) { - matches.add(new Match(match, handlerMethods.get(mapping))); - } + + List directPathMatches = this.urlMap.get(lookupPath); + if (directPathMatches != null) { + addMatchingMappings(directPathMatches, matches, request); + } + + if (matches.isEmpty()) { + // No choice but to go through all mappings + addMatchingMappings(this.handlerMethods.keySet(), matches, request); } if (!matches.isEmpty()) { @@ -279,6 +279,15 @@ public abstract class AbstractHandlerMethodMapping extends AbstractHandlerMap } } + private void addMatchingMappings(Collection mappings, List matches, HttpServletRequest request) { + for (T mapping : mappings) { + T match = getMatchingMapping(mapping, request); + if (match != null) { + matches.add(new Match(match, handlerMethods.get(mapping))); + } + } + } + /** * Check if a mapping matches the current request and return a (potentially * new) mapping with conditions relevant to the current request. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 879961db773..ef81648a078 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -1182,6 +1182,19 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl assertEquals("myParam-42", response.getContentAsString()); } + // SPR-9062 + + @Test + public void ambiguousPathAndRequestMethod() throws Exception { + initServletWithControllers(AmbiguousPathAndRequestMethodController.class); + + MockHttpServletRequest request = new MockHttpServletRequest("GET", "/bug/EXISTING"); + MockHttpServletResponse response = new MockHttpServletResponse(); + getServlet().service(request, response); + assertEquals(200, response.getStatus()); + assertEquals("Pattern", response.getContentAsString()); + } + @Test public void bridgeMethods() throws Exception { initServletWithControllers(TestControllerImpl.class); @@ -2549,6 +2562,20 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl } } + @Controller + static class AmbiguousPathAndRequestMethodController { + + @RequestMapping(value = "/bug/EXISTING", method = RequestMethod.POST) + public void directMatch(Writer writer) throws IOException { + writer.write("Direct"); + } + + @RequestMapping(value = "/bug/{type}", method = RequestMethod.GET) + public void patternMatch(Writer writer) throws IOException { + writer.write("Pattern"); + } + } + @Controller @RequestMapping("/test*") public static class BindingCookieValueController { From 38a62f83897fb931c59d67dd1989a0dcd91516ba Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 24 Jan 2012 10:11:16 +0100 Subject: [PATCH 4/6] Ignore Gradle-related files and directories When switching back to 3.1.x from master, ignore renamed directories, Gradle 'build' dirs, generated IDE metadata, etc. You may wish to clean these files with $ git clean -dfx Or do a dry-run beforehand with the '-n' flag: $ git clean -dfxn --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 35570bc6005..971bf6f6609 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,11 @@ org.springframework.spring-parent/.project org.springframework.test/test-output/ target spring-build/lib/docbook + +# ignore files and directories related to gradle build +/.classpath +/.project +/.gradle +/build +/spring-* +!/spring-framework-reference From 87a021d5c9b25d2e7785bbecbd4e668b2091d4c3 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 30 Jan 2012 15:01:12 +0100 Subject: [PATCH 5/6] Add section to 3.1.x Maven poms Issue: SPR-8927 --- org.springframework.aop/pom.xml | 12 +- org.springframework.asm/pom.xml | 75 ++- org.springframework.aspects/pom.xml | 12 +- org.springframework.beans/pom.xml | 16 +- org.springframework.context.support/pom.xml | 22 +- org.springframework.context/pom.xml | 548 +++++++-------- org.springframework.core/pom.xml | 154 ++--- org.springframework.expression/pom.xml | 12 +- org.springframework.instrument.tomcat/pom.xml | 13 +- org.springframework.instrument/pom.xml | 12 +- org.springframework.integration-tests/pom.xml | 39 +- org.springframework.jdbc/pom.xml | 13 +- org.springframework.jms/pom.xml | 24 +- org.springframework.orm/pom.xml | 475 ++++++------- org.springframework.oxm/pom.xml | 204 +++--- org.springframework.spring-library/pom.xml | 192 +++--- org.springframework.spring-parent/pom.xml | 162 +++-- org.springframework.test/pom.xml | 18 +- org.springframework.transaction/pom.xml | 12 +- org.springframework.web.portlet/pom.xml | 12 +- org.springframework.web.servlet/pom.xml | 625 +++++++++--------- org.springframework.web.struts/pom.xml | 47 +- org.springframework.web/pom.xml | 386 +++++------ 23 files changed, 1608 insertions(+), 1477 deletions(-) diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml index 8a3a9085575..97d553602d6 100644 --- a/org.springframework.aop/pom.xml +++ b/org.springframework.aop/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-aop @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + com.jamonapi diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml index 3b089c93ba7..24fee0721b8 100644 --- a/org.springframework.asm/pom.xml +++ b/org.springframework.asm/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-asm @@ -11,45 +13,50 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + maven-antrun-plugin - - - jarjar - process-classes - - run - - - - - - - - - - - - + + + jarjar + process-classes + + run + + + + + + + + + + + + - - - - - - - - com.google.code - jarjar - 1.0 - - + + + + + + + + com.google.code + jarjar + 1.0 + + diff --git a/org.springframework.aspects/pom.xml b/org.springframework.aspects/pom.xml index 423cbe54a07..ba34ad1ebc5 100644 --- a/org.springframework.aspects/pom.xml +++ b/org.springframework.aspects/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-aspects @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + diff --git a/org.springframework.beans/pom.xml b/org.springframework.beans/pom.xml index 56992da524e..d058436cda3 100644 --- a/org.springframework.beans/pom.xml +++ b/org.springframework.beans/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-beans @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + org.hamcrest @@ -22,13 +30,13 @@ javax.el el-api 1.0 - provided + provided javax.inject javax.inject 1 - provided + provided cglib diff --git a/org.springframework.context.support/pom.xml b/org.springframework.context.support/pom.xml index f364d5c1c14..60db41abf72 100644 --- a/org.springframework.context.support/pom.xml +++ b/org.springframework.context.support/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-context-support @@ -11,8 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + com.bea.commonj @@ -50,10 +57,10 @@ 2.0.5 true - - bouncycastle - bctsp-jdk14 - + + bouncycastle + bctsp-jdk14 + @@ -127,7 +134,6 @@ test - diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml index a51e768ea14..4853e18988e 100644 --- a/org.springframework.context/pom.xml +++ b/org.springframework.context/pom.xml @@ -1,274 +1,280 @@ - 4.0.0 - org.springframework - spring-context - jar - 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - - - - - backport-util-concurrent - backport-util-concurrent - 3.0 - true - - - javax.annotation - jsr250-api - 1.0 - true - - - org.apache.geronimo.specs - geronimo-ejb_3.0_spec - 1.0.1 - true - - - org.apache.geronimo.specs - geronimo-interceptor_3.0_spec - 1.0.1 - true - - - javax.inject - javax.inject - 1 - true - - - javax.inject - javax.inject-tck - 1 - test - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1 - true - - - javax.persistence - persistence-api - 1.0 - true - - - javax.validation - validation-api - 1.0.0.GA - true - - - javax.xml.ws - jaxws-api - 2.1-1 - true - - - cglib - cglib-nodep - 2.2 - true - - - aopalliance - aopalliance - 1.0 - compile - true - - - - org.aspectj - aspectjweaver - true - - - org.beanshell - bsh - 2.0b4 - true - - - org.codehaus.groovy - groovy-all - 1.6.3 - true - - - org.jruby - jruby - 1.4.0 - true - - - asm - asm - 3.0 - true - - - joda-time - joda-time - 1.6 - true - - - org.springframework - spring-aop - ${project.version} - compile - - - org.springframework - spring-beans - ${project.version} - compile - - - org.springframework - spring-core - ${project.version} - compile - - - org.springframework - spring-expression - ${project.version} - compile - - - org.springframework - spring-instrument - ${project.version} - true - - - org.springframework - spring-asm - ${project.version} - compile - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - true - - - net.sf.ehcache - ehcache-core - 2.0.0 - true - - - javax.xml - jaxrpc-api - 1.1 - test - - - commons-pool - commons-pool - 1.5.3 - test - - - commons-dbcp - commons-dbcp - 1.2.2 - test - - - log4j - log4j - test - - - org.easymock - easymock - test - - - org.hamcrest - hamcrest-all - 1.1 - - - org.hibernate - com.springsource.org.hibernate.validator - 4.2.0.Final - compile - true - - - javax.validation - com.springsource.javax.validation - - - org.slf4j - com.springsource.slf4j.api - - - - - junit - junit - test - - - org.slf4j - slf4j-log4j12 - test - - - org.codehaus.jsr166-mirror - jsr166 - 1.7.0 - provided - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - - - - - - ${project.basedir}/src/test/java - - - **/* - - - **/*.java - - - - ${project.basedir}/src/test/resources - - - **/* - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + org.springframework + spring-context + jar + 3.1.1.BUILD-SNAPSHOT + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + backport-util-concurrent + backport-util-concurrent + 3.0 + true + + + javax.annotation + jsr250-api + 1.0 + true + + + org.apache.geronimo.specs + geronimo-ejb_3.0_spec + 1.0.1 + true + + + org.apache.geronimo.specs + geronimo-interceptor_3.0_spec + 1.0.1 + true + + + javax.inject + javax.inject + 1 + true + + + javax.inject + javax.inject-tck + 1 + test + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 + true + + + javax.persistence + persistence-api + 1.0 + true + + + javax.validation + validation-api + 1.0.0.GA + true + + + javax.xml.ws + jaxws-api + 2.1-1 + true + + + cglib + cglib-nodep + 2.2 + true + + + aopalliance + aopalliance + 1.0 + compile + true + + + + org.aspectj + aspectjweaver + true + + + org.beanshell + bsh + 2.0b4 + true + + + org.codehaus.groovy + groovy-all + 1.6.3 + true + + + org.jruby + jruby + 1.4.0 + true + + + asm + asm + 3.0 + true + + + joda-time + joda-time + 1.6 + true + + + org.springframework + spring-aop + ${project.version} + compile + + + org.springframework + spring-beans + ${project.version} + compile + + + org.springframework + spring-core + ${project.version} + compile + + + org.springframework + spring-expression + ${project.version} + compile + + + org.springframework + spring-instrument + ${project.version} + true + + + org.springframework + spring-asm + ${project.version} + compile + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + true + + + net.sf.ehcache + ehcache-core + 2.0.0 + true + + + javax.xml + jaxrpc-api + 1.1 + test + + + commons-pool + commons-pool + 1.5.3 + test + + + commons-dbcp + commons-dbcp + 1.2.2 + test + + + log4j + log4j + test + + + org.easymock + easymock + test + + + org.hamcrest + hamcrest-all + 1.1 + + + org.hibernate + com.springsource.org.hibernate.validator + 4.2.0.Final + compile + true + + + javax.validation + com.springsource.javax.validation + + + org.slf4j + com.springsource.slf4j.api + + + + + junit + junit + test + + + org.slf4j + slf4j-log4j12 + test + + + org.codehaus.jsr166-mirror + jsr166 + 1.7.0 + provided + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + junit:junit + + + + + + + ${project.basedir}/src/test/java + + + **/* + + + **/*.java + + + + ${project.basedir}/src/test/resources + + + **/* + + + + diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml index 0fd00579f62..a7c4471bdec 100644 --- a/org.springframework.core/pom.xml +++ b/org.springframework.core/pom.xml @@ -1,77 +1,83 @@ - 4.0.0 - org.springframework - spring-core - jar - 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - - - - - commons-collections - commons-collections - 3.2 - true - - - org.springframework - spring-asm - ${project.version} - compile - - - commons-logging - commons-logging - 1.1.1 - compile - - - log4j - log4j - compile - true - - - net.sf.jopt-simple - jopt-simple - 3.0 - compile - true - - - org.aspectj - aspectjweaver - true - - - junit - junit - test - - - org.easymock - easymock - test - - - xmlunit - xmlunit - 1.2 - test - - - org.codehaus.woodstox - wstx-asl - 3.2.7 - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + org.springframework + spring-core + jar + 3.1.1.BUILD-SNAPSHOT + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + commons-collections + commons-collections + 3.2 + true + + + org.springframework + spring-asm + ${project.version} + compile + + + commons-logging + commons-logging + 1.1.1 + compile + + + log4j + log4j + compile + true + + + net.sf.jopt-simple + jopt-simple + 3.0 + compile + true + + + org.aspectj + aspectjweaver + true + + + junit + junit + test + + + org.easymock + easymock + test + + + xmlunit + xmlunit + 1.2 + test + + + org.codehaus.woodstox + wstx-asl + 3.2.7 + test + + diff --git a/org.springframework.expression/pom.xml b/org.springframework.expression/pom.xml index b3795a6414e..be54d4c6ac5 100644 --- a/org.springframework.expression/pom.xml +++ b/org.springframework.expression/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-expression @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + diff --git a/org.springframework.instrument.tomcat/pom.xml b/org.springframework.instrument.tomcat/pom.xml index 93594d1b56e..b51a73fc7f8 100644 --- a/org.springframework.instrument.tomcat/pom.xml +++ b/org.springframework.instrument.tomcat/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-instrument-tomcat @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + org.apache.tomcat @@ -20,5 +28,4 @@ provided - diff --git a/org.springframework.instrument/pom.xml b/org.springframework.instrument/pom.xml index d66b844c735..53dffc8408e 100644 --- a/org.springframework.instrument/pom.xml +++ b/org.springframework.instrument/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-instrument @@ -11,5 +13,11 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml index be0ee6b8aa9..71847ef90d1 100644 --- a/org.springframework.integration-tests/pom.xml +++ b/org.springframework.integration-tests/pom.xml @@ -1,16 +1,25 @@ - + 4.0.0 org.springframework spring-integration-tests jar 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + com.caucho @@ -144,10 +153,10 @@ 2.0.5 test - - xml-apis - xml-apis - + + xml-apis + xml-apis + @@ -281,10 +290,10 @@ 1.6.1 test - - xml-apis - xml-apis - + + xml-apis + xml-apis + diff --git a/org.springframework.jdbc/pom.xml b/org.springframework.jdbc/pom.xml index dcf8f1c2c76..4853aa826a5 100644 --- a/org.springframework.jdbc/pom.xml +++ b/org.springframework.jdbc/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-jdbc @@ -11,6 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + c3p0 @@ -88,7 +97,6 @@ test - @@ -100,5 +108,4 @@ - diff --git a/org.springframework.jms/pom.xml b/org.springframework.jms/pom.xml index 244442bb470..986f8b2068c 100644 --- a/org.springframework.jms/pom.xml +++ b/org.springframework.jms/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-jms @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + org.apache.geronimo.specs @@ -90,12 +98,12 @@ ${project.version} compile - - org.codehaus.jackson - jackson-mapper-asl - 1.4.2 - true - + + org.codehaus.jackson + jackson-mapper-asl + 1.4.2 + true + diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml index 2916ab021c9..3f0e0c72257 100644 --- a/org.springframework.orm/pom.xml +++ b/org.springframework.orm/pom.xml @@ -1,237 +1,244 @@ - 4.0.0 - org.springframework - spring-orm - jar - 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - - - - toplink.essentials - toplink-essentials - 2.0-41 - true - - - aopalliance - aopalliance - 1.0 - true - - - - org.apache.ibatis - ibatis-sqlmap - 2.3.4.726 - true - - - org.apache.openjpa - openjpa - 1.1.0 - true - - - org.eclipse.persistence - org.eclipse.persistence.core - 1.0.1 - true - - - org.eclipse.persistence - org.eclipse.persistence.jpa - 1.0.1 - true - - - org.eclipse.persistence - org.eclipse.persistence.asm - 1.0.1 - test - - - org.eclipse.persistence - org.eclipse.persistence.antlr - 1.0.1 - test - - - org.hibernate - hibernate-core - 3.6.0.Final - true - - - org.hibernate - hibernate-cglib-repack - 2.1_3 - test - - - cglib - cglib-nodep - 2.2 - test - - - org.slf4j - slf4j-log4j12 - test - true - - - log4j - log4j - test - true - - - org.hibernate - hibernate-annotations - 3.4.0.GA - true - - - org.hibernate - hibernate-entitymanager - 3.4.0.GA - true - - - javax.jdo - jdo2-api - 2.1 - true - - - javax.persistence - persistence-api - 1.0 - true - - - javax.servlet - servlet-api - 2.5 - true - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - provided - - - org.springframework - spring-aop - ${project.version} - true - - - org.springframework - spring-beans - ${project.version} - compile - - - org.springframework - spring-context - ${project.version} - true - - - org.springframework - spring-core - ${project.version} - compile - - - org.springframework - spring-jdbc - ${project.version} - compile - - - org.springframework - spring-tx - ${project.version} - compile - - - org.springframework - spring-web - ${project.version} - true - - - org.aspectj - aspectjweaver - test - - - commons-dbcp - commons-dbcp - 1.2.2 - test - - - commons-pool - commons-pool - 1.5.3 - test - - - org.easymock - easymock - test - - - hsqldb - hsqldb - 1.8.0.7 - test - - - junit - junit - test - - - - - - src/main/java - - **/*.xsd - **/*.xml - - - - - - src/test/java - - **/*.xml - **/*.sql - **/*.jar - **/*.properties - - - - src/test/resources - - **/*.xml - *.jar - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + org.springframework + spring-orm + jar + 3.1.1.BUILD-SNAPSHOT + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + toplink.essentials + toplink-essentials + 2.0-41 + true + + + aopalliance + aopalliance + 1.0 + true + + + + org.apache.ibatis + ibatis-sqlmap + 2.3.4.726 + true + + + org.apache.openjpa + openjpa + 1.1.0 + true + + + org.eclipse.persistence + org.eclipse.persistence.core + 1.0.1 + true + + + org.eclipse.persistence + org.eclipse.persistence.jpa + 1.0.1 + true + + + org.eclipse.persistence + org.eclipse.persistence.asm + 1.0.1 + test + + + org.eclipse.persistence + org.eclipse.persistence.antlr + 1.0.1 + test + + + org.hibernate + hibernate-core + 3.6.0.Final + true + + + org.hibernate + hibernate-cglib-repack + 2.1_3 + test + + + cglib + cglib-nodep + 2.2 + test + + + org.slf4j + slf4j-log4j12 + test + true + + + log4j + log4j + test + true + + + org.hibernate + hibernate-annotations + 3.4.0.GA + true + + + org.hibernate + hibernate-entitymanager + 3.4.0.GA + true + + + javax.jdo + jdo2-api + 2.1 + true + + + javax.persistence + persistence-api + 1.0 + true + + + javax.servlet + servlet-api + 2.5 + true + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + provided + + + org.springframework + spring-aop + ${project.version} + true + + + org.springframework + spring-beans + ${project.version} + compile + + + org.springframework + spring-context + ${project.version} + true + + + org.springframework + spring-core + ${project.version} + compile + + + org.springframework + spring-jdbc + ${project.version} + compile + + + org.springframework + spring-tx + ${project.version} + compile + + + org.springframework + spring-web + ${project.version} + true + + + org.aspectj + aspectjweaver + test + + + commons-dbcp + commons-dbcp + 1.2.2 + test + + + commons-pool + commons-pool + 1.5.3 + test + + + org.easymock + easymock + test + + + hsqldb + hsqldb + 1.8.0.7 + test + + + junit + junit + test + + + + + + src/main/java + + **/*.xsd + **/*.xml + + + + + + src/test/java + + **/*.xml + **/*.sql + **/*.jar + **/*.properties + + + + src/test/resources + + **/*.xml + *.jar + + + + diff --git a/org.springframework.oxm/pom.xml b/org.springframework.oxm/pom.xml index a52d5f383b4..eb76992b082 100644 --- a/org.springframework.oxm/pom.xml +++ b/org.springframework.oxm/pom.xml @@ -1,102 +1,108 @@ - 4.0.0 - org.springframework - spring-oxm - jar - 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - - - - - com.thoughtworks.xstream - xstream - 1.3.1 - true - - - com.sun.xml.bind - jaxb-impl - 2.1.7 - true - - - org.jibx - jibx-run - 1.1.5 - true - - - - commons-lang - commons-lang - 2.5 - compile - - - org.apache.xmlbeans - xmlbeans - 2.4.0 - true - - - org.codehaus.castor - castor-xml - 1.3.2 - true - - - org.springframework - spring-beans - ${project.version} - compile - - - org.springframework - spring-context - ${project.version} - compile - - - org.springframework - spring-core - ${project.version} - compile - - - junit - junit - test - - - org.easymock - easymock - test - - - org.codehaus.jettison - jettison - 1.0.1 - test - - - xmlunit - xmlunit - 1.2 - test - - - xmlpull - xmlpull - 1.1.3.4a - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + org.springframework + spring-oxm + jar + 3.1.1.BUILD-SNAPSHOT + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + com.thoughtworks.xstream + xstream + 1.3.1 + true + + + com.sun.xml.bind + jaxb-impl + 2.1.7 + true + + + org.jibx + jibx-run + 1.1.5 + true + + + + commons-lang + commons-lang + 2.5 + compile + + + org.apache.xmlbeans + xmlbeans + 2.4.0 + true + + + org.codehaus.castor + castor-xml + 1.3.2 + true + + + org.springframework + spring-beans + ${project.version} + compile + + + org.springframework + spring-context + ${project.version} + compile + + + org.springframework + spring-core + ${project.version} + compile + + + junit + junit + test + + + org.easymock + easymock + test + + + org.codehaus.jettison + jettison + 1.0.1 + test + + + xmlunit + xmlunit + 1.2 + test + + + xmlpull + xmlpull + 1.1.3.4a + test + + diff --git a/org.springframework.spring-library/pom.xml b/org.springframework.spring-library/pom.xml index cae43e3ca2c..c768410efee 100644 --- a/org.springframework.spring-library/pom.xml +++ b/org.springframework.spring-library/pom.xml @@ -1,15 +1,7 @@ - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.springframework spring-library @@ -46,13 +38,11 @@ - Spring Forum - + Spring Forum http://forum.springframework.org http://forum.springframework.org - staging @@ -72,93 +62,91 @@ - - - - org.springframework - spring-aop - ${project.version} - - - org.springframework - spring-asm - ${project.version} - - - org.springframework - spring-aspects - ${project.version} - - - org.springframework - spring-beans - ${project.version} - - - org.springframework - spring-context - ${project.version} - - - org.springframework - spring-context-support - ${project.version} - - - org.springframework - spring-core - ${project.version} - - - org.springframework - spring-expression - ${project.version} - - - org.springframework - spring-jdbc - ${project.version} - - - org.springframework - spring-jms - ${project.version} - - - org.springframework - spring-orm - ${project.version} - - - org.springframework - spring-oxm - ${project.version} - - - org.springframework - spring-tx - ${project.version} - - - org.springframework - spring-web - ${project.version} - - - org.springframework - spring-webmvc - ${project.version} - - - org.springframework - spring-webmvc-portlet - ${project.version} - - - aopalliance - aopalliance - 1.0 - - - + + + org.springframework + spring-aop + ${project.version} + + + org.springframework + spring-asm + ${project.version} + + + org.springframework + spring-aspects + ${project.version} + + + org.springframework + spring-beans + ${project.version} + + + org.springframework + spring-context + ${project.version} + + + org.springframework + spring-context-support + ${project.version} + + + org.springframework + spring-core + ${project.version} + + + org.springframework + spring-expression + ${project.version} + + + org.springframework + spring-jdbc + ${project.version} + + + org.springframework + spring-jms + ${project.version} + + + org.springframework + spring-orm + ${project.version} + + + org.springframework + spring-oxm + ${project.version} + + + org.springframework + spring-tx + ${project.version} + + + org.springframework + spring-web + ${project.version} + + + org.springframework + spring-webmvc + ${project.version} + + + org.springframework + spring-webmvc-portlet + ${project.version} + + + aopalliance + aopalliance + 1.0 + + diff --git a/org.springframework.spring-parent/pom.xml b/org.springframework.spring-parent/pom.xml index 1956c7d96c0..1f25cc24439 100644 --- a/org.springframework.spring-parent/pom.xml +++ b/org.springframework.spring-parent/pom.xml @@ -1,14 +1,6 @@ - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.springframework spring-parent @@ -21,7 +13,13 @@ scm:svn:https://src.springframework.org/svn/spring-framework/trunk scm:svn:https://src.springframework.org/svn/spring-framework/trunk - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + @@ -36,10 +34,10 @@ - javax.inject - com.springsource.javax.inject - 1.0.0 - provided + javax.inject + com.springsource.javax.inject + 1.0.0 + provided junit @@ -54,54 +52,53 @@ test - org.aspectj - aspectjweaver - 1.6.8 - true + org.aspectj + aspectjweaver + 1.6.8 + true - org.easymock - easymock - 2.5.1 - test + org.easymock + easymock + 2.5.1 + test - org.slf4j - slf4j-api - 1.5.10 + org.slf4j + slf4j-api + 1.5.10 - org.slf4j - slf4j-log4j12 - 1.5.10 + org.slf4j + slf4j-log4j12 + 1.5.10 - log4j - log4j + log4j + log4j 1.2.15 - test - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - + test + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + - strict @@ -172,14 +169,14 @@ build - - - org.springframework.repository.maven - SpringSource Maven Repository - http://repository.springframework.org/maven/ - false - - + + + org.springframework.repository.maven + SpringSource Maven Repository + http://repository.springframework.org/maven/ + false + + legacy-build @@ -208,7 +205,7 @@ sun-repo-2 http://download.java.net/maven/2/ false - + com.springsource.repository.bundles.release @@ -225,22 +222,21 @@ - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 2.0.0.RELEASE - - + + + org.springframework.build.aws + org.springframework.build.aws.maven + 2.0.0.RELEASE + + org.apache.maven.plugins maven-compiler-plugin - - 1.5 - 1.6 + + 1.5 + 1.6 @@ -254,21 +250,19 @@ **/Abstract*.java junit:junit - -Xmx512m + -Xmx512m - - - - staging - file:///${user.dir}/target/staging - - - staging - file:///${user.dir}/target/staging - - - + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml index 85b279cf149..0b830209547 100644 --- a/org.springframework.test/pom.xml +++ b/org.springframework.test/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-test @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + javax.activation @@ -29,7 +37,7 @@ javax.inject javax.inject 1 - test + test javax.persistence @@ -54,7 +62,7 @@ jsp-api 2.1 provided - + org.apache.geronimo.specs geronimo-jta_1.1_spec @@ -157,7 +165,5 @@ jdk15 true - - diff --git a/org.springframework.transaction/pom.xml b/org.springframework.transaction/pom.xml index c043933a5c0..fbce590147f 100644 --- a/org.springframework.transaction/pom.xml +++ b/org.springframework.transaction/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-tx @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + com.ibm.websphere diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml index a29673296bf..cb2f097a283 100644 --- a/org.springframework.web.portlet/pom.xml +++ b/org.springframework.web.portlet/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 org.springframework spring-webmvc-portlet @@ -11,7 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + javax.el diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml index c528170f82f..04a529f531b 100644 --- a/org.springframework.web.servlet/pom.xml +++ b/org.springframework.web.servlet/pom.xml @@ -1,313 +1,318 @@ - 4.0.0 - org.springframework - spring-webmvc - jar - 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - - - - - tiger - - 1.5 - - - - stax - stax - 1.2.0 - - - - - - - - rome - rome - 1.0 - true - - - com.lowagie - itext - 2.0.8 - true - - - org.freemarker - freemarker - 2.3.15 - true - - - javax.el - el-api - 1.0 - provided - - - org.apache.tomcat - tomcat-servlet-api - 7.0.8 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.1.2 - provided - - - net.sourceforge.jexcelapi - jxl - 2.6.3 - true - - - jasperreports - jasperreports - 2.0.5 - true - - - xml-apis - xml-apis - - - - - - org.apache.poi - poi - 3.0.2-FINAL - true - - - org.apache.tiles - tiles-api - 2.1.2 - true - - - org.apache.tiles - tiles-core - 2.1.2 - true - - - org.apache.tiles - tiles-jsp - 2.1.2 - true - - - org.apache.tiles - tiles-servlet - 2.1.2 - true - - - velocity - velocity - 1.5 - true - - - velocity-tools - velocity-tools-view - 1.4 - true - - - org.codehaus.jackson - jackson-mapper-asl - 1.4.2 - true - - - org.springframework - spring-asm - ${project.version} - compile - - - org.springframework - spring-beans - ${project.version} - compile - - - org.springframework - spring-context - ${project.version} - compile - - - org.springframework - spring-context-support - ${project.version} - compile - - - org.springframework - spring-core - ${project.version} - compile - - - org.springframework - spring-expression - ${project.version} - compile - - - org.springframework - spring-oxm - ${project.version} - true - - - org.springframework - spring-orm - ${project.version} - test - - - org.springframework - spring-web - ${project.version} - compile - - - junit - junit - test - - - org.easymock - easymock - test - - - xmlunit - xmlunit - 1.2 - test - - - commons-fileupload - commons-fileupload - 1.2 - test - - - dom4j - dom4j - 1.6.1 - test - - - xml-apis - xml-apis - - - - - jaxen - jaxen - 1.1.1 - test - - - xml-apis - xml-apis - - - xom - xom - - - xerces - xercesImpl - - - - - cglib - cglib-nodep - 2.2 - test - - - rhino - js - 1.7R1 - test - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - provided - true - - - javax.validation - validation-api - 1.0.0.GA - provided - - - org.hibernate - hibernate-validator - 4.0.0.GA - test - - - org.slf4j - slf4j-log4j12 - test - true - - - log4j - log4j - test - true - - - joda-time - joda-time - 1.6 - test - - - org.mortbay.jetty - jetty - 6.1.9 - test - - - servlet-api-2.5 - org.mortbay.jetty - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + org.springframework + spring-webmvc + jar + 3.1.1.BUILD-SNAPSHOT + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + tiger + + 1.5 + + + + stax + stax + 1.2.0 + + + + + + + rome + rome + 1.0 + true + + + com.lowagie + itext + 2.0.8 + true + + + org.freemarker + freemarker + 2.3.15 + true + + + javax.el + el-api + 1.0 + provided + + + org.apache.tomcat + tomcat-servlet-api + 7.0.8 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.servlet + jstl + 1.1.2 + provided + + + net.sourceforge.jexcelapi + jxl + 2.6.3 + true + + + jasperreports + jasperreports + 2.0.5 + true + + + xml-apis + xml-apis + + + + + + org.apache.poi + poi + 3.0.2-FINAL + true + + + org.apache.tiles + tiles-api + 2.1.2 + true + + + org.apache.tiles + tiles-core + 2.1.2 + true + + + org.apache.tiles + tiles-jsp + 2.1.2 + true + + + org.apache.tiles + tiles-servlet + 2.1.2 + true + + + velocity + velocity + 1.5 + true + + + velocity-tools + velocity-tools-view + 1.4 + true + + + org.codehaus.jackson + jackson-mapper-asl + 1.4.2 + true + + + org.springframework + spring-asm + ${project.version} + compile + + + org.springframework + spring-beans + ${project.version} + compile + + + org.springframework + spring-context + ${project.version} + compile + + + org.springframework + spring-context-support + ${project.version} + compile + + + org.springframework + spring-core + ${project.version} + compile + + + org.springframework + spring-expression + ${project.version} + compile + + + org.springframework + spring-oxm + ${project.version} + true + + + org.springframework + spring-orm + ${project.version} + test + + + org.springframework + spring-web + ${project.version} + compile + + + junit + junit + test + + + org.easymock + easymock + test + + + xmlunit + xmlunit + 1.2 + test + + + commons-fileupload + commons-fileupload + 1.2 + test + + + dom4j + dom4j + 1.6.1 + test + + + xml-apis + xml-apis + + + + + jaxen + jaxen + 1.1.1 + test + + + xml-apis + xml-apis + + + xom + xom + + + xerces + xercesImpl + + + + + cglib + cglib-nodep + 2.2 + test + + + rhino + js + 1.7R1 + test + + + org.apache.geronimo.specs + geronimo-jta_1.1_spec + 1.1 + provided + true + + + javax.validation + validation-api + 1.0.0.GA + provided + + + org.hibernate + hibernate-validator + 4.0.0.GA + test + + + org.slf4j + slf4j-log4j12 + test + true + + + log4j + log4j + test + true + + + joda-time + joda-time + 1.6 + test + + + org.mortbay.jetty + jetty + 6.1.9 + test + + + servlet-api-2.5 + org.mortbay.jetty + + + + diff --git a/org.springframework.web.struts/pom.xml b/org.springframework.web.struts/pom.xml index 08c8d04d141..9102b3f0e24 100644 --- a/org.springframework.web.struts/pom.xml +++ b/org.springframework.web.struts/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 org.springframework spring-struts @@ -13,6 +13,13 @@ ../org.springframework.spring-parent 3.1.1.BUILD-SNAPSHOT + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + javax.servlet @@ -32,18 +39,18 @@ 1.1.2 test - - struts - struts - 1.2.9 - compile - - - commons-beanutils - commons-beanutils - 1.7.0 - compile - + + struts + struts + 1.2.9 + compile + + + commons-beanutils + commons-beanutils + 1.7.0 + compile + org.springframework spring-beans @@ -62,12 +69,12 @@ ${project.version} compile - - org.springframework - spring-test - ${project.version} - test - + + org.springframework + spring-test + ${project.version} + test + org.springframework spring-web diff --git a/org.springframework.web/pom.xml b/org.springframework.web/pom.xml index 834b5edb01d..b18374cdd34 100644 --- a/org.springframework.web/pom.xml +++ b/org.springframework.web/pom.xml @@ -1,192 +1,198 @@ - - 4.0.0 - org.springframework - spring-web - jar - 3.1.1.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.1.1.BUILD-SNAPSHOT - - - - - com.caucho - com.springsource.com.caucho - 3.2.1 - true - - - rome - rome - 1.0 - true - - - javax.el - el-api - 1.0 - true - - - javax.faces - jsf-api - 1.2_08 - true - - - javax.portlet - portlet-api - 2.0 - provided - - - org.apache.tomcat - tomcat-servlet-api - 7.0.8 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.xml - jaxrpc-api - 1.1 - true - - - javax.xml.soap - saaj-api - 1.3 - provided - - - javax.xml.ws - jaxws-api - 2.1-1 - true - - - aopalliance - aopalliance - 1.0 - compile - - - axis - axis - 1.4 - true - - - commons-fileupload - commons-fileupload - 1.2 - true - - - commons-httpclient - commons-httpclient - 3.1 - true - - - org.apache.httpcomponents - httpclient - 4.1.1 - true - - - - log4j - log4j - compile - true - - - org.codehaus.jackson - jackson-mapper-asl - 1.4.2 - true - - - org.springframework - spring-aop - ${project.version} - true - - - org.springframework - spring-beans - ${project.version} - compile - - - org.springframework - spring-context - ${project.version} - compile - - - org.springframework - spring-core - ${project.version} - compile - - - org.springframework - spring-oxm - ${project.version} - true - - - taglibs - standard - 1.1.2 - test - - - junit - junit - test - - - cglib - cglib-nodep - 2.2 - test - - - org.easymock - easymock - test - - - org.mortbay.jetty - jetty - 6.1.9 - test - - - servlet-api-2.5 - org.mortbay.jetty - - - - - xmlunit - xmlunit - 1.2 - test - - - + + 4.0.0 + org.springframework + spring-web + jar + 3.1.1.BUILD-SNAPSHOT + + org.springframework + spring-parent + ../org.springframework.spring-parent + 3.1.1.BUILD-SNAPSHOT + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + com.caucho + com.springsource.com.caucho + 3.2.1 + true + + + rome + rome + 1.0 + true + + + javax.el + el-api + 1.0 + true + + + javax.faces + jsf-api + 1.2_08 + true + + + javax.portlet + portlet-api + 2.0 + provided + + + org.apache.tomcat + tomcat-servlet-api + 7.0.8 + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + javax.xml + jaxrpc-api + 1.1 + true + + + javax.xml.soap + saaj-api + 1.3 + provided + + + javax.xml.ws + jaxws-api + 2.1-1 + true + + + aopalliance + aopalliance + 1.0 + compile + + + axis + axis + 1.4 + true + + + commons-fileupload + commons-fileupload + 1.2 + true + + + commons-httpclient + commons-httpclient + 3.1 + true + + + org.apache.httpcomponents + httpclient + 4.1.1 + true + + + + log4j + log4j + compile + true + + + org.codehaus.jackson + jackson-mapper-asl + 1.4.2 + true + + + org.springframework + spring-aop + ${project.version} + true + + + org.springframework + spring-beans + ${project.version} + compile + + + org.springframework + spring-context + ${project.version} + compile + + + org.springframework + spring-core + ${project.version} + compile + + + org.springframework + spring-oxm + ${project.version} + true + + + taglibs + standard + 1.1.2 + test + + + junit + junit + test + + + cglib + cglib-nodep + 2.2 + test + + + org.easymock + easymock + test + + + org.mortbay.jetty + jetty + 6.1.9 + test + + + servlet-api-2.5 + org.mortbay.jetty + + + + + xmlunit + xmlunit + 1.2 + test + + From f3c3babfdf7ca9dfb2d4602067ae154edf195f8f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 30 Jan 2012 15:22:44 +0100 Subject: [PATCH 6/6] Update Quartz links in reference and Javadoc Issue: SPR-8915 --- .../quartz/MethodInvokingJobDetailFactoryBean.java | 2 +- .../springframework/scheduling/quartz/package-info.java | 2 +- spring-framework-reference/src/scheduling.xml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java index 2333e7d57c6..dd71eef9a1b 100644 --- a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java +++ b/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java @@ -133,7 +133,7 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod * fashion. The behavior when one does not want concurrent jobs to be * executed is realized through adding the {@link StatefulJob} interface. * More information on stateful versus stateless jobs can be found - * here. + * here. *

The default setting is to run jobs concurrently. */ public void setConcurrent(boolean concurrent) { diff --git a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/package-info.java b/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/package-info.java index a526bff2546..4b8a70a1821 100644 --- a/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/package-info.java +++ b/org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/package-info.java @@ -2,7 +2,7 @@ /** * * Support classes for the open source scheduler - * Quartz, + * Quartz, * allowing to set up Quartz Schedulers, JobDetails and * Triggers as beans in a Spring context. Also provides * convenience classes for implementing Quartz Jobs. diff --git a/spring-framework-reference/src/scheduling.xml b/spring-framework-reference/src/scheduling.xml index 6132a409cca..c4ce4b98c8f 100644 --- a/spring-framework-reference/src/scheduling.xml +++ b/spring-framework-reference/src/scheduling.xml @@ -20,7 +20,7 @@ Spring also features integration classes for supporting scheduling with the Timer, part of the JDK since 1.3, and the Quartz Scheduler (). Both of those + url="http://quartz-scheduler.org">). Both of those schedulers are set up using a FactoryBean with optional references to Timer or Trigger instances, respectively. Furthermore, a @@ -640,13 +640,13 @@ public class SampleBeanInititalizer {

- Using the OpenSymphony Quartz Scheduler + Using the Quartz Scheduler Quartz uses Trigger, Job and JobDetail objects to realize scheduling of all kinds of jobs. For the basic concepts behind Quartz, have a look at . For convenience + url="http://quartz-scheduler.org">. For convenience purposes, Spring offers a couple of classes that simplify the usage of Quartz within Spring-based applications. @@ -930,4 +930,4 @@ public class ExampleJob extends QuartzJobBean { </bean>
- \ No newline at end of file +