From 47cc6debbef677a4a348c7929993ecd8a13f61fd Mon Sep 17 00:00:00 2001 From: Jacarri Chan <772929989@qq.com> Date: Sat, 21 Feb 2015 13:58:58 +0800 Subject: [PATCH 1/4] clean project Signed-off-by: Jacarri Chan <772929989@qq.com> --- .gitignore | 4 ++ pom.xml | 32 +++++++++++++++ restjs-spring-mvc/.classpath | 23 ----------- restjs-spring-mvc/.gitignore | 1 + restjs-spring-mvc/.project | 36 ----------------- restjs-spring-mvc/.settings/.jsdtscope | 12 ------ .../.settings/org.eclipse.jdt.core.prefs | 8 ---- .../org.eclipse.wst.common.component | 8 ---- ....eclipse.wst.common.project.facet.core.xml | 9 ----- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - restjs-spring-mvc/pom.xml | 17 ++++++++ .../main/webapp}/META-INF/MANIFEST.MF | 0 .../webapp}/WEB-INF/springmvc-servlet.xml | 0 .../com/hmkcode/controllers/MyController.java | 0 .../WEB-INF/src/com/hmkcode/vo/Person.java | 0 .../main/webapp}/WEB-INF/web.xml | 0 .../main/webapp}/index.html | 0 .../main/webapp}/restjs/app.html | 0 .../main/webapp}/restjs/scripts/main.js | 0 spring-@profile/.classpath | 20 --------- spring-@profile/.gitignore | 1 + spring-@profile/pom.xml | 4 +- spring-core-config/.classpath | 26 ------------ spring-core-config/.gitignore | 1 + spring-custom-event/.classpath | 16 -------- spring-custom-event/.gitignore | 1 + spring-mvc-file-upload/.classpath | 25 ------------ spring-mvc-file-upload/.gitignore | 1 + spring-mvc-file-upload/pom.xml | 17 ++++++++ .../main/webapp}/WEB-INF/rest-servlet.xml | 0 .../hmkcode/controllers/RestController.java | 0 .../src/com/hmkcode/vo/UploadedFile.java | 0 .../main/webapp}/WEB-INF/web.xml | 0 .../main/webapp}/index.html | 0 spring-mvc-jquery-file-upload/.classpath | 25 ------------ spring-mvc-jquery-file-upload/.gitignore | 1 + .../mvc/controllers/FileController.java | 1 + spring-mvc-json-pdf-xls-excel/.classpath | 37 ----------------- spring-mvc-json-pdf-xls-excel/.gitignore | 1 + spring-mvc-json/.classpath | 24 ----------- spring-mvc-json/.project | 36 ----------------- .../hmkcode/controllers/RestController.class | Bin 1748 -> 0 bytes .../classes/com/hmkcode/vo/Person.class | Bin 808 -> 0 bytes spring-mvc-json/pom.xml | 38 ++++++++++++++---- .../hmkcode/controllers/RestController.java | 0 .../main/java}/com/hmkcode/vo/Person.java | 0 .../main/webapp}/META-INF/MANIFEST.MF | 0 .../main/webapp}/WEB-INF/rest-servlet.xml | 0 .../main/webapp}/WEB-INF/web.xml | 0 .../main/webapp}/index.html | 0 .../.classpath | 22 ---------- .../.gitignore | 1 + spring-mvc-security/.classpath | 25 ------------ spring-mvc-security/.gitignore | 1 + spring-mybatis-junit/.classpath | 29 ------------- spring-mybatis-junit/.gitignore | 1 + spring-mybatis-junit/pom.xml | 5 --- spring-mybatis/.classpath | 32 --------------- spring-mybatis/.gitignore | 1 + spring-mybatis/pom.xml | 5 --- .../hmkcode/spring/mybatis/mapper/Mapper.xml | 2 +- spring-profile/.classpath | 20 --------- spring-profile/.gitignore | 1 + 64 files changed, 116 insertions(+), 456 deletions(-) create mode 100644 .gitignore create mode 100644 pom.xml delete mode 100644 restjs-spring-mvc/.classpath create mode 100644 restjs-spring-mvc/.gitignore delete mode 100644 restjs-spring-mvc/.project delete mode 100644 restjs-spring-mvc/.settings/.jsdtscope delete mode 100644 restjs-spring-mvc/.settings/org.eclipse.jdt.core.prefs delete mode 100644 restjs-spring-mvc/.settings/org.eclipse.wst.common.component delete mode 100644 restjs-spring-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 restjs-spring-mvc/pom.xml rename restjs-spring-mvc/{WebContent => src/main/webapp}/META-INF/MANIFEST.MF (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/WEB-INF/springmvc-servlet.xml (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/WEB-INF/src/com/hmkcode/controllers/MyController.java (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/WEB-INF/src/com/hmkcode/vo/Person.java (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/WEB-INF/web.xml (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/index.html (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/restjs/app.html (100%) rename restjs-spring-mvc/{WebContent => src/main/webapp}/restjs/scripts/main.js (100%) delete mode 100644 spring-@profile/.classpath create mode 100644 spring-@profile/.gitignore delete mode 100644 spring-core-config/.classpath create mode 100644 spring-core-config/.gitignore delete mode 100644 spring-custom-event/.classpath create mode 100644 spring-custom-event/.gitignore delete mode 100644 spring-mvc-file-upload/.classpath create mode 100644 spring-mvc-file-upload/.gitignore create mode 100644 spring-mvc-file-upload/pom.xml rename spring-mvc-file-upload/{WebContent => src/main/webapp}/WEB-INF/rest-servlet.xml (100%) rename spring-mvc-file-upload/{WebContent => src/main/webapp}/WEB-INF/src/com/hmkcode/controllers/RestController.java (100%) rename spring-mvc-file-upload/{WebContent => src/main/webapp}/WEB-INF/src/com/hmkcode/vo/UploadedFile.java (100%) rename spring-mvc-file-upload/{WebContent => src/main/webapp}/WEB-INF/web.xml (100%) rename spring-mvc-file-upload/{WebContent => src/main/webapp}/index.html (100%) delete mode 100644 spring-mvc-jquery-file-upload/.classpath create mode 100644 spring-mvc-jquery-file-upload/.gitignore delete mode 100644 spring-mvc-json-pdf-xls-excel/.classpath create mode 100644 spring-mvc-json-pdf-xls-excel/.gitignore delete mode 100644 spring-mvc-json/.classpath delete mode 100644 spring-mvc-json/.project delete mode 100644 spring-mvc-json/WebContent/WEB-INF/classes/com/hmkcode/controllers/RestController.class delete mode 100644 spring-mvc-json/WebContent/WEB-INF/classes/com/hmkcode/vo/Person.class rename spring-mvc-json/{WebContent/WEB-INF/src => src/main/java}/com/hmkcode/controllers/RestController.java (100%) rename spring-mvc-json/{WebContent/WEB-INF/src => src/main/java}/com/hmkcode/vo/Person.java (100%) rename spring-mvc-json/{WebContent => src/main/webapp}/META-INF/MANIFEST.MF (100%) rename spring-mvc-json/{WebContent => src/main/webapp}/WEB-INF/rest-servlet.xml (100%) rename spring-mvc-json/{WebContent => src/main/webapp}/WEB-INF/web.xml (100%) rename spring-mvc-json/{WebContent => src/main/webapp}/index.html (100%) delete mode 100644 spring-mvc-root-webapplicationcontext/.classpath create mode 100644 spring-mvc-root-webapplicationcontext/.gitignore delete mode 100644 spring-mvc-security/.classpath create mode 100644 spring-mvc-security/.gitignore delete mode 100644 spring-mybatis-junit/.classpath create mode 100644 spring-mybatis-junit/.gitignore delete mode 100644 spring-mybatis/.classpath create mode 100644 spring-mybatis/.gitignore delete mode 100644 spring-profile/.classpath create mode 100644 spring-profile/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39d7c95 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target +.classpath +.project +.settings/ \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..03d156e --- /dev/null +++ b/pom.xml @@ -0,0 +1,32 @@ + + 4.0.0 + + com.hmkcode + spring-framework + 1.0-SNAPSHOT + pom + + spring-profile + http://maven.apache.org + + + UTF-8 + 3.1.0.RELEASE + + + restjs-spring-mvc + spring-@profile + spring-core-config + spring-custom-event + spring-mvc-file-upload + spring-mvc-jquery-file-upload + spring-mvc-json + spring-mvc-json-pdf-xls-excel + spring-mvc-root-webapplicationcontext + spring-mvc-security + spring-mybatis + spring-mybatis-junit + spring-profile + + diff --git a/restjs-spring-mvc/.classpath b/restjs-spring-mvc/.classpath deleted file mode 100644 index 436705f..0000000 --- a/restjs-spring-mvc/.classpath +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/restjs-spring-mvc/.gitignore b/restjs-spring-mvc/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/restjs-spring-mvc/.gitignore @@ -0,0 +1 @@ +/target diff --git a/restjs-spring-mvc/.project b/restjs-spring-mvc/.project deleted file mode 100644 index a7b93ce..0000000 --- a/restjs-spring-mvc/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - restjs-spring-mvc - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/restjs-spring-mvc/.settings/.jsdtscope b/restjs-spring-mvc/.settings/.jsdtscope deleted file mode 100644 index 3a28de0..0000000 --- a/restjs-spring-mvc/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/restjs-spring-mvc/.settings/org.eclipse.jdt.core.prefs b/restjs-spring-mvc/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 1d316da..0000000 --- a/restjs-spring-mvc/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Feb 18 19:57:10 AST 2013 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/restjs-spring-mvc/.settings/org.eclipse.wst.common.component b/restjs-spring-mvc/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 99e4cf0..0000000 --- a/restjs-spring-mvc/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/restjs-spring-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml b/restjs-spring-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index e764322..0000000 --- a/restjs-spring-mvc/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.container b/restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.name b/restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/restjs-spring-mvc/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/restjs-spring-mvc/pom.xml b/restjs-spring-mvc/pom.xml new file mode 100644 index 0000000..4fe69c5 --- /dev/null +++ b/restjs-spring-mvc/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + + com.hmkcode + restjs-spring-mvc + 1.0-SNAPSHOT + war + + spring-profile + http://maven.apache.org + + + UTF-8 + 3.1.0.RELEASE + + diff --git a/restjs-spring-mvc/WebContent/META-INF/MANIFEST.MF b/restjs-spring-mvc/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from restjs-spring-mvc/WebContent/META-INF/MANIFEST.MF rename to restjs-spring-mvc/src/main/webapp/META-INF/MANIFEST.MF diff --git a/restjs-spring-mvc/WebContent/WEB-INF/springmvc-servlet.xml b/restjs-spring-mvc/src/main/webapp/WEB-INF/springmvc-servlet.xml similarity index 100% rename from restjs-spring-mvc/WebContent/WEB-INF/springmvc-servlet.xml rename to restjs-spring-mvc/src/main/webapp/WEB-INF/springmvc-servlet.xml diff --git a/restjs-spring-mvc/WebContent/WEB-INF/src/com/hmkcode/controllers/MyController.java b/restjs-spring-mvc/src/main/webapp/WEB-INF/src/com/hmkcode/controllers/MyController.java similarity index 100% rename from restjs-spring-mvc/WebContent/WEB-INF/src/com/hmkcode/controllers/MyController.java rename to restjs-spring-mvc/src/main/webapp/WEB-INF/src/com/hmkcode/controllers/MyController.java diff --git a/restjs-spring-mvc/WebContent/WEB-INF/src/com/hmkcode/vo/Person.java b/restjs-spring-mvc/src/main/webapp/WEB-INF/src/com/hmkcode/vo/Person.java similarity index 100% rename from restjs-spring-mvc/WebContent/WEB-INF/src/com/hmkcode/vo/Person.java rename to restjs-spring-mvc/src/main/webapp/WEB-INF/src/com/hmkcode/vo/Person.java diff --git a/restjs-spring-mvc/WebContent/WEB-INF/web.xml b/restjs-spring-mvc/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from restjs-spring-mvc/WebContent/WEB-INF/web.xml rename to restjs-spring-mvc/src/main/webapp/WEB-INF/web.xml diff --git a/restjs-spring-mvc/WebContent/index.html b/restjs-spring-mvc/src/main/webapp/index.html similarity index 100% rename from restjs-spring-mvc/WebContent/index.html rename to restjs-spring-mvc/src/main/webapp/index.html diff --git a/restjs-spring-mvc/WebContent/restjs/app.html b/restjs-spring-mvc/src/main/webapp/restjs/app.html similarity index 100% rename from restjs-spring-mvc/WebContent/restjs/app.html rename to restjs-spring-mvc/src/main/webapp/restjs/app.html diff --git a/restjs-spring-mvc/WebContent/restjs/scripts/main.js b/restjs-spring-mvc/src/main/webapp/restjs/scripts/main.js similarity index 100% rename from restjs-spring-mvc/WebContent/restjs/scripts/main.js rename to restjs-spring-mvc/src/main/webapp/restjs/scripts/main.js diff --git a/spring-@profile/.classpath b/spring-@profile/.classpath deleted file mode 100644 index b561aca..0000000 --- a/spring-@profile/.classpath +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-@profile/.gitignore b/spring-@profile/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-@profile/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-@profile/pom.xml b/spring-@profile/pom.xml index a0f51a9..61ca74c 100644 --- a/spring-@profile/pom.xml +++ b/spring-@profile/pom.xml @@ -3,11 +3,11 @@ 4.0.0 com.hmkcode - spring-profile + spring-pprofile 1.0-SNAPSHOT jar - spring-profile + spring-pprofile http://maven.apache.org diff --git a/spring-core-config/.classpath b/spring-core-config/.classpath deleted file mode 100644 index 7242e5b..0000000 --- a/spring-core-config/.classpath +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - -<<<<<<< HEAD - - - - - -======= - - - - - ->>>>>>> updated diff --git a/spring-core-config/.gitignore b/spring-core-config/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-core-config/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-custom-event/.classpath b/spring-custom-event/.classpath deleted file mode 100644 index 81c3ee6..0000000 --- a/spring-custom-event/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-custom-event/.gitignore b/spring-custom-event/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-custom-event/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mvc-file-upload/.classpath b/spring-mvc-file-upload/.classpath deleted file mode 100644 index 9159b22..0000000 --- a/spring-mvc-file-upload/.classpath +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-mvc-file-upload/.gitignore b/spring-mvc-file-upload/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mvc-file-upload/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mvc-file-upload/pom.xml b/spring-mvc-file-upload/pom.xml new file mode 100644 index 0000000..9615fbd --- /dev/null +++ b/spring-mvc-file-upload/pom.xml @@ -0,0 +1,17 @@ + + 4.0.0 + + com.hmkcode + spring-mvc-file-upload + 1.0-SNAPSHOT + war + + spring-profile + http://maven.apache.org + + + UTF-8 + 3.1.0.RELEASE + + diff --git a/spring-mvc-file-upload/WebContent/WEB-INF/rest-servlet.xml b/spring-mvc-file-upload/src/main/webapp/WEB-INF/rest-servlet.xml similarity index 100% rename from spring-mvc-file-upload/WebContent/WEB-INF/rest-servlet.xml rename to spring-mvc-file-upload/src/main/webapp/WEB-INF/rest-servlet.xml diff --git a/spring-mvc-file-upload/WebContent/WEB-INF/src/com/hmkcode/controllers/RestController.java b/spring-mvc-file-upload/src/main/webapp/WEB-INF/src/com/hmkcode/controllers/RestController.java similarity index 100% rename from spring-mvc-file-upload/WebContent/WEB-INF/src/com/hmkcode/controllers/RestController.java rename to spring-mvc-file-upload/src/main/webapp/WEB-INF/src/com/hmkcode/controllers/RestController.java diff --git a/spring-mvc-file-upload/WebContent/WEB-INF/src/com/hmkcode/vo/UploadedFile.java b/spring-mvc-file-upload/src/main/webapp/WEB-INF/src/com/hmkcode/vo/UploadedFile.java similarity index 100% rename from spring-mvc-file-upload/WebContent/WEB-INF/src/com/hmkcode/vo/UploadedFile.java rename to spring-mvc-file-upload/src/main/webapp/WEB-INF/src/com/hmkcode/vo/UploadedFile.java diff --git a/spring-mvc-file-upload/WebContent/WEB-INF/web.xml b/spring-mvc-file-upload/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-mvc-file-upload/WebContent/WEB-INF/web.xml rename to spring-mvc-file-upload/src/main/webapp/WEB-INF/web.xml diff --git a/spring-mvc-file-upload/WebContent/index.html b/spring-mvc-file-upload/src/main/webapp/index.html similarity index 100% rename from spring-mvc-file-upload/WebContent/index.html rename to spring-mvc-file-upload/src/main/webapp/index.html diff --git a/spring-mvc-jquery-file-upload/.classpath b/spring-mvc-jquery-file-upload/.classpath deleted file mode 100644 index ca4fb1b..0000000 --- a/spring-mvc-jquery-file-upload/.classpath +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-mvc-jquery-file-upload/.gitignore b/spring-mvc-jquery-file-upload/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mvc-jquery-file-upload/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mvc-jquery-file-upload/src/main/java/com/hmkcode/spring/mvc/controllers/FileController.java b/spring-mvc-jquery-file-upload/src/main/java/com/hmkcode/spring/mvc/controllers/FileController.java index 4cfe826..d21596f 100644 --- a/spring-mvc-jquery-file-upload/src/main/java/com/hmkcode/spring/mvc/controllers/FileController.java +++ b/spring-mvc-jquery-file-upload/src/main/java/com/hmkcode/spring/mvc/controllers/FileController.java @@ -1,5 +1,6 @@ package com.hmkcode.spring.mvc.controllers; +import java.io.FileOutputStream; import java.io.IOException; import java.util.Iterator; import java.util.LinkedList; diff --git a/spring-mvc-json-pdf-xls-excel/.classpath b/spring-mvc-json-pdf-xls-excel/.classpath deleted file mode 100644 index fd33988..0000000 --- a/spring-mvc-json-pdf-xls-excel/.classpath +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-mvc-json-pdf-xls-excel/.gitignore b/spring-mvc-json-pdf-xls-excel/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mvc-json-pdf-xls-excel/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mvc-json/.classpath b/spring-mvc-json/.classpath deleted file mode 100644 index 2a26dc0..0000000 --- a/spring-mvc-json/.classpath +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-mvc-json/.project b/spring-mvc-json/.project deleted file mode 100644 index 1876618..0000000 --- a/spring-mvc-json/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - spring-mvc-json - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/spring-mvc-json/WebContent/WEB-INF/classes/com/hmkcode/controllers/RestController.class b/spring-mvc-json/WebContent/WEB-INF/classes/com/hmkcode/controllers/RestController.class deleted file mode 100644 index 072392938be39530c699ba12bda21369d41e4338..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1748 zcmb7EZFdtz7`+qHZW_0MX-h>>15!-d!XnCx1i`kvMbj6X8tw6TJey=l7dAU_cT()X zQa_{~ImaKskMekDwx;G#JoG~*J1@_D?sM-v^YZUM{{nCg+YT}Ums+ap?R1~DR9kv2 z73o-op^Ou6Qzm+4ICqd0IQ`V$^}W!KI^KHoscdP1@jF2j=(_?ZO67(?c7-r`oWO*O zF^o^(ElfIaM?&j+iI!a#Cvl2ls!x=ennezjw-E=CuIpI(-AWE`3rrdO;wYIsrZD4R zn!88Dxj2Ja0jFo6!ieal6y6dib`W(chU}?Y5XrTEw<+T-zZpt_LQS>&u;IsnnI9}> z^-hoolxlCLRE0%#B#T-~)BfTmGTsfP_I9-Hd5<~N(*+jQQ&A!-S!5nS*ub#uA^SFo!Gn8DEF)uKd zNL?k>Y^hpq}xH^_EbVQua5dZ zvd{%VbseF-*~2FJYwqgV+d+ZJ8(&UvTjDHx0nMc#kuIb9kSpKj8N?|3BnP@dpUWlo#+3 zS52CqxMR}KyuiineOy{y%ntDJVqsx`%ZtBqBTZ)#fq*$eP7-noMVqpi1|Os(46fo6 zCd%>DHGIlwfzNQArwomAmPQ6QNF(9?zjSU|I=6Vjq2Ku2eDL=plV<6+_P0AF#s#=ikJsm#J5*SrlX6La2jJd=V9InG&Tf~(&WJcEYiR^ZonoEw=^ He&7ECilV#( diff --git a/spring-mvc-json/WebContent/WEB-INF/classes/com/hmkcode/vo/Person.class b/spring-mvc-json/WebContent/WEB-INF/classes/com/hmkcode/vo/Person.class deleted file mode 100644 index 92fc26465fb16dbec10ff428fe1a286deeaf49d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmZ{gU279T7=_Oy*{qFQQ`4j$My>HPZNUX^mEKf@l~9Ff?kC$Jow}KU-Ayn0n|h&O z5qjYd@JESfb_0bZF3i`v=gfKL{qy(cH-I;I<)b3diS0Bzn|_P!sR}P__*tcyH9l$r z8|U&uhKV$j@YDEQ#kr5VK)a}F8xB>fWuhlSUNf-Z6hHAC`H?`izdxe%n2-%r(GIYI`vT2@ zHtJ+H9jo+9iP0L^SSBM$G-Az*wfszH0^5U?Z)J`*QF%lj#zbonco-nSI_p_kuk|CB z?^AYC(6;;g%e>C{G{8MHDW$WNcKXXocUfa-XKAcHXxF{FW!qo79-zm2svI8Y2k>!+ z`!#m0f(8e{ialevdi=*$aBlGwauu$6@C%zi3R#D9y(reP#eGl;u#Fv_1a=v*X#R=r z)q=UX()XXh#gPdDtv&*eX@?c!%cR8 aUjjM2MsE>hhakKE0dWm=ATNr - - org.springframeworkspring-webmvc3.0.5.RELEASE - - - org.codehaus.jacksonjackson-mapper-asl1.4.2 - - + + + 4.0.0 + + com.hmkcode + spring-mvc-json + 1.0-SNAPSHOT + war + + spring-mvc-json + http://maven.apache.org + + + UTF-8 + 3.1.0.RELEASE + + + + org.springframework + spring-webmvc + 3.0.5.RELEASE + + + org.codehaus.jackson + jackson-mapper-asl + 1.4.2 + + + diff --git a/spring-mvc-json/WebContent/WEB-INF/src/com/hmkcode/controllers/RestController.java b/spring-mvc-json/src/main/java/com/hmkcode/controllers/RestController.java similarity index 100% rename from spring-mvc-json/WebContent/WEB-INF/src/com/hmkcode/controllers/RestController.java rename to spring-mvc-json/src/main/java/com/hmkcode/controllers/RestController.java diff --git a/spring-mvc-json/WebContent/WEB-INF/src/com/hmkcode/vo/Person.java b/spring-mvc-json/src/main/java/com/hmkcode/vo/Person.java similarity index 100% rename from spring-mvc-json/WebContent/WEB-INF/src/com/hmkcode/vo/Person.java rename to spring-mvc-json/src/main/java/com/hmkcode/vo/Person.java diff --git a/spring-mvc-json/WebContent/META-INF/MANIFEST.MF b/spring-mvc-json/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from spring-mvc-json/WebContent/META-INF/MANIFEST.MF rename to spring-mvc-json/src/main/webapp/META-INF/MANIFEST.MF diff --git a/spring-mvc-json/WebContent/WEB-INF/rest-servlet.xml b/spring-mvc-json/src/main/webapp/WEB-INF/rest-servlet.xml similarity index 100% rename from spring-mvc-json/WebContent/WEB-INF/rest-servlet.xml rename to spring-mvc-json/src/main/webapp/WEB-INF/rest-servlet.xml diff --git a/spring-mvc-json/WebContent/WEB-INF/web.xml b/spring-mvc-json/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-mvc-json/WebContent/WEB-INF/web.xml rename to spring-mvc-json/src/main/webapp/WEB-INF/web.xml diff --git a/spring-mvc-json/WebContent/index.html b/spring-mvc-json/src/main/webapp/index.html similarity index 100% rename from spring-mvc-json/WebContent/index.html rename to spring-mvc-json/src/main/webapp/index.html diff --git a/spring-mvc-root-webapplicationcontext/.classpath b/spring-mvc-root-webapplicationcontext/.classpath deleted file mode 100644 index 9aecea7..0000000 --- a/spring-mvc-root-webapplicationcontext/.classpath +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-mvc-root-webapplicationcontext/.gitignore b/spring-mvc-root-webapplicationcontext/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mvc-root-webapplicationcontext/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mvc-security/.classpath b/spring-mvc-security/.classpath deleted file mode 100644 index 86a2604..0000000 --- a/spring-mvc-security/.classpath +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-mvc-security/.gitignore b/spring-mvc-security/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mvc-security/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mybatis-junit/.classpath b/spring-mybatis-junit/.classpath deleted file mode 100644 index 7a43741..0000000 --- a/spring-mybatis-junit/.classpath +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-mybatis-junit/.gitignore b/spring-mybatis-junit/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mybatis-junit/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mybatis-junit/pom.xml b/spring-mybatis-junit/pom.xml index 399d3d1..f963739 100644 --- a/spring-mybatis-junit/pom.xml +++ b/spring-mybatis-junit/pom.xml @@ -93,11 +93,6 @@ spring-asm ${org.springframework.version} - - org.springframework - spring-context-support - ${org.springframework.version} - org.springframework spring-test diff --git a/spring-mybatis/.classpath b/spring-mybatis/.classpath deleted file mode 100644 index 9f6904a..0000000 --- a/spring-mybatis/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-mybatis/.gitignore b/spring-mybatis/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/spring-mybatis/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spring-mybatis/pom.xml b/spring-mybatis/pom.xml index 6d95b9f..60cc338 100644 --- a/spring-mybatis/pom.xml +++ b/spring-mybatis/pom.xml @@ -107,11 +107,6 @@ spring-asm ${org.springframework.version} - - org.springframework - spring-context-support - ${org.springframework.version} - diff --git a/spring-mybatis/src/main/resources/com/hmkcode/spring/mybatis/mapper/Mapper.xml b/spring-mybatis/src/main/resources/com/hmkcode/spring/mybatis/mapper/Mapper.xml index d3c6049..b429f52 100644 --- a/spring-mybatis/src/main/resources/com/hmkcode/spring/mybatis/mapper/Mapper.xml +++ b/spring-mybatis/src/main/resources/com/hmkcode/spring/mybatis/mapper/Mapper.xml @@ -4,7 +4,7 @@ - +