From a1bf666b542c0b0e44540c8fa7b6565b3ea9b35c Mon Sep 17 00:00:00 2001 From: Rachel Walker Date: Thu, 29 Nov 2012 11:46:51 -0800 Subject: [PATCH] Moved to Maven layout --- .classpath | 21 - .gitignore | 7 + .idea/.name | 2 +- .idea/ant.xml | 7 - .idea/artifacts/SpringMVC.xml | 27 - .idea/artifacts/SpringMVC_war.xml | 8 - .idea/artifacts/SpringMVC_war_exploded.xml | 27 - .idea/encodings.xml | 4 +- .idea/misc.xml | 41 +- .idea/modules.xml | 4 +- .idea/vcs.xml | 2 +- .idea/workspace.xml | 490 ++++----- .project | 26 - .settings/org.eclipse.jdt.core.prefs | 5 - .settings/org.eclipse.wst.common.component | 42 - ....eclipse.wst.common.project.facet.core.xml | 6 - .springBeans | 14 - SpringMVC/.classpath | 21 - SpringMVC/.idea/.name | 1 - SpringMVC/.idea/ant.xml | 7 - SpringMVC/.idea/artifacts/SpringMVC.xml | 27 - SpringMVC/.idea/codeStyleSettings.xml | 13 - SpringMVC/.idea/compiler.xml | 25 - .../.idea/copyright/profiles_settings.xml | 5 - SpringMVC/.idea/encodings.xml | 5 - SpringMVC/.idea/gradle.xml | 7 - .../Maven__aopalliance_aopalliance_1_0.xml | 13 - ..._commons_logging_commons_logging_1_1_1.xml | 13 - .../Maven__javax_servlet_servlet_api_2_5.xml | 13 - ...ringframework_spring_aop_3_1_1_RELEASE.xml | 13 - ...ringframework_spring_asm_3_1_1_RELEASE.xml | 13 - ...ngframework_spring_beans_3_1_1_RELEASE.xml | 13 - ...framework_spring_context_3_1_1_RELEASE.xml | 13 - ...k_spring_context_support_3_1_1_RELEASE.xml | 13 - ...ingframework_spring_core_3_1_1_RELEASE.xml | 13 - ...mework_spring_expression_3_1_1_RELEASE.xml | 13 - ...ringframework_spring_web_3_1_1_RELEASE.xml | 13 - ...gframework_spring_webmvc_3_1_1_RELEASE.xml | 13 - SpringMVC/.idea/misc.xml | 23 - SpringMVC/.idea/modules.xml | 9 - SpringMVC/.idea/scopes/scope_settings.xml | 5 - SpringMVC/.idea/uiDesigner.xml | 125 --- SpringMVC/.idea/vcs.xml | 7 - SpringMVC/.idea/workspace.xml | 951 ------------------ SpringMVC/.project | 26 - .../.settings/org.eclipse.jdt.core.prefs | 5 - .../org.eclipse.wst.common.component | 42 - ....eclipse.wst.common.project.facet.core.xml | 6 - SpringMVC/.springBeans | 14 - SpringMVC/SpringMVC.iml | 41 - SpringMVC/pom.xml | 57 -- .../common/controller/HelloController.java | 22 - SpringMVC/src/resources/error.template | 1 - .../common/annotation/ExceptionHandler.class | Bin 708 -> 0 bytes .../common/controller/HelloController.class | Bin 1116 -> 0 bytes .../common/exception/AnnotationHandler.class | Bin 2937 -> 0 bytes .../common/exception/CustomException.class | Bin 666 -> 0 bytes .../MyNegativeArraySizeException.class | Bin 657 -> 0 bytes SpringMVC/target/classes/error.json.template | 14 - SpringMVC/target/classes/error.template | 1 - .../common/annotation/ExceptionHandler.class | Bin 708 -> 0 bytes .../common/controller/HelloController.class | Bin 1116 -> 0 bytes .../common/exception/AnnotationHandler.class | Bin 2937 -> 0 bytes .../common/exception/CustomException.class | Bin 666 -> 0 bytes .../MyNegativeArraySizeException.class | Bin 657 -> 0 bytes .../web/WEB-INF/classes/error.json.template | 14 - .../target/web/WEB-INF/classes/error.template | 1 - .../web/WEB-INF/lib/aopalliance-1.0.jar | Bin 4467 -> 0 bytes .../web/WEB-INF/lib/commons-logging-1.1.1.jar | Bin 60686 -> 0 bytes .../WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar | Bin 331471 -> 0 bytes .../WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar | Bin 53081 -> 0 bytes .../lib/spring-beans-3.1.1.RELEASE.jar | Bin 589824 -> 0 bytes .../lib/spring-context-3.1.1.RELEASE.jar | Bin 831068 -> 0 bytes .../spring-context-support-3.1.1.RELEASE.jar | Bin 107225 -> 0 bytes .../WEB-INF/lib/spring-core-3.1.1.RELEASE.jar | Bin 449324 -> 0 bytes .../lib/spring-expression-3.1.1.RELEASE.jar | Bin 176311 -> 0 bytes .../WEB-INF/lib/spring-web-3.1.1.RELEASE.jar | Bin 544291 -> 0 bytes .../lib/spring-webmvc-3.1.1.RELEASE.jar | Bin 573701 -> 0 bytes .../web/WEB-INF/mvc-dispatcher-servlet.xml | 25 - SpringMVC/target/web/WEB-INF/pages/hello.jsp | 5 - SpringMVC/target/web/WEB-INF/web.xml | 28 - exception-handler/pom.xml | 314 ++++++ .../common/annotation}/AnnotationHandler.java | 12 +- .../common/annotation/ExceptionHandler.java | 0 .../annotation/AnnotationHandlerTest.java | 13 + pom.xml | 28 + sample/pom.xml | 57 ++ .../common/controller/HelloController.java | 32 + .../common/exception/CustomException.java | 6 +- .../MyNegativeArraySizeException.java | 2 +- sample/src/main/resources/error.template | 1 + .../webapp/WEB-INF/mvc-dispatcher-servlet.xml | 0 .../src/main}/webapp/WEB-INF/pages/hello.jsp | 0 .../src/main}/webapp/WEB-INF/web.xml | 0 94 files changed, 766 insertions(+), 2121 deletions(-) delete mode 100755 .classpath create mode 100644 .gitignore delete mode 100644 .idea/ant.xml delete mode 100644 .idea/artifacts/SpringMVC.xml delete mode 100644 .idea/artifacts/SpringMVC_war.xml delete mode 100644 .idea/artifacts/SpringMVC_war_exploded.xml delete mode 100755 .project delete mode 100755 .settings/org.eclipse.jdt.core.prefs delete mode 100755 .settings/org.eclipse.wst.common.component delete mode 100755 .settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100755 .springBeans delete mode 100755 SpringMVC/.classpath delete mode 100644 SpringMVC/.idea/.name delete mode 100644 SpringMVC/.idea/ant.xml delete mode 100644 SpringMVC/.idea/artifacts/SpringMVC.xml delete mode 100644 SpringMVC/.idea/codeStyleSettings.xml delete mode 100644 SpringMVC/.idea/compiler.xml delete mode 100644 SpringMVC/.idea/copyright/profiles_settings.xml delete mode 100644 SpringMVC/.idea/encodings.xml delete mode 100644 SpringMVC/.idea/gradle.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_aop_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_asm_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_beans_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_context_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_context_support_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_core_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_expression_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_web_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/libraries/Maven__org_springframework_spring_webmvc_3_1_1_RELEASE.xml delete mode 100644 SpringMVC/.idea/misc.xml delete mode 100644 SpringMVC/.idea/modules.xml delete mode 100644 SpringMVC/.idea/scopes/scope_settings.xml delete mode 100644 SpringMVC/.idea/uiDesigner.xml delete mode 100644 SpringMVC/.idea/vcs.xml delete mode 100644 SpringMVC/.idea/workspace.xml delete mode 100755 SpringMVC/.project delete mode 100755 SpringMVC/.settings/org.eclipse.jdt.core.prefs delete mode 100755 SpringMVC/.settings/org.eclipse.wst.common.component delete mode 100755 SpringMVC/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100755 SpringMVC/.springBeans delete mode 100644 SpringMVC/SpringMVC.iml delete mode 100755 SpringMVC/pom.xml delete mode 100755 SpringMVC/src/java/com/raychatter/common/controller/HelloController.java delete mode 100644 SpringMVC/src/resources/error.template delete mode 100644 SpringMVC/target/classes/com/raychatter/common/annotation/ExceptionHandler.class delete mode 100644 SpringMVC/target/classes/com/raychatter/common/controller/HelloController.class delete mode 100644 SpringMVC/target/classes/com/raychatter/common/exception/AnnotationHandler.class delete mode 100644 SpringMVC/target/classes/com/raychatter/common/exception/CustomException.class delete mode 100644 SpringMVC/target/classes/com/raychatter/common/exception/MyNegativeArraySizeException.class delete mode 100644 SpringMVC/target/classes/error.json.template delete mode 100644 SpringMVC/target/classes/error.template delete mode 100644 SpringMVC/target/web/WEB-INF/classes/com/raychatter/common/annotation/ExceptionHandler.class delete mode 100644 SpringMVC/target/web/WEB-INF/classes/com/raychatter/common/controller/HelloController.class delete mode 100644 SpringMVC/target/web/WEB-INF/classes/com/raychatter/common/exception/AnnotationHandler.class delete mode 100644 SpringMVC/target/web/WEB-INF/classes/com/raychatter/common/exception/CustomException.class delete mode 100644 SpringMVC/target/web/WEB-INF/classes/com/raychatter/common/exception/MyNegativeArraySizeException.class delete mode 100644 SpringMVC/target/web/WEB-INF/classes/error.json.template delete mode 100644 SpringMVC/target/web/WEB-INF/classes/error.template delete mode 100644 SpringMVC/target/web/WEB-INF/lib/aopalliance-1.0.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/commons-logging-1.1.1.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-aop-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-asm-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-beans-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-context-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-context-support-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-core-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-expression-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-web-3.1.1.RELEASE.jar delete mode 100644 SpringMVC/target/web/WEB-INF/lib/spring-webmvc-3.1.1.RELEASE.jar delete mode 100755 SpringMVC/target/web/WEB-INF/mvc-dispatcher-servlet.xml delete mode 100755 SpringMVC/target/web/WEB-INF/pages/hello.jsp delete mode 100755 SpringMVC/target/web/WEB-INF/web.xml create mode 100644 exception-handler/pom.xml rename {SpringMVC/src/java/com/raychatter/common/exception => exception-handler/src/main/java/com/raychatter/common/annotation}/AnnotationHandler.java (83%) rename {SpringMVC/src => exception-handler/src/main}/java/com/raychatter/common/annotation/ExceptionHandler.java (100%) create mode 100644 exception-handler/src/test/java/com/raychatter/common/annotation/AnnotationHandlerTest.java create mode 100644 pom.xml create mode 100755 sample/pom.xml create mode 100755 sample/src/main/java/com/raychatter/common/controller/HelloController.java rename {SpringMVC/src => sample/src/main}/java/com/raychatter/common/exception/CustomException.java (57%) rename {SpringMVC/src => sample/src/main}/java/com/raychatter/common/exception/MyNegativeArraySizeException.java (75%) create mode 100644 sample/src/main/resources/error.template rename {SpringMVC/src => sample/src/main}/webapp/WEB-INF/mvc-dispatcher-servlet.xml (100%) rename {SpringMVC/src => sample/src/main}/webapp/WEB-INF/pages/hello.jsp (100%) rename {SpringMVC/src => sample/src/main}/webapp/WEB-INF/web.xml (100%) diff --git a/.classpath b/.classpath deleted file mode 100755 index 5af0102..0000000 --- a/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d171129 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +*.jar +target +out +*.class +.DS_Store +.idea +*.iml diff --git a/.idea/.name b/.idea/.name index 651d87a..cfd2f7a 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -annotationSpike \ No newline at end of file +spring-restful-exception-handler-parent \ No newline at end of file diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index 2581ca3..0000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.idea/artifacts/SpringMVC.xml b/.idea/artifacts/SpringMVC.xml deleted file mode 100644 index 1fbaee8..0000000 --- a/.idea/artifacts/SpringMVC.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - $PROJECT_DIR$/target/web - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/SpringMVC_war.xml b/.idea/artifacts/SpringMVC_war.xml deleted file mode 100644 index 204a2fd..0000000 --- a/.idea/artifacts/SpringMVC_war.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/target - - - - - \ No newline at end of file diff --git a/.idea/artifacts/SpringMVC_war_exploded.xml b/.idea/artifacts/SpringMVC_war_exploded.xml deleted file mode 100644 index 7faff29..0000000 --- a/.idea/artifacts/SpringMVC_war_exploded.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - $PROJECT_DIR$/target/SpringMVC - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index e206d70..10d3efb 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,5 +1,7 @@ - + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 90fec2a..a99a3c2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,9 +4,9 @@ - + - +