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

Author: Sravan Kottam

.gitignore

@@ -1,8 +1,10 @@
 target/
 .classpath
 .project
+.gradle
 .settings/
 *.class
+test-complete/build/
 
 # Package Files #
 *.jar

pom.xml

@@ -8,7 +8,7 @@
 	<name>client-api-java</name>
 	<url>http://developer.marklogic.com</url>
 	<properties>
-		<javadoc-title>${project.name} 2.0 ${maven.build.timestamp}</javadoc-title>
+		<javadoc-title>${project.name} ${project.version} ${maven.build.timestamp}</javadoc-title>
 		<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <github.global.server>github</github.global.server>
@@ -36,10 +36,10 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.8.1</version>
 				<configuration>
-					<bottom><![CDATA[Copyright &#169; 2013-2014 MarkLogic Corporation.]]></bottom>
+					<bottom><![CDATA[Copyright &#169; 2013-2015 MarkLogic Corporation.]]></bottom>
 					<excludePackageNames>*.impl:*.jaxb:*.test:*.test.*</excludePackageNames>
 					<links>
-						<link>http://docs.oracle.com/javase/6/docs/api/</link>
+						<link>http://docs.oracle.com/javase/8/docs/api/</link>
 					</links>
 					<overview>${basedir}/src/main/javadoc/overview.html</overview>
 					<show>public</show>
@@ -327,11 +327,5 @@
 			<version>2.4.1</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>16.0.1</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

src/main/java/com/marklogic/client/DatabaseClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -135,17 +135,6 @@ public interface DatabaseClient {
      */
     public <T extends ResourceManager> T init(String resourceName, T resourceManager);
 
-    /**
-     * Initializes a manager for a extension resource.
-     * 
-     * @param resourceName	the name of the extension resource
-     * @param resourceManager	the manager for the extension resource
-     * @param scriptLanguage	the script language for the extension resource, either XQUERY (default) or JAVASCRIPT
-     * @return	the initialized resource manager
-     */
-    public <T extends ResourceManager> T init(String resourceName, T resourceManager, 
-	  ExtensionMetadata.ScriptLanguage scriptLanguage);
-
     /**
      * Creates a logger for document and query requests.  To merge the logging output
      * with the output from other loggers, pass the output stream used by the other

src/main/java/com/marklogic/client/DatabaseClientFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/FailedRequestException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/ForbiddenUserException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicBindingException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicIOException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicInternalException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicServerException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 MarkLogic Corporation
+ * Copyright 2012-2015 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.