Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hk581
spring-framework
提交
2a52decb
S
spring-framework
项目概览
hk581
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2a52decb
编写于
12月 02, 2013
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Polishing (including removal of javadoc imports that show as package cycles in IntelliJ)
上级
41332728
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
25 addition
and
26 deletion
+25
-26
spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java
.../java/org/springframework/scheduling/config/CronTask.java
+6
-5
spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
.../org/springframework/test/util/XmlExpectationsHelper.java
+5
-10
spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
.../transaction/config/TransactionManagementConfigUtils.java
+5
-1
spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
...rter/support/AllEncompassingFormHttpMessageConverter.java
+4
-4
spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
.../http/converter/xml/XmlAwareFormHttpMessageConverter.java
+3
-3
spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
...ingframework/web/servlet/support/WebContentGenerator.java
+1
-2
spring-webmvc/src/main/resources/META-INF/spring.handlers
spring-webmvc/src/main/resources/META-INF/spring.handlers
+1
-1
未找到文件。
spring-context/src/main/java/org/springframework/scheduling/config/CronTask.java
浏览文件 @
2a52decb
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -16,7 +16,6 @@
package
org.springframework.scheduling.config
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
org.springframework.scheduling.support.CronTrigger
;
/**
...
...
@@ -26,13 +25,13 @@ import org.springframework.scheduling.support.CronTrigger;
*
* @author Chris Beams
* @since 3.2
* @see Scheduled#cron()
* @see
org.springframework.scheduling.annotation.
Scheduled#cron()
* @see ScheduledTaskRegistrar#setCronTasksList(java.util.List)
* @see org.springframework.scheduling.TaskScheduler
*/
public
class
CronTask
extends
TriggerTask
{
private
String
expression
;
private
final
String
expression
;
/**
...
...
@@ -54,7 +53,9 @@ public class CronTask extends TriggerTask {
this
.
expression
=
cronTrigger
.
getExpression
();
}
public
String
getExpression
()
{
return
expression
;
return
this
.
expression
;
}
}
spring-test/src/main/java/org/springframework/test/util/XmlExpectationsHelper.java
浏览文件 @
2a52decb
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -16,11 +16,8 @@
package
org.springframework.test.util
;
import
static
org
.
springframework
.
test
.
util
.
MatcherAssertionErrors
.
assertThat
;
import
java.io.StringReader
;
import
java.util.Map
;
import
javax.xml.parsers.DocumentBuilder
;
import
javax.xml.parsers.DocumentBuilderFactory
;
import
javax.xml.transform.Source
;
...
...
@@ -29,11 +26,12 @@ import javax.xml.transform.dom.DOMSource;
import
org.custommonkey.xmlunit.Diff
;
import
org.custommonkey.xmlunit.XMLUnit
;
import
org.hamcrest.Matcher
;
import
org.springframework.test.web.servlet.result.MockMvcResultMatchers
;
import
org.w3c.dom.Document
;
import
org.w3c.dom.Node
;
import
org.xml.sax.InputSource
;
import
static
org
.
springframework
.
test
.
util
.
MatcherAssertionErrors
.*;
/**
* A helper class for assertions on XML content.
*
...
...
@@ -73,15 +71,12 @@ public class XmlExpectationsHelper {
* Parse the expected and actual content strings as XML and assert that the
* two are "similar" -- i.e. they contain the same elements and attributes
* regardless of order.
*
* <p>Use of this method assumes the
* <a href="http://xmlunit.sourceforge.net/">XMLUnit<a/> library is available.
*
* @param expected the expected XML content
* @param actual the actual XML content
*
* @see MockMvcResultMatchers#xpath(String, Object...)
* @see MockMvcResultMatchers#xpath(String, Map, Object...)
* @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Object...)
* @see org.springframework.test.web.servlet.result.MockMvcResultMatchers#xpath(String, Map, Object...)
*/
public
void
assertXmlEqual
(
String
expected
,
String
actual
)
throws
Exception
{
...
...
spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java
浏览文件 @
2a52decb
/*
* Copyright 2002-201
1
the original author or authors.
* Copyright 2002-201
3
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -16,6 +16,10 @@
package
org.springframework.transaction.config
;
/**
* @author Chris Beams
* @since 3.1
*/
public
abstract
class
TransactionManagementConfigUtils
{
/**
...
...
spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
浏览文件 @
2a52decb
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -32,6 +32,9 @@ import org.springframework.util.ClassUtils;
*/
public
class
AllEncompassingFormHttpMessageConverter
extends
FormHttpMessageConverter
{
private
static
final
boolean
jaxb2Present
=
ClassUtils
.
isPresent
(
"javax.xml.bind.Binder"
,
AllEncompassingFormHttpMessageConverter
.
class
.
getClassLoader
());
private
static
final
boolean
jackson2Present
=
ClassUtils
.
isPresent
(
"com.fasterxml.jackson.databind.ObjectMapper"
,
AllEncompassingFormHttpMessageConverter
.
class
.
getClassLoader
())
&&
ClassUtils
.
isPresent
(
"com.fasterxml.jackson.core.JsonGenerator"
,
AllEncompassingFormHttpMessageConverter
.
class
.
getClassLoader
());
...
...
@@ -40,9 +43,6 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
ClassUtils
.
isPresent
(
"org.codehaus.jackson.map.ObjectMapper"
,
AllEncompassingFormHttpMessageConverter
.
class
.
getClassLoader
())
&&
ClassUtils
.
isPresent
(
"org.codehaus.jackson.JsonGenerator"
,
AllEncompassingFormHttpMessageConverter
.
class
.
getClassLoader
());
private
static
final
boolean
jaxb2Present
=
ClassUtils
.
isPresent
(
"javax.xml.bind.Binder"
,
AllEncompassingFormHttpMessageConverter
.
class
.
getClassLoader
());
@SuppressWarnings
(
"deprecation"
)
public
AllEncompassingFormHttpMessageConverter
()
{
...
...
spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java
浏览文件 @
2a52decb
/*
* Copyright 2002-201
2
the original author or authors.
* Copyright 2002-201
3
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -19,7 +19,6 @@ package org.springframework.http.converter.xml;
import
javax.xml.transform.Source
;
import
org.springframework.http.converter.FormHttpMessageConverter
;
import
org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter
;
/**
* Extension of {@link org.springframework.http.converter.FormHttpMessageConverter},
...
...
@@ -27,7 +26,8 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage
*
* @author Juergen Hoeller
* @since 3.0.3
* @deprecated in favor of {@link AllEncompassingFormHttpMessageConverter}
* @deprecated in favor of
* {@link org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter}
*/
@Deprecated
public
class
XmlAwareFormHttpMessageConverter
extends
FormHttpMessageConverter
{
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java
浏览文件 @
2a52decb
...
...
@@ -28,7 +28,6 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
import
org.springframework.web.HttpSessionRequiredException
;
import
org.springframework.web.context.request.WebRequest
;
import
org.springframework.web.context.support.WebApplicationObjectSupport
;
import
org.springframework.web.servlet.mvc.LastModified
;
/**
* Convenient superclass for any kind of web content generator,
...
...
@@ -204,7 +203,7 @@ public abstract class WebContentGenerator extends WebApplicationObjectSupport {
* programmatically do a lastModified calculation as described in
* {@link WebRequest#checkNotModified(long)}. Default is "false",
* effectively relying on whether the handler implements
* {@link LastModified} or not.
* {@link
org.springframework.web.servlet.mvc.
LastModified} or not.
*/
public
void
setAlwaysMustRevalidate
(
boolean
mustRevalidate
)
{
this
.
alwaysMustRevalidate
=
mustRevalidate
;
...
...
spring-webmvc/src/main/resources/META-INF/spring.handlers
浏览文件 @
2a52decb
http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler
\ No newline at end of file
http\://www.springframework.org/schema/mvc=org.springframework.web.servlet.config.MvcNamespaceHandler
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录