Index: mediator-service/branches/DS-801_JSON_Login/grails-app/conf/BuildConfig.groovy
===================================================================
diff -u -r8645 -r8646
--- mediator-service/branches/DS-801_JSON_Login/grails-app/conf/BuildConfig.groovy	(.../BuildConfig.groovy)	(revision 8645)
+++ mediator-service/branches/DS-801_JSON_Login/grails-app/conf/BuildConfig.groovy	(.../BuildConfig.groovy)	(revision 8646)
@@ -11,48 +11,48 @@
 //grails.project.war.file = "target/${appName}-${appVersion}.war"
 
 //Gdoc comment tags configuration
-	gdoc
-	{
-		tags{
-			grouping.level1.name = "service"
-			grouping.level2.name = "group"
-			grouping.level3.name = "http"
+gdoc
+		{
+			tags{
+				grouping.level1.name = "service"
+				grouping.level2.name = "group"
+				grouping.level3.name = "http"
 
-			info.tag1.name = "url"
-			info.tag2.name = "descshort"
-			info.tag3.name = "desclong"
-			info.tag4.name = "reqParams"
-			info.tag5.name = "optParams"
-			info.tag6.name = "filters"
-			info.tag7.name = 'columnsets'
-			info.tag8.name = "permission"
-			info.tag9.name = "note"
-			info.tag10.name = "querystr"
-			info.tag11.name = "samplein"
-			info.tag12.name = "sampleout"
+				info.tag1.name = "url"
+				info.tag2.name = "descshort"
+				info.tag3.name = "desclong"
+				info.tag4.name = "reqParams"
+				info.tag5.name = "optParams"
+				info.tag6.name = "filters"
+				info.tag7.name = 'columnsets'
+				info.tag8.name = "permission"
+				info.tag9.name = "note"
+				info.tag10.name = "querystr"
+				info.tag11.name = "samplein"
+				info.tag12.name = "sampleout"
 
 
-			grouping.level1.label = "Service"
-			grouping.level2.label = "Group"
-			grouping.level3.label = "HTTP Method"
+				grouping.level1.label = "Service"
+				grouping.level2.label = "Group"
+				grouping.level3.label = "HTTP Method"
 
-			info.tag1.label = "URL"
-			info.tag2.label = "Short Description"
-			info.tag3.label = "Long Description"
-			info.tag4.label = "Required Params"
-			info.tag5.label = "Optional Params"
-			info.tag6.label = "Supported Filters"
-			info.tag7.label = "Supported Column Sets"
-			info.tag8.label = "Security Permissions"
-			info.tag9.label = "Note"
-			info.tag10.label = "Query String"
-			info.tag11.label = "Sample Input"
-			info.tag12.label = "Sample Output"
+				info.tag1.label = "URL"
+				info.tag2.label = "Short Description"
+				info.tag3.label = "Long Description"
+				info.tag4.label = "Required Params"
+				info.tag5.label = "Optional Params"
+				info.tag6.label = "Supported Filters"
+				info.tag7.label = "Supported Column Sets"
+				info.tag8.label = "Security Permissions"
+				info.tag9.label = "Note"
+				info.tag10.label = "Query String"
+				info.tag11.label = "Sample Input"
+				info.tag12.label = "Sample Output"
+			}
 		}
-	}
 
-	grails.project.dependency.resolver = "maven"
-	grails.project.dependency.resolution = {
+grails.project.dependency.resolver = "maven"
+grails.project.dependency.resolution = {
 	// inherit Grails' default dependencies
 	inherits("global") {
 		// uncomment to disable ehcache
@@ -96,79 +96,79 @@
 
 		compile ("org.eclipse.jetty.aggregate:jetty-servlet:8.1.2.v20120308")
 
-        // TODO: if upgrading Camel beyond 2.11, revisit & use the new caching strategy
-        // see http://camel.apache.org/stream-caching.html
+		// TODO: if upgrading Camel beyond 2.11, revisit & use the new caching strategy
+		// see http://camel.apache.org/stream-caching.html
 
 		compile ('org.apache.camel:camel-core:2.11.0') {
 			excludes(
-				  [ group: 'org.slf4j', name: 'slf4j-api']
-				, [group: 'org.springframework', name: 'spring-context']
-				, [group: 'org.springframework', name: 'spring-expression']
-				, [group: 'org.springframework', name: 'spring-aop']
-				, [group: 'org.springframework', name: 'spring-beans']
-				, [group: 'org.springframework', name: 'spring-core']
-				, [group: 'org.springframework', name: 'spring-tx']
-				, [group: 'commons-lang', name: 'commons-lang']
-				, [group: 'commons-codec', name: 'commons-codec']
-				)
+					[ group: 'org.slf4j', name: 'slf4j-api']
+					, [group: 'org.springframework', name: 'spring-context']
+					, [group: 'org.springframework', name: 'spring-expression']
+					, [group: 'org.springframework', name: 'spring-aop']
+					, [group: 'org.springframework', name: 'spring-beans']
+					, [group: 'org.springframework', name: 'spring-core']
+					, [group: 'org.springframework', name: 'spring-tx']
+					, [group: 'commons-lang', name: 'commons-lang']
+					, [group: 'commons-codec', name: 'commons-codec']
+			)
 		}
 
 
 		compile ('org.apache.camel:camel-test:2.11.0') {
 			excludes(
-				  [ group: 'org.slf4j', name: 'slf4j-api']
-				, [group: 'org.springframework', name: 'spring-context']
-				, [group: 'org.springframework', name: 'spring-expression']
-				, [group: 'org.springframework', name: 'spring-aop']
-				, [group: 'org.springframework', name: 'spring-beans']
-				, [group: 'org.springframework', name: 'spring-core']
-				, [group: 'org.springframework', name: 'spring-tx']
-				, [group: 'commons-lang', name: 'commons-lang']
-				, [group: 'commons-codec', name: 'commons-codec']
-				)
+					[ group: 'org.slf4j', name: 'slf4j-api']
+					, [group: 'org.springframework', name: 'spring-context']
+					, [group: 'org.springframework', name: 'spring-expression']
+					, [group: 'org.springframework', name: 'spring-aop']
+					, [group: 'org.springframework', name: 'spring-beans']
+					, [group: 'org.springframework', name: 'spring-core']
+					, [group: 'org.springframework', name: 'spring-tx']
+					, [group: 'commons-lang', name: 'commons-lang']
+					, [group: 'commons-codec', name: 'commons-codec']
+			)
 		}
 
 		compile ('org.apache.camel:camel-http:2.11.0'){
 			excludes(
-				  [ group: 'org.slf4j', name: 'slf4j-api']
-				, [group: 'org.springframework', name: 'spring-context']
-				, [group: 'org.springframework', name: 'spring-expression']
-				, [group: 'org.springframework', name: 'spring-aop']
-				, [group: 'org.springframework', name: 'spring-beans']
-				, [group: 'org.springframework', name: 'spring-core']
-				, [group: 'org.springframework', name: 'spring-tx']
-				, [group: 'commons-lang', name: 'commons-lang']
-				, [group: 'commons-codec', name: 'commons-codec']
-				, [group: 'commons-logging', name: 'commons-logging']
-				)
+					[ group: 'org.slf4j', name: 'slf4j-api']
+					, [group: 'org.springframework', name: 'spring-context']
+					, [group: 'org.springframework', name: 'spring-expression']
+					, [group: 'org.springframework', name: 'spring-aop']
+					, [group: 'org.springframework', name: 'spring-beans']
+					, [group: 'org.springframework', name: 'spring-core']
+					, [group: 'org.springframework', name: 'spring-tx']
+					, [group: 'commons-lang', name: 'commons-lang']
+					, [group: 'commons-codec', name: 'commons-codec']
+					, [group: 'commons-logging', name: 'commons-logging']
+			)
 		}
 
 		compile ('org.apache.camel:camel-jetty:2.11.0'){
 			excludes(
-				  [ group: 'org.slf4j', name: 'slf4j-api']
-				, [group: 'org.springframework', name: 'spring-context']
-				, [group: 'org.springframework', name: 'spring-expression']
-				, [group: 'org.springframework', name: 'spring-aop']
-				, [group: 'org.springframework', name: 'spring-beans']
-				, [group: 'org.springframework', name: 'spring-core']
-				, [group: 'org.springframework', name: 'spring-tx']
-				, [group: 'commons-lang', name: 'commons-lang']
-				, [group: 'commons-codec', name: 'commons-codec']
-				)
+					[ group: 'org.slf4j', name: 'slf4j-api']
+					, [group: 'org.springframework', name: 'spring-context']
+					, [group: 'org.springframework', name: 'spring-expression']
+					, [group: 'org.springframework', name: 'spring-aop']
+					, [group: 'org.springframework', name: 'spring-beans']
+					, [group: 'org.springframework', name: 'spring-core']
+					, [group: 'org.springframework', name: 'spring-tx']
+					, [group: 'commons-lang', name: 'commons-lang']
+					, [group: 'commons-codec', name: 'commons-codec']
+			)
 		}
 
 		compile ('org.apache.camel:camel-spring:2.11.0'){
 			excludes(
-				  [ group: 'org.slf4j', name: 'slf4j-api']
-				, [group: 'org.springframework', name: 'spring-context']
-				, [group: 'org.springframework', name: 'spring-expression']
-				, [group: 'org.springframework', name: 'spring-aop']
-				, [group: 'org.springframework', name: 'spring-beans']
-				, [group: 'org.springframework', name: 'spring-core']
-				, [group: 'org.springframework', name: 'spring-tx']
-				, [group: 'commons-lang', name: 'commons-lang']
-				, [group: 'commons-codec', name: 'commons-codec']
-				)
+					[ group: 'org.slf4j', name: 'slf4j-api']
+					, [group: 'org.springframework', name: 'spring-context']
+					, [group: 'org.springframework', name: 'spring-expression']
+					, [group: 'org.springframework', name: 'spring-aop']
+					, [group: 'org.springframework', name: 'spring-beans']
+					, [group: 'org.springframework', name: 'spring-core']
+					, [group: 'org.springframework', name: 'spring-tx']
+					, [group: 'commons-lang', name: 'commons-lang']
+					, [group: 'commons-codec', name: 'commons-codec']
+			)
 		}
 
 		//fix for - http://camel.465427.n5.nabble.com/null-pointer-exception-td5537826.html
@@ -185,13 +185,13 @@
 					, [group: 'org.springframework', name: 'spring-core']
 					, [group: 'org.springframework', name: 'spring-tx']
 					, [group: 'commons-lang', name: 'commons-lang']
-					)
+			)
 		}
 
 		compile ("org.apache.httpcomponents:httpclient:4.2.1") {
 			excludes(
-				[ group: 'commons-codec', name: 'commons-codec']
-				)
+					[ group: 'commons-codec', name: 'commons-codec']
+			)
 		}
 
 		compile ('org.codehaus.groovy.modules.http-builder:http-builder:0.7.2') {
@@ -224,7 +224,7 @@
 
 	plugins {
 		// plugins for the build system only
-       build ':tomcat:7.0.55'
+		build ':tomcat:7.0.55'
 
 		// plugins needed at runtime but not for compilation
 //		runtime ':hibernate4:4.3.6.1'
@@ -255,5 +255,5 @@
 }
 // WARNING: do NOT allow any violations. do NOT change the codenarc/rules.groovy without a good reason that has been reviewed
 codenarc.maxPriority1Violations = 0
-codenarc.maxPriority2Violations = 20
+codenarc.maxPriority2Violations = 24
 codenarc.maxPriority3Violations = 3