浏览代码

Convert to eclipse maven project

James 11 年之前
父节点
当前提交
8f4dd412ce

+ 8 - 4
.classpath

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="webapp/WEB-INF/classes"/>
 </classpath>

+ 3 - 1
.gitignore

@@ -13,4 +13,6 @@ build
 *.iws
 out
 
-*.jar
+*.jar
+/webapp/WEB-INF/classes
+/webapp/WEB-INF/target

+ 7 - 1
.project

@@ -21,6 +21,11 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
@@ -29,8 +34,9 @@
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>

+ 2 - 1
.settings/.jsdtscope

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="WebRoot"/>
+	<classpathentry kind="src" path="webapp"/>
+	<classpathentry kind="src" path="webapp/WEB-INF/target/m2e-wtp/web-resources"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
 		<attributes>

+ 0 - 1
.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,2 @@
-#Tue Sep 11 23:24:31 CST 2012
 eclipse.preferences.version=1
 encoding/<project>=UTF-8

+ 5 - 1
.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,12 @@
-#Tue Sep 11 23:24:18 CST 2012
 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.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.source=1.6

+ 4 - 0
.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

+ 3 - 2
.settings/org.eclipse.wst.common.component

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="jfinal">
-        <wb-resource deploy-path="/" source-path="/WebRoot" tag="defaultRootSource"/>
+        <wb-resource deploy-path="/" source-path="/webapp/WEB-INF/target/m2e-wtp/web-resources"/>
+        <wb-resource deploy-path="/" source-path="/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <property name="context-root" value="jfinal"/>
-        <property name="java-output-path" value="/jfinal/WebRoot/WEB-INF/classes"/>
+        <property name="java-output-path" value="/jfinal/webapp/WEB-INF/classes"/>
     </wb-module>
 </project-modules>

+ 0 - 2
.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <fixed facet="jst.web"/>
-  <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="jst.web" version="2.5"/>
   <installed facet="wst.jsdt.web" version="1.0"/>

+ 2 - 0
.settings/org.eclipse.wst.validation.prefs

@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1

+ 0 - 1
WebRoot/WEB-INF/.gitignore

@@ -1 +0,0 @@
-/classes

+ 3 - 0
pom.xml

@@ -143,6 +143,9 @@
 				</excludes>
 			</testResource>
 		</testResources>
+		<!-- directory>${project.basedir}/target</directory -->
+	    <directory>${project.basedir}/webapp/WEB-INF/target</directory><!-- vi -->
+		
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

+ 1 - 1
src/com/jfinal/ext/interceptor/Restful.java

@@ -40,7 +40,7 @@ import com.jfinal.core.Controller;
  * POST		/user			--->	save	
  * GET		/user/edit/id	--->	edit
  * PUT		/user/id		--->	update
- * DELECT	/user/id		--->	delete
+ * DELETE	/user/id		--->	delete
  */
 public class Restful implements Interceptor {
 	

WebRoot/META-INF/MANIFEST.MF → webapp/META-INF/MANIFEST.MF


+ 2 - 0
webapp/WEB-INF/.gitignore

@@ -0,0 +1,2 @@
+classes
+target

WebRoot/WEB-INF/lib/1_lib_description.txt → webapp/WEB-INF/lib/1_lib_description.txt


WebRoot/WEB-INF/web.xml → webapp/WEB-INF/web.xml


WebRoot/favicon.ico → webapp/favicon.ico