Updates

javaConductor · javaConductor · commit 9139f3ae4fdb · 2015-05-20T16:13:17.000-05:00
diff --git a/CrossSiteScripting/build.gradle b/CrossSiteScripting/build.gradle
@@ -13,6 +13,6 @@ repositories {
 dependencies {
     // The production code uses the SLF4J logging API at compile time
   compile('org.codehaus.groovy:groovy-all:2.3.0')
-  compile     group: 'io.github.javaconductor', name: 'gserv', version: '0.9.7'
+  compile     group: 'io.github.javaconductor', name: 'gserv', version: '0.9.9'
   testCompile group: 'junit', name: 'junit', version: '4.11'
 }
diff --git a/CrossSiteScripting/src/main/groovy/io/github/javaconductor/gserv/examples/crosssite/Main.groovy b/CrossSiteScripting/src/main/groovy/io/github/javaconductor/gserv/examples/crosssite/Main.groovy
@@ -57,6 +57,7 @@ class Main {
       }
 
     }.start(60001);
+
   };
 
 }
diff --git a/ETag/build.gradle b/ETag/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'groovy'
 apply plugin: 'application'
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.6
 version = '1.0'
 mainClassName = "io.github.javaconductor.gserv.samples.etag.Main"
 repositories {
@@ -12,7 +12,7 @@ repositories {
 dependencies {
   // The production code uses the SLF4J logging API at compile time
   compile('org.codehaus.groovy:groovy-all:2.3.0')
-  compile     group: 'io.github.javaconductor', name: 'gserv', version: '0.9.6'
+  compile     group: 'io.github.javaconductor', name: 'gserv', version: '0.9.8'
 
   testCompile group: 'junit', name: 'junit', version: '4.11'
 }
diff --git a/ETag/src/main/groovy/io/github/javaconductor/gserv/samples/etag/Main.groovy b/ETag/src/main/groovy/io/github/javaconductor/gserv/samples/etag/Main.groovy
@@ -4,6 +4,7 @@ package io.github.javaconductor.gserv.samples.etag
 import io.github.javaconductor.gserv.*
 import io.github.javaconductor.gserv.plugins.*
 import io.github.javaconductor.gserv.utils.Encoder
+import net.sf.json.JSONObject
 
 class Main {
 
@@ -27,11 +28,18 @@ class Main {
       get("/", file("text/plain", "data/rfile.txt"))
 
       // This will create a Base64 String for the eTag
-      strongETag( "/*"){exch, data ->
+      strongETag( "/"){exch, data ->
         //MD5 it
         Encoder.md5WithBase64(data)
       }
 
+      // This will create a Base64 String for the eTag
+      weakETag( "/answers/*"){context, actionArgs  ->
+        //MD5 it
+        def data =  actionArgs.join('.').bytes
+        Encoder.md5WithBase64(data)
+      }
+
       get('/answers/:op/:num1:Number/:num2:Number'){ op, num1, num2 ->
         def ans
         switch(op){
@@ -43,20 +51,6 @@ class Main {
         writeJson(ans : ans)
       }
 
-//    https://github.com/javaConductor/gserv/issues/11
-//      THIS DOES NOT WORK - ONLY Context is passed.
-//      // This will create an eTag based sole on the request values
-//      // this is fine as long as a set of results always returns the same value.
-//      /// Example: when a GET is sent tot this resource like: /add/23.12/43.45, the
-//      /// response will always be 66.57
-//      weakETag( "/answers/:op/:num1/:num2"){op, num1, num2 ->
-//        Encoder.md5WithBase64("$num1_$op_$num2".bytes)
-//      }
-
-/*      weakETag( "/answers/:op/:num1/:num2"){ context ->
-        Encoder.md5WithBase64(context.requestURI.path.bytes)
-      }
-*/
       }.start(54321)
   }//main
 }
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 allprojects {
   apply plugin: 'groovy'
-  sourceCompatibility = 1.5
+  sourceCompatibility = 1.6
   version = '1.0'
   task wrapper(type: Wrapper) {
     gradleVersion = '2.0'
@@ -16,7 +16,7 @@ subprojects {
   }
   dependencies {
     compile('org.codehaus.groovy:groovy-all:2.3.0')
-    compile     group: 'io.github.javaconductor', name: 'gserv', version: '0.9.7'
+    compile     group: 'io.github.javaconductor', name: 'gserv', version: '0.9.9'
     testCompile     group: 'io.github.javaconductor', name: 'gserv-test', version: '1.0.0'
 
   }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ repositories {`
`13`	`13`	`dependencies {`
`14`	`14`	`// The production code uses the SLF4J logging API at compile time`
`15`	`15`	`compile('org.codehaus.groovy:groovy-all:2.3.0')`
`16`		`- compile group: 'io.github.javaconductor', name: 'gserv', version: '0.9.7'`
	`16`	`+ compile group: 'io.github.javaconductor', name: 'gserv', version: '0.9.9'`
`17`	`17`	`testCompile group: 'junit', name: 'junit', version: '4.11'`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ class Main {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`}.start(60001);`
	`60`	`+`
`60`	`61`	`};`
`61`	`62`
`62`	`63`	`}`