From 15e9fe638c631c8c75d3499a083c103ddef594a8 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 4 Jan 2013 11:38:58 +0100 Subject: [PATCH] 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 --- .../jdbc/support/custom-error-codes.xml | 24 ------------ .../jdbc/support/test-error-codes.xml | 14 ------- .../jdbc/support/wildcard-error-codes.xml | 38 ------------------- .../orm/hibernate3/filterDefinitions.xml | 30 --------------- .../orm/hibernate3/typeDefinitions.xml | 32 ---------------- .../springframework/orm/jdo/test.properties | 1 - .../web/context/WEB-INF/empty-servlet.xml | 12 ------ .../web/context/WEB-INF/sessionContext.xml | 16 -------- .../web/servlet/complexviews.properties | 3 -- 9 files changed, 170 deletions(-) delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml delete mode 100644 spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml delete mode 100644 spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml delete mode 100644 spring-orm/src/test/java/org/springframework/orm/jdo/test.properties delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml b/spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml deleted file mode 100644 index a2aa189832..0000000000 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - 1,2 - 1,1400,1722 - - - - 999 - - org.springframework.jdbc.support.CustomErrorCodeException - - - - - - - diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml b/spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml deleted file mode 100644 index dd3fc33004..0000000000 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - 1,2 - 1,1400,1722 - - - diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml b/spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml deleted file mode 100644 index b44c0a9c1b..0000000000 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - 1,2,942 - 1,1400,1722 - - - - *DB0 - -204,1,2 - 3,4 - - - - DB1* - -204,1,2 - 3,4 - - - - *DB2* - -204,1,2 - 3,4 - - - - *DB3* - -204,1,2 - 3,4 - - - diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml b/spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml deleted file mode 100644 index 96b19990ac..0000000000 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - string - long - - - - - - - - integer - - - - - - - - diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml b/spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml deleted file mode 100644 index bd12f319b7..0000000000 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - value1 - othervalue - - - - - - - - - myvalue - - - - - - - - diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/test.properties b/spring-orm/src/test/java/org/springframework/orm/jdo/test.properties deleted file mode 100644 index cd4acea927..0000000000 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/test.properties +++ /dev/null @@ -1 +0,0 @@ -myKey=myValue diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml deleted file mode 100644 index b49584e11d..0000000000 --- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml deleted file mode 100644 index eb7bf0f6ea..0000000000 --- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties b/spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties deleted file mode 100644 index 6917be2162..0000000000 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties +++ /dev/null @@ -1,3 +0,0 @@ -form.(class)=org.springframework.web.servlet.view.InternalResourceView -form.requestContextAttribute=rc -form.url=myform.jsp