Merge remote-tracking branch 'origin/dev' into dev

updated local copy

Author: Sravan Kottam

test-complete/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderValueQuery.java

@@ -236,7 +236,7 @@ public void testPOJOValueSearchWithNoResults() throws Exception {
 			assertEquals("Page size",count,p.size());
 			pageNo=pageNo+p.getPageSize();
 		}while(!p.isLastPage() && pageNo<=p.getTotalSize());
-		assertEquals("page number after the loop",0,p.getPageNumber());
+		assertEquals("page number after the loop",1,p.getPageNumber());
 		assertEquals("total no of pages",0,p.getTotalPages());
 		assertEquals("page length from search handle",5,jh.get().path("page-length").asInt());
 //		assertEquals("Total results from search handle",10,jh.get().path("total").asInt());

test-complete/src/test/java/com/marklogic/client/functionaltest/TestResponseTransform.java

@@ -196,7 +196,7 @@ public void testResponseTransformInvalid() throws IOException, ParserConfigurati
 			System.out.println(exception);
 		}
 
-		String expectedException = "Local message: search failed: Bad Request. Server Message: RESTAPI-INVALIDREQ: (err:FOER0000) Invalid request:  reason: transform extension does not exist: foo";
+		String expectedException = "Local message: search failed: Bad Request. Server Message: XDMP-MODNOTFOUND: (err:XQST0059) Module /marklogic.rest.transform/foo/assets/transform.xqy not found";
 		assertTrue("exception is not thrown", exception.contains(expectedException));
 		//bug 22356
 		assertTrue("Value should be null", resultsHandle.get()==null);

test-complete/src/test/java/com/marklogic/client/functionaltest/data/module.xqy

@@ -1,3 +1,4 @@
+xquery version "1.0-ml";
 (:
   Copyright 2014-2015 MarkLogic Corporation
  
@@ -14,7 +15,7 @@
   limitations under the License.
 :)
 
-xquery version "1.0-ml";
+
 
 module namespace my = "http://my.test.module";
 declare function my:useless()