JavaPythonGO
diff --git a/‎core/src/main/java/com/bj58/argo/Argo.java
Lines changed: 2 additions & 7 deletions b/‎core/src/main/java/com/bj58/argo/Argo.java
Lines changed: 2 additions & 7 deletions
diff --git a/‎core/src/main/java/com/bj58/argo/internal/DefaultArgoDispatcher.java
Lines changed: 2 additions & 0 deletions b/‎core/src/main/java/com/bj58/argo/internal/DefaultArgoDispatcher.java
Lines changed: 2 additions & 0 deletions
diff --git a/‎samples/company/pom.xml
Lines changed: 12 additions & 0 deletions b/‎samples/company/pom.xml
Lines changed: 12 additions & 0 deletions
diff --git a/‎samples/hello-world/pom.xml
Lines changed: 10 additions & 1 deletion b/‎samples/hello-world/pom.xml
Lines changed: 10 additions & 1 deletion
diff --git a/‎samples/hello-world/src/main/java/com/bj58/argo/controllers/HomeController.java
Lines changed: 1 addition & 1 deletion b/‎samples/hello-world/src/main/java/com/bj58/argo/controllers/HomeController.java
Lines changed: 1 addition & 1 deletion
diff --git a/‎samples/hello-world/src/main/resources/views/index.html
Lines changed: 4 additions & 4 deletions b/‎samples/hello-world/src/main/resources/views/index.html
Lines changed: 4 additions & 4 deletions
@@ -226,13 +226,8 @@ public File currentFolder() {
 
     private File innerCurrentFolder() {
 
-        try {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            URL url = cl.getResource(".");
-            return new File(url.toURI());
-        } catch (URISyntaxException e) {
-            throw ArgoException.raise(e);
-        }
+//        System.out.println("Current Folder: " + getClass().getResource("/").getFile());
+        return new File(getClass().getResource("/").getFile());
     }
 
 }
@@ -78,6 +78,8 @@ private BeatContext bindBeatContext(HttpServletRequest request, HttpServletRespo
         localContext.set(context);
 
         BeatContext beat = argo.injector().getInstance(defaultBeatContextKey);
+        // 增加默认参数到model
+        beat.getModel().add("__beat", beat);
         context.setBeat(beat);
         return beat;
     }
 
@@ -27,6 +27,18 @@
     <build>
         <plugins>
 
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+
+
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
 
@@ -27,6 +27,15 @@
     <build>
         <plugins>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -43,7 +52,7 @@
                 <artifactId>tomcat7-maven-plugin</artifactId>
                 <version>2.0</version>
                 <configuration>
-                    <path>/</path>
+                    <path>/</path> <!--/argo -->
                     <port>80</port>
                 </configuration>
             </plugin>
 
@@ -16,7 +16,7 @@ public class HomeController extends AbstractController {
 
     @Path("")
     public ActionResult home() {
-        System.out.println(1);
+//        System.out.println(1);
         return view("index"); // velocity模板是 /src/main/java/resources/views/index.html
     }
 
 
@@ -5,10 +5,10 @@
 <body>
 <h2>Samples</h2>
 <ul>
-    <li><a href="/hello/world">根据url获得参数的hello wolrd</a></li>
-    <li><a href="1.html">静态文件显示</a></li>
-    <li><a href="form.html">区分queryString和form参数</a></li>
-    <li><a href="upload-form.html">文件上传展示</a></li>
+    <li><a href="$__beat.servletContext.contextPath/hello/world">根据url获得参数的hello wolrd</a></li>
+    <li><a href="$__beat.servletContext.contextPath/1.html">静态文件显示</a></li>
+    <li><a href="$__beat.servletContext.contextPath/form.html">区分queryString和form参数</a></li>
+    <li><a href="$__beat.servletContext.contextPath/upload-form.html">文件上传展示</a></li>
 </ul>
 </body>
 </html>
Original file line number	Diff line number	Diff line change
`@@ -226,13 +226,8 @@ public File currentFolder() {`
`226`	`226`
`227`	`227`	`private File innerCurrentFolder() {`
`228`	`228`
`229`		`- try {`
`230`		`- ClassLoader cl = Thread.currentThread().getContextClassLoader();`
`231`		`- URL url = cl.getResource(".");`
`232`		`- return new File(url.toURI());`
`233`		`- } catch (URISyntaxException e) {`
`234`		`- throw ArgoException.raise(e);`
`235`		`- }`
	`229`	`+// System.out.println("Current Folder: " + getClass().getResource("/").getFile());`
	`230`	`+ return new File(getClass().getResource("/").getFile());`
`236`	`231`	`}`
`237`	`232`
`238`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,8 @@ private BeatContext bindBeatContext(HttpServletRequest request, HttpServletRespo`
`78`	`78`	`localContext.set(context);`
`79`	`79`
`80`	`80`	`BeatContext beat = argo.injector().getInstance(defaultBeatContextKey);`
	`81`	`+ // 增加默认参数到model`
	`82`	`+ beat.getModel().add("__beat", beat);`
`81`	`83`	`context.setBeat(beat);`
`82`	`84`	`return beat;`
`83`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class HomeController extends AbstractController {`
`16`	`16`
`17`	`17`	`@Path("")`
`18`	`18`	`public ActionResult home() {`
`19`		`- System.out.println(1);`
	`19`	`+// System.out.println(1);`
`20`	`20`	`return view("index"); // velocity模板是 /src/main/java/resources/views/index.html`
`21`	`21`	`}`
`22`	`22`