Repackaged all client classes under client.ext

Author: rjrudin

README.md

@@ -3,12 +3,12 @@
 ml-javaclient-util is a library of Java classes that provide some useful functionality on top of 
 the [MarkLogic Java Client API](http://docs.marklogic.com/guide/java). Those features include:
 
-- Support for [loading modules via the REST API](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/modulesloader)
-- Basic integration with [Spring via a Spring FactoryBean](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/spring)
-- Library for [parallelizing batched writes](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/batch)
+- Support for [loading modules via the REST API](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/ext/modulesloader)
+- Basic integration with [Spring via a Spring FactoryBean](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/ext/spring)
+- Library for [parallelizing batched writes](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/ext/batch)
 - Spring-style [template/callback library for XCC](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/xcc/template)
-- Support for generating MarkLogic 9 [Entity Services modules](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/es)
-- Support for [importing/exporting qconsole workspaces] (https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/qconsole)
+- Support for generating MarkLogic 9 [Entity Services modules](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/ext/es)
+- Support for [importing/exporting qconsole workspaces](https://github.com/rjrudin/ml-javaclient-util/tree/master/src/main/java/com/marklogic/client/ext/qconsole)
 
 This is a lower-level library that is primarily used via [ml-app-deployer](https://github.com/rjrudin/ml-app-deployer) 
 and [ml-gradle](https://github.com/rjrudin/ml-gradle) and [ml-junit](https://github.com/rjrudin/ml-junit). But you can use it by itself too.
@@ -18,7 +18,7 @@ and [ml-gradle](https://github.com/rjrudin/ml-gradle) and [ml-junit](https://git
 Here's a sample of loading modules - though it's best to look at the aforementioned projects to see all the ways this can be done:
 
     DatabaseClient client = DatabaseClientFactory.newClient(...); // Use the ML Java Client API
-    XccAssetLoader assetLoader = new XccAssetLoader(client); // Can use XCC or the REST API to load asset modules
+    AssetFileLoader assetFileLoader = new AssetFileLoader(client); // Uses the REST API to load asset modules
     DefaultModulesLoader modulesLoader = new DefaultModulesLoader(assetLoader);
     File modulesDir = new File("src/main/ml-modules");
     ModulesFinder modulesFinder = new DefaultModulesFinder(); // Allows for adjusting where modules are stored on a filesystem
@@ -52,4 +52,4 @@ Here's a sample using two DatabaseClient instances:
     BatchWriter writer = new RestBatchWriter(Arrays.asList(client1, client2));
     writer.initialize();
     writer.write(Arrays.asList(doc1, doc2));
-    writer.waitForCompletion();
+    writer.waitForCompletion();

gradle.properties

@@ -1,3 +1,3 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=45
+version=3.0-alpha1

src/main/java/com/marklogic/client/batch/BatchWriter.java renamed to src/main/java/com/marklogic/client/ext/batch/BatchWriter.java

@@ -1,4 +1,4 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.document.DocumentWriteOperation;
 

src/main/java/com/marklogic/client/batch/BatchWriterSupport.java renamed to src/main/java/com/marklogic/client/ext/batch/BatchWriterSupport.java

@@ -1,20 +1,16 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.document.DocumentWriteOperation;
-import com.marklogic.client.helper.LoggingObject;
+import com.marklogic.client.ext.helper.LoggingObject;
 import org.springframework.core.task.AsyncListenableTaskExecutor;
-import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.SyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.concurrent.ExecutorConfigurationSupport;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.util.concurrent.ListenableFuture;
 import org.springframework.util.concurrent.ListenableFutureCallback;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Support class for BatchWriter implementations that uses Spring's TaskExecutor interface for parallelizing writes to

src/main/java/com/marklogic/client/batch/DataMovementBatchWriter.java renamed to src/main/java/com/marklogic/client/ext/batch/DataMovementBatchWriter.java

@@ -1,11 +1,11 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.datamovement.DataMovementManager;
 import com.marklogic.client.datamovement.JobTicket;
 import com.marklogic.client.datamovement.WriteBatcher;
 import com.marklogic.client.document.DocumentWriteOperation;
-import com.marklogic.client.helper.LoggingObject;
+import com.marklogic.client.ext.helper.LoggingObject;
 
 import java.util.List;
 

src/main/java/com/marklogic/client/batch/RestBatchWriter.java renamed to src/main/java/com/marklogic/client/ext/batch/RestBatchWriter.java

@@ -1,4 +1,4 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.document.DocumentManager;

src/main/java/com/marklogic/client/batch/SimpleDocumentWriteOperation.java renamed to src/main/java/com/marklogic/client/ext/batch/SimpleDocumentWriteOperation.java

@@ -1,4 +1,4 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.document.DocumentWriteOperation;
 import com.marklogic.client.io.DocumentMetadataHandle;

src/main/java/com/marklogic/client/batch/WriteListener.java renamed to src/main/java/com/marklogic/client/ext/batch/WriteListener.java

@@ -1,4 +1,4 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.document.DocumentWriteOperation;
 

src/main/java/com/marklogic/client/batch/XccBatchWriter.java renamed to src/main/java/com/marklogic/client/ext/batch/XccBatchWriter.java

@@ -1,8 +1,8 @@
-package com.marklogic.client.batch;
+package com.marklogic.client.ext.batch;
 
 import com.marklogic.client.document.DocumentWriteOperation;
-import com.marklogic.client.xcc.DefaultDocumentWriteOperationAdapter;
-import com.marklogic.client.xcc.DocumentWriteOperationAdapter;
+import com.marklogic.client.ext.xcc.DefaultDocumentWriteOperationAdapter;
+import com.marklogic.client.ext.xcc.DocumentWriteOperationAdapter;
 import com.marklogic.xcc.Content;
 import com.marklogic.xcc.ContentSource;
 import com.marklogic.xcc.Session;

src/main/java/com/marklogic/client/ext/datamovement/QueryBatcherTemplate.java

@@ -5,7 +5,7 @@
 import com.marklogic.client.datamovement.JobTicket;
 import com.marklogic.client.datamovement.QueryBatchListener;
 import com.marklogic.client.datamovement.QueryBatcher;
-import com.marklogic.client.helper.LoggingObject;
+import com.marklogic.client.ext.helper.LoggingObject;
 import com.marklogic.client.query.RawCombinedQueryDefinition;
 import com.marklogic.client.query.RawStructuredQueryDefinition;
 import com.marklogic.client.query.StringQueryDefinition;