Skip to content

Commit 41c4059

Browse files
cbeamscbeams
committed
Convert CRLF=>LF on files missed earlier
Complete pass with `dos2unix` found additional files missed on earlier related commit. Issue: SPR-5608
1 parent f1168ea commit 41c4059

File tree

69 files changed

+8630
-8630
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+8630
-8630
lines changed

‎build-spring-framework/build.iml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<module relativePaths="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
4-
<exclude-output />
5-
<content url="file://$MODULE_DIR$">
6-
<excludeFolder url="file://$MODULE_DIR$/target" />
7-
</content>
8-
<orderEntry type="inheritedJdk" />
9-
<orderEntry type="sourceFolder" forTests="false" />
10-
</component>
11-
</module>
12-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module relativePaths="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<excludeFolder url="file://$MODULE_DIR$/target" />
7+
</content>
8+
<orderEntry type="inheritedJdk" />
9+
<orderEntry type="sourceFolder" forTests="false" />
10+
</component>
11+
</module>
12+

‎build-spring-framework/build.xml

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="build-spring-framework" default="precommit">
3-
4-
<path id="unit.test.bundles">
5-
<pathelement location="../org.springframework.instrument"/>
6-
<pathelement location="../org.springframework.instrument.tomcat"/>
7-
<pathelement location="../org.springframework.core"/>
8-
<pathelement location="../org.springframework.expression"/>
9-
<pathelement location="../org.springframework.beans"/>
10-
<pathelement location="../org.springframework.aop"/>
11-
<pathelement location="../org.springframework.context"/>
12-
<pathelement location="../org.springframework.transaction"/>
13-
<pathelement location="../org.springframework.oxm"/>
14-
<pathelement location="../org.springframework.jms"/>
15-
<pathelement location="../org.springframework.jdbc"/>
16-
<pathelement location="../org.springframework.web"/>
17-
<pathelement location="../org.springframework.orm"/>
18-
<pathelement location="../org.springframework.context.support"/>
19-
<pathelement location="../org.springframework.aspects"/>
20-
<pathelement location="../org.springframework.web.servlet"/>
21-
<pathelement location="../org.springframework.web.portlet"/>
22-
<pathelement location="../org.springframework.test"/>
23-
<pathelement location="../org.springframework.web.struts"/>
24-
</path>
25-
26-
<path id="bundles">
27-
<pathelement location="../org.springframework.spring-parent"/>
28-
<pathelement location="../org.springframework.asm"/>
29-
<path refid="unit.test.bundles" />
30-
<pathelement location="../org.springframework.integration-tests"/>
31-
<pathelement location="../org.springframework.spring-library"/>
32-
</path>
33-
34-
<property file="${basedir}/../build.properties"/>
35-
<import file="${basedir}/package-top-level.xml"/>
36-
<import file="${basedir}/publish-top-level.xml"/>
37-
<import file="${basedir}/publish-documentation.xml"/>
38-
<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
39-
40-
<target name="precommit" depends="clean, clean-integration, test"/>
41-
42-
<presetdef name="javadoc.links">
43-
<javadoc>
44-
<link href="http://download.oracle.com/javase/6/docs/api"/>
45-
<link href="http://download.oracle.com/javaee/6/api"/>
46-
<link href="http://aopalliance.sourceforge.net/doc"/>
47-
<!-- Caucho Burlap/Hessian -->
48-
<link href="http://cglib.sourceforge.net/apidocs"/>
49-
<!-- EasyMock -->
50-
<link href="http://ehcache.sourceforge.net/apidocs"/>
51-
<link href="http://freemarker.sourceforge.net/docs/api/"/>
52-
<link href="http://docs.jboss.org/hibernate/core/3.6/javadocs/"/>
53-
<!-- iBATIS -->
54-
<!-- iText -->
55-
<!-- Commons Attributes -->
56-
<link href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/"/>
57-
<link href="http://jakarta.apache.org/commons/dbcp/apidocs/"/>
58-
<link href="http://jakarta.apache.org/commons/fileupload/apidocs/"/>
59-
<link href="http://jakarta.apache.org/commons/httpclient/apidocs/"/>
60-
<link href="http://jakarta.apache.org/commons/logging/apidocs/"/>
61-
<link href="http://jakarta.apache.org/commons/pool/apidocs/"/>
62-
<!-- JasperReports -->
63-
<!-- JDO -->
64-
<!-- JMX -->
65-
<!-- JOTM -->
66-
<!-- JPA -->
67-
<!-- JSF -->
68-
<link href="http://junit.sourceforge.net/javadoc_40/"/>
69-
<link href="http://logging.apache.org/log4j/docs/api/"/>
70-
<link href="http://jakarta.apache.org/regexp/apidocs/"/>
71-
<link href="http://jakarta.apache.org/poi/apidocs/"/>
72-
<link href="http://portals.apache.org/pluto/portlet-1.0-apidocs/"/>
73-
<link href="http://www.quartz-scheduler.org/api/2.1.0/"/>
74-
<link href="http://struts.apache.org/struts-doc-1.2.9/api/"/>
75-
<link href="http://java.sun.com/javase/6/docs/jre/api/net/httpserver/spec/"/>
76-
<link href="http://tiles.apache.org/framework/apidocs/"/>
77-
<link href="http://velocity.apache.org/engine/devel/apidocs/"/>
78-
</javadoc>
79-
</presetdef>
80-
81-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project name="build-spring-framework" default="precommit">
3+
4+
<path id="unit.test.bundles">
5+
<pathelement location="../org.springframework.instrument"/>
6+
<pathelement location="../org.springframework.instrument.tomcat"/>
7+
<pathelement location="../org.springframework.core"/>
8+
<pathelement location="../org.springframework.expression"/>
9+
<pathelement location="../org.springframework.beans"/>
10+
<pathelement location="../org.springframework.aop"/>
11+
<pathelement location="../org.springframework.context"/>
12+
<pathelement location="../org.springframework.transaction"/>
13+
<pathelement location="../org.springframework.oxm"/>
14+
<pathelement location="../org.springframework.jms"/>
15+
<pathelement location="../org.springframework.jdbc"/>
16+
<pathelement location="../org.springframework.web"/>
17+
<pathelement location="../org.springframework.orm"/>
18+
<pathelement location="../org.springframework.context.support"/>
19+
<pathelement location="../org.springframework.aspects"/>
20+
<pathelement location="../org.springframework.web.servlet"/>
21+
<pathelement location="../org.springframework.web.portlet"/>
22+
<pathelement location="../org.springframework.test"/>
23+
<pathelement location="../org.springframework.web.struts"/>
24+
</path>
25+
26+
<path id="bundles">
27+
<pathelement location="../org.springframework.spring-parent"/>
28+
<pathelement location="../org.springframework.asm"/>
29+
<path refid="unit.test.bundles" />
30+
<pathelement location="../org.springframework.integration-tests"/>
31+
<pathelement location="../org.springframework.spring-library"/>
32+
</path>
33+
34+
<property file="${basedir}/../build.properties"/>
35+
<import file="${basedir}/package-top-level.xml"/>
36+
<import file="${basedir}/publish-top-level.xml"/>
37+
<import file="${basedir}/publish-documentation.xml"/>
38+
<import file="${basedir}/../spring-build/multi-bundle/default.xml"/>
39+
40+
<target name="precommit" depends="clean, clean-integration, test"/>
41+
42+
<presetdef name="javadoc.links">
43+
<javadoc>
44+
<link href="http://download.oracle.com/javase/6/docs/api"/>
45+
<link href="http://download.oracle.com/javaee/6/api"/>
46+
<link href="http://aopalliance.sourceforge.net/doc"/>
47+
<!-- Caucho Burlap/Hessian -->
48+
<link href="http://cglib.sourceforge.net/apidocs"/>
49+
<!-- EasyMock -->
50+
<link href="http://ehcache.sourceforge.net/apidocs"/>
51+
<link href="http://freemarker.sourceforge.net/docs/api/"/>
52+
<link href="http://docs.jboss.org/hibernate/core/3.6/javadocs/"/>
53+
<!-- iBATIS -->
54+
<!-- iText -->
55+
<!-- Commons Attributes -->
56+
<link href="http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/"/>
57+
<link href="http://jakarta.apache.org/commons/dbcp/apidocs/"/>
58+
<link href="http://jakarta.apache.org/commons/fileupload/apidocs/"/>
59+
<link href="http://jakarta.apache.org/commons/httpclient/apidocs/"/>
60+
<link href="http://jakarta.apache.org/commons/logging/apidocs/"/>
61+
<link href="http://jakarta.apache.org/commons/pool/apidocs/"/>
62+
<!-- JasperReports -->
63+
<!-- JDO -->
64+
<!-- JMX -->
65+
<!-- JOTM -->
66+
<!-- JPA -->
67+
<!-- JSF -->
68+
<link href="http://junit.sourceforge.net/javadoc_40/"/>
69+
<link href="http://logging.apache.org/log4j/docs/api/"/>
70+
<link href="http://jakarta.apache.org/regexp/apidocs/"/>
71+
<link href="http://jakarta.apache.org/poi/apidocs/"/>
72+
<link href="http://portals.apache.org/pluto/portlet-1.0-apidocs/"/>
73+
<link href="http://www.quartz-scheduler.org/api/2.1.0/"/>
74+
<link href="http://struts.apache.org/struts-doc-1.2.9/api/"/>
75+
<link href="http://java.sun.com/javase/6/docs/jre/api/net/httpserver/spec/"/>
76+
<link href="http://tiles.apache.org/framework/apidocs/"/>
77+
<link href="http://velocity.apache.org/engine/devel/apidocs/"/>
78+
</javadoc>
79+
</presetdef>
80+
81+
</project>

‎org.springframework.aop/.classpath

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" path="src/main/java"/>
4-
<classpathentry kind="src" path="src/main/resources"/>
5-
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6-
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
7-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
8-
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
9-
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
10-
<classpathentry kind="var" path="IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-2.4.0.jar" sourcepath="/IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-sources-2.4.0.jar"/>
11-
<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
12-
<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
13-
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
14-
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-sources-1.3.0.jar"/>
15-
<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
16-
<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.8.RELEASE.jar"/>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/main/resources"/>
5+
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
6+
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
7+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
8+
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
9+
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
10+
<classpathentry kind="var" path="IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-2.4.0.jar" sourcepath="/IVY_CACHE/com.jamonapi/com.springsource.com.jamonapi/2.4.0/com.springsource.com.jamonapi-sources-2.4.0.jar"/>
11+
<classpathentry kind="var" path="IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0/com.springsource.net.sf.cglib-2.2.0.jar" sourcepath="/IVY_CACHE/net.sourceforge.cglib/com.springsource.net.sf.cglib/2.1.3/com.springsource.net.sf.cglib-sources-2.1.3.jar"/>
12+
<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
13+
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
14+
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-1.3.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.pool/1.3.0/com.springsource.org.apache.commons.pool-sources-1.3.0.jar"/>
15+
<classpathentry kind="var" path="IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-1.2.15.jar" sourcepath="/IVY_CACHE/org.apache.log4j/com.springsource.org.apache.log4j/1.2.15/com.springsource.org.apache.log4j-sources-1.2.15.jar"/>
16+
<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-1.6.8.RELEASE.jar" sourcepath="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.8.RELEASE/com.springsource.org.aspectj.weaver-sources-1.6.8.RELEASE.jar"/>
1717
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-2.5.1.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.5.1/com.springsource.org.easymock-sources-2.5.1.jar"/>
18-
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-4.9.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-sources-4.9.0.jar"/>
19-
<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
20-
<classpathentry kind="output" path="target/classes"/>
21-
</classpath>
18+
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-4.9.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.9.0/com.springsource.org.junit-sources-4.9.0.jar"/>
19+
<classpathentry kind="lib" path="/org.springframework.asm/target/artifacts/org.springframework.asm.jar" sourcepath="/org.springframework.asm/target/artifacts/org.springframework.asm-sources.jar"/>
20+
<classpathentry kind="output" path="target/classes"/>
21+
</classpath>

‎org.springframework.aop/aop.iml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<module relativePaths="true" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
4-
<exclude-output />
5-
<content url="file://$MODULE_DIR$">
6-
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
8-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
10-
<excludeFolder url="file://$MODULE_DIR$/target" />
11-
</content>
12-
<orderEntry type="sourceFolder" forTests="false" />
13-
<orderEntry type="inheritedJdk" />
14-
<orderEntry type="module" module-name="beans" />
15-
<orderEntry type="module" module-name="core" />
16-
<orderEntry type="library" name="AOP Alliance" level="project" />
17-
<orderEntry type="library" name="AspectJ" level="project" />
18-
<orderEntry type="library" name="CGLIB" level="project" />
19-
<orderEntry type="library" name="Commons Logging" level="project" />
20-
<orderEntry type="library" name="Commons Pool" level="project" />
21-
<orderEntry type="library" name="EasyMock" level="project" />
22-
<orderEntry type="library" name="Jamon" level="project" />
23-
<orderEntry type="library" name="JUnit" level="project" />
24-
<orderEntry type="library" name="Log4j" level="project" />
25-
</component>
26-
<component name="copyright">
27-
<Base>
28-
<setting name="state" value="2" />
29-
</Base>
30-
</component>
31-
</module>
32-
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module relativePaths="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
10+
<excludeFolder url="file://$MODULE_DIR$/target" />
11+
</content>
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="inheritedJdk" />
14+
<orderEntry type="module" module-name="beans" />
15+
<orderEntry type="module" module-name="core" />
16+
<orderEntry type="library" name="AOP Alliance" level="project" />
17+
<orderEntry type="library" name="AspectJ" level="project" />
18+
<orderEntry type="library" name="CGLIB" level="project" />
19+
<orderEntry type="library" name="Commons Logging" level="project" />
20+
<orderEntry type="library" name="Commons Pool" level="project" />
21+
<orderEntry type="library" name="EasyMock" level="project" />
22+
<orderEntry type="library" name="Jamon" level="project" />
23+
<orderEntry type="library" name="JUnit" level="project" />
24+
<orderEntry type="library" name="Log4j" level="project" />
25+
</component>
26+
<component name="copyright">
27+
<Base>
28+
<setting name="state" value="2" />
29+
</Base>
30+
</component>
31+
</module>
32+

‎org.springframework.aop/src/main/java/overview.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<html>
2-
<body>
3-
<p>
4-
Spring's proxy-based AOP framework.
5-
</p>
6-
</body>
1+
<html>
2+
<body>
3+
<p>
4+
Spring's proxy-based AOP framework.
5+
</p>
6+
</body>
77
</html>

0 commit comments

Comments
 (0)