ml-app-deployer for loadSchemasData

build.gradle

@@ -11,10 +11,11 @@ targetCompatibility = "1.7"
 
 repositories {
   jcenter()
+  mavenLocal()
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:2.5'
+  compile 'com.marklogic:ml-javaclient-util:2.6'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.1.5.RELEASE'

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -15,6 +15,7 @@
 import com.marklogic.client.modulesloader.impl.XccAssetLoader;
 import com.marklogic.client.modulesloader.ssl.SimpleX509TrustManager;
 import com.marklogic.client.modulesloader.xcc.DefaultDocumentFormatGetter;
+import com.marklogic.mgmt.ManageClient;
 
 /**
  * Encapsulates common configuration properties for an application deployed to MarkLogic. These properties include not
@@ -56,7 +57,7 @@ public class AppConfig {
 
     private String name = DEFAULT_APP_NAME;
     private String host = DEFAULT_HOST;
-
+    
     // Username/password combo for using the client REST API - e.g. to load modules
     private String restAdminUsername = DEFAULT_USERNAME;
     private String restAdminPassword = DEFAULT_PASSWORD;
@@ -100,7 +101,8 @@ public class AppConfig {
     // Comma-delimited string used for configuring forest replicas
     private String databaseNamesAndReplicaCounts;
 
-    public AppConfig() {
+
+	public AppConfig() {
         this(DEFAULT_MODULES_PATH);
     }
 
@@ -135,6 +137,18 @@ public DatabaseClient newTestDatabaseClient() {
         return DatabaseClientFactory.newClient(getHost(), getTestRestPort(), getRestAdminUsername(),
                 getRestAdminPassword(), getRestAuthentication(), getRestSslContext(), getRestSslHostnameVerifier());
     }
+
+    /**
+     * Like newDatabaseClient, but connects to schemas database.
+     * 
+     * @return
+     */
+	public DatabaseClient newSchemasDatabaseClient() {
+		return DatabaseClientFactory.newClient(getHost(),  getRestPort(), getSchemasDatabaseName(), 
+				getRestAdminUsername(), getRestAdminPassword(), getRestAuthentication(), 
+				getRestSslContext(), getRestSslHostnameVerifier());
+	}
+
 
     /**
      * @return an XccAssetLoader based on the configuration properties in this class
@@ -225,7 +239,7 @@ public String getTriggersDatabaseName() {
     public String getSchemasDatabaseName() {
         return schemasDatabaseName != null ? schemasDatabaseName : name + "-schemas";
     }
-
+    
     /**
      * @return the name of the application, which is then used to generate app server and database names unless those
      *         are set via their respective properties
@@ -458,5 +472,4 @@ public FileFilter getAssetFileFilter() {
     public void setAssetFileFilter(FileFilter assetFileFilter) {
         this.assetFileFilter = assetFileFilter;
     }
-
 }

src/main/java/com/marklogic/appdeployer/command/schemas/LoadSchemasDataCommand.java

@@ -0,0 +1,51 @@
+package com.marklogic.appdeployer.command.schemas;
+
+import java.io.File;
+
+import com.marklogic.appdeployer.AppConfig;
+import com.marklogic.appdeployer.command.AbstractCommand;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.dataloader.SchemasDataLoader;
+import com.marklogic.client.dataloader.impl.DefaultSchemasDataFinder;
+import com.marklogic.client.dataloader.impl.DefaultSchemasDataLoader;
+
+public class LoadSchemasDataCommand extends AbstractCommand  {
+
+	private SchemasDataLoader schemasDataLoader;
+
+	public LoadSchemasDataCommand() {
+        setExecuteSortOrder(SortOrderConstants.DEPLOY_SQL_VIEWS);
+	}
+
+	@Override
+	public void execute(CommandContext context) {
+		loadSchemasDataIntoSchemasDatabase(context);
+	}
+
+	protected void loadSchemasDataIntoSchemasDatabase(CommandContext context) {
+		if (schemasDataLoader == null) {
+			initializeDefaultSchemasDataLoader(context);
+		}
+
+
+		AppConfig config = context.getAppConfig();
+        DatabaseClient client = config.newSchemasDatabaseClient();
+        try {
+        	File schemasDataDir = config.getConfigDir().getBaseDir();
+
+        	logger.info("Loading schemas database data from dir: " + schemasDataDir);
+        	schemasDataLoader.loadSchemasData(schemasDataDir, new DefaultSchemasDataFinder(), client);
+
+        } finally {
+            client.release();
+        }
+	}
+
+	private void initializeDefaultSchemasDataLoader(CommandContext context) {
+	     logger.info("Initializing instance of DefaultSchemasLoader");
+	     this.schemasDataLoader = new DefaultSchemasDataLoader();
+	}
+
+}

src/test/java/com/marklogic/appdeployer/command/schemas/LoadSchemasDataTest.java

@@ -0,0 +1,32 @@
+package com.marklogic.appdeployer.command.schemas;
+
+import org.junit.Test;
+
+import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.command.Command;
+import com.marklogic.appdeployer.command.databases.DeployContentDatabasesCommand;
+import com.marklogic.appdeployer.command.databases.DeploySchemasDatabaseCommand;
+import com.marklogic.appdeployer.command.databases.DeployTriggersDatabaseCommand;
+import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
+
+public class LoadSchemasDataTest  extends AbstractAppDeployerTest {
+
+	@Test
+	public void testSchemaLoading() {
+        initializeAppDeployer(new DeploySchemasDatabaseCommand(), 
+        		new DeployTriggersDatabaseCommand(), 
+        		new DeployContentDatabasesCommand(1), 
+        		new DeployRestApiServersCommand(),
+        		newCommand());
+        appDeployer.deploy(appConfig);
+
+
+
+       //.undeploy(appConfig);
+    }
+
+	private Command newCommand() {
+		return new LoadSchemasDataCommand();
+	}
+
+}

src/test/resources/sample-app/src/main/ml-config/data/schemas/my.rules

@@ -0,0 +1,22 @@
+# Copyright 2014-2016 MarkLogic Corporation.  All Rights Reserved.
+
+prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
+
+tbox {
+  ?p rdfs:domain ?c .
+}
+
+rule "domain axioms" construct {
+  rdfs:domain rdfs:domain rdf:Property .
+  rdfs:domain rdfs:range rdfs:Class .
+} {}
+
+rule "domain rdfs2" construct {
+  ?x a ?c
+} {
+  ?x ?p ?y .
+  ?p rdfs:domain ?c
+}
+
+

src/test/resources/sample-app/src/main/ml-config/data/schemas/x.xsd

@@ -0,0 +1,2 @@
+<xsm>
+</xsm>

src/test/resources/sample-app/src/main/ml-config/databases/content-database.json

@@ -18,6 +18,8 @@
       "scalar-type": "int"
     }
   ],
+  "triple-index":true,
+  "collection-lexicon":true,
   "triggers-database": "%%TRIGGERS_DATABASE%%",
   "schema-database": "%%SCHEMAS_DATABASE%%"
 }