tchekai704
/
src-spring-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Remove duplicate test resources 

The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.

This change was prompted by associated Eclipse warnings, which have now
been quelled.

Issue: SPR-9431
pull/213/head
Chris Beams 12 years ago
parent
51b307681a
commit
15e9fe638c
9 changed files with 0 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml
  2. 14
      spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml
  3. 38
      spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml
  4. 30
      spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml
  5. 32
      spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml
  6. 1
      spring-orm/src/test/java/org/springframework/orm/jdo/test.properties
  7. 12
      spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml
  8. 16
      spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
  9. 3
      spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties

24
spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml
Unescape View File

@ -1,24 +0,0 @@ @@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<!--
Whacky error codes for testing
-->
<bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="badSqlGrammarCodes"><value>1,2</value></property>
<property name="dataIntegrityViolationCodes"><value>1,1400,1722</value></property>
<property name="customTranslations">
<list>
<bean class="org.springframework.jdbc.support.CustomSQLErrorCodesTranslation">
<property name="errorCodes"><value>999</value></property>
<property name="exceptionClass">
<value>org.springframework.jdbc.support.CustomErrorCodeException</value>
</property>
</bean>
</list>
</property>
</bean>
</beans>

14
spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml
Unescape View File

@ -1,14 +0,0 @@ @@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<!--
Whacky error codes for testing
-->
<bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="badSqlGrammarCodes"><value>1,2</value></property>
<property name="dataIntegrityViolationCodes"><value>1,1400,1722</value></property>
</bean>
</beans>

38
spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml
Unescape View File

@ -1,38 +0,0 @@ @@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<!--
Whacky error codes for testing
-->
<bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="badSqlGrammarCodes"><value>1,2,942</value></property>
<property name="dataIntegrityViolationCodes"><value>1,1400,1722</value></property>
</bean>
<bean id="DB0" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="databaseProductName"><value>*DB0</value></property>
<property name="badSqlGrammarCodes"><value>-204,1,2</value></property>
<property name="dataIntegrityViolationCodes"><value>3,4</value></property>
</bean>
<bean id="DB1" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="databaseProductName"><value>DB1*</value></property>
<property name="badSqlGrammarCodes"><value>-204,1,2</value></property>
<property name="dataIntegrityViolationCodes"><value>3,4</value></property>
</bean>
<bean id="DB2" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="databaseProductName"><value>*DB2*</value></property>
<property name="badSqlGrammarCodes"><value>-204,1,2</value></property>
<property name="dataIntegrityViolationCodes"><value>3,4</value></property>
</bean>
<bean id="DB3" class="org.springframework.jdbc.support.SQLErrorCodes">
<property name="databaseProductName"><value>*DB3*</value></property>
<property name="badSqlGrammarCodes"><value>-204,1,2</value></property>
<property name="dataIntegrityViolationCodes"><value>3,4</value></property>
</bean>
</beans>

30
spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml
Unescape View File

@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBeanTests$FilterTestLocalSessionFactoryBean">
<property name="filterDefinitions">
<list>
<bean class="org.springframework.orm.hibernate3.FilterDefinitionFactoryBean">
<property name="filterName" value="filter1"/>
<property name="parameterTypes">
<props>
<prop key="param1">string</prop>
<prop key="otherParam">long</prop>
</props>
</property>
<property name="defaultFilterCondition" value="someCondition"/>
</bean>
<bean id="filter2" class="org.springframework.orm.hibernate3.FilterDefinitionFactoryBean">
<property name="parameterTypes">
<props>
<prop key="myParam">integer</prop>
</props>
</property>
</bean>
</list>
</property>
</bean>
</beans>

32
spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml
Unescape View File

@ -1,32 +0,0 @@ @@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBeanTests$TypeTestLocalSessionFactoryBean">
<property name="typeDefinitions">
<list>
<bean class="org.springframework.orm.hibernate3.TypeDefinitionBean">
<property name="typeName" value="type1"/>
<property name="typeClass" value="mypackage.MyTypeClass"/>
<property name="parameters">
<props>
<prop key="param1">value1</prop>
<prop key="otherParam">othervalue</prop>
</props>
</property>
</bean>
<bean id="type2" class="org.springframework.orm.hibernate3.TypeDefinitionBean">
<property name="typeName" value="type2"/>
<property name="typeClass" value="mypackage.MyOtherTypeClass"/>
<property name="parameters">
<props>
<prop key="myParam">myvalue</prop>
</props>
</property>
</bean>
</list>
</property>
</bean>
</beans>

1
spring-orm/src/test/java/org/springframework/orm/jdo/test.properties
Unescape View File

@ -1 +0,0 @@ @@ -1 +0,0 @@
myKey=myValue

12
spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml
Unescape View File

@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
<bean id="servletContextAwareBean" class="org.springframework.web.context.ServletContextAwareBean"/>
<bean id="servletConfigAwareBean" class="org.springframework.web.context.ServletConfigAwareBean"/>
</beans>

16
spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
Unescape View File

@ -1,16 +0,0 @@ @@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<bean id="rob" class="org.springframework.tests.sample.beans.TestBean">
<property name="name" value="dummy"/>
<property name="age" value="-1"/>
</bean>
<bean id="rodProto" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name" value="dummy"/>
<property name="age" value="-1"/>
</bean>
</beans>

3
spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties
Unescape View File

@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
form.(class)=org.springframework.web.servlet.view.InternalResourceView
form.requestContextAttribute=rc
form.url=myform.jsp
Write Preview
Loading…
Cancel
Save