get examples to run

vert-x · Mar 14, 2013 · 95f608e · 95f608e
1 parent d75112a
commit 95f608e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/examples/java/simpleform/SimpleFormServer.java b/src/examples/java/simpleform/SimpleFormServer.java
@@ -18,7 +18,7 @@
 import org.vertx.java.core.Handler;
 import org.vertx.java.core.SimpleHandler;
 import org.vertx.java.core.http.HttpServerRequest;
-import org.vertx.java.deploy.Verticle;
+import org.vertx.java.platform.Verticle;
 import org.vertx.mods.formupload.Attribute;
 import org.vertx.mods.formupload.MultipartRequest;
 
@@ -27,6 +27,7 @@ public class SimpleFormServer extends Verticle {
   public void start() {
     vertx.createHttpServer().requestHandler(new Handler<HttpServerRequest>() {
       public void handle(final HttpServerRequest req) {
+        System.out.println("uri is " + req.uri);
         if (req.uri.equals("/")) {
           // Serve the index page
           req.response.sendFile("index.html");
@@ -36,15 +37,17 @@ public void handle(final HttpServerRequest req) {
           mpReq.attributeHandler(new Handler<Attribute>() {
             @Override
             public void handle(Attribute attr) {
+              System.out.println("Got attr " + attr.name + " : " + attr.value + "\n");
+
               req.response.write("Got attr " + attr.name + " : " + attr.value + "\n");
             }
           });
           req.endHandler(new SimpleHandler() {
             protected void handle() {
+              System.out.println("end of request");
               req.response.end();
             }
           });
-
         } else {
           req.response.statusCode = 404;
           req.response.end();

diff --git a/src/examples/java/simpleform/run_example.sh b/src/examples/java/simpleform/run_example.sh
@@ -1,4 +1,4 @@
 # We set VERTX_MODS to point to where we built the module
-export VERTX_MODS=$(readlink -f '../../../../build/mod')
+export VERTX_MODS=$(readlink -f '../../../../mods')
 # And then we run the example
-vertx run SimpleFormServer.java -includes vertx.formupload-v1.0
+vertx run SimpleFormServer.java -includes io.vertx~mod-formupload~2.0.0-SNAPSHOT
diff --git a/src/examples/java/simpleupload/SimpleUploadServer.java b/src/examples/java/simpleupload/SimpleUploadServer.java
@@ -19,7 +19,7 @@
 import org.vertx.java.core.AsyncResultHandler;
 import org.vertx.java.core.Handler;
 import org.vertx.java.core.http.HttpServerRequest;
-import org.vertx.java.deploy.Verticle;
+import org.vertx.java.platform.Verticle;
 import org.vertx.mods.formupload.MultipartRequest;
 import org.vertx.mods.formupload.Upload;
 

diff --git a/src/examples/java/simpleupload/run_example.sh b/src/examples/java/simpleupload/run_example.sh
@@ -1,4 +1,4 @@
 # We set VERTX_MODS to point to where we built the module
-export VERTX_MODS=$(readlink -f '../../../../build/mod')
+export VERTX_MODS=$(readlink -f '../../../../mods')
 # And then we run the example
-vertx run SimpleUploadServer.java -includes vertx.formupload-v1.0
+vertx run SimpleUploadServer.java -includes io.vertx~mod-formupload~2.0.0-SNAPSHOT
diff --git a/src/main/java/org/vertx/mods/formupload/MultipartRequest.java b/src/main/java/org/vertx/mods/formupload/MultipartRequest.java
@@ -36,9 +36,6 @@ public MultipartRequest(Vertx vertx, HttpServerRequest req) {
     this.req = req;
     // TODO - this is a bit of a hack
     nettyReq = ((DefaultHttpServerRequest)req).getNettyRequest();
-    for (Map.Entry<String, String> header: req.headers().entrySet()) {
-      nettyReq.headers().add(header.getKey(), header.getValue());
-    }
     try {
       decoder = new HttpPostRequestDecoder(new DataFactory(), nettyReq);
     } catch (Exception e) {

diff --git a/vertx.properties b/vertx.properties
@@ -2,7 +2,7 @@
 modowner=io.vertx
 
 # Your module name
-modname=mod-form-upload
+modname=mod-formupload
 
 # Your module version
 version=2.0.0-SNAPSHOT