Initial Contribution Signed-off-by: Vinay Vishal <vinay.vishal@oracle.com>

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
new file mode 100644
index 0000000..a6a09a6
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+
+package com.acme;
+
+import admin.AdminBaseDevTest;
+import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/*
+ * CLI Dev test 
+ * @author mvatkina
+ */
+public class Client extends ClientBase {
+
+    public static void main(String[] args) {
+
+        if ("prepare".equals(args[0])) {
+            (new Client()).prepare(args[1]);
+        } else if ("deploy".equals(args[0])) {
+            (new Client()).deploy(args[1]);
+        } else if ("undeploy".equals(args[0])) {
+            (new Client()).undeploy(args[1]);
+        } else if ("insert_xa_data".equals(args[0])) {
+            (new Client()).insert_xa_data(args[1], args[2], args[3]);
+        } else {
+            (new Client()).process(args);
+        }
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Unit test for transaction recovery with MDBs";
+    }
+
+    public void prepare(String enable_delegate) {
+        try {
+            asadmin("create-cluster", CLUSTER_NAME);
+            asadmin("set", "configs.config." + CLUSTER_NAME + "-config.transaction-service.property.db-logging-resource=" + NONTX_RESOURCE);
+            if (Boolean.valueOf(enable_delegate)) {
+                asadmin("set", "configs.config." + CLUSTER_NAME + "-config.transaction-service.property.delegated-recovery=true");
+            }
+            asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE1_NAME);
+            asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE2_NAME);
+            System.out.println("Creating JMS resources");
+            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF");
+            asadmin("create-jmsdest", "--target", CLUSTER_NAME, "--desttype", "ejb_mdb_Queue");
+            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue");
+            System.out.println("Finished creating JMS resources");
+
+            if (Boolean.getBoolean("enableShoalLogger")) {
+                asadmin("set-log-levels", "ShoalLogger=FINER");
+                asadmin("set-log-levels", "--target", CLUSTER_NAME, "ShoalLogger=FINER");
+            }
+            asadmin("create-resource-ref", "--target", CLUSTER_NAME, XA_RESOURCE);
+            asadmin("create-resource-ref", "--target", CLUSTER_NAME, NONTX_RESOURCE);
+            asadmin("create-resource-ref", "--target", CLUSTER_NAME, "jms/ejb_mdb_QCF");
+            asadmin("create-resource-ref", "--target", CLUSTER_NAME, "jms/ejb_mdb_Queue");
+            asadmin("start-cluster", CLUSTER_NAME);
+            System.out.println("Started cluster.");
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void deploy(String path) {
+        try {
+            asadmin("deploy", "--target", CLUSTER_NAME, path);
+            System.out.println("Deployed " + path);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void insert_xa_data(String appname, String instance, String sendMsg) {
+        if (Boolean.valueOf(sendMsg))
+            execute(appname, instance, "TestServlet?2", "true");
+        else
+            execute(appname, instance, "TestServlet", "true");
+    }
+
+    public void verify(String appname, String instance, String operation, String servlet) {
+        stat.addDescription("transaction-ee-" + operation);
+
+        boolean res = execute(appname, instance, servlet, "RESULT:6");
+
+        stat.addStatus("transaction-ee-dblogs-mdb" + operation, ((res)? stat.PASS : stat.FAIL));
+        stat.printSummary("transaction-ee-dblogs-mdb" + operation);
+    }
+
+    @Override
+    public void clean(String name) {
+        try {
+            asadmin("delete-jms-resource", "--target", CLUSTER_NAME, "jms/ejb_mdb_QCF");
+            asadmin("delete-jms-resource", "--target", CLUSTER_NAME, "jms/ejb_mdb_Queue");
+            asadmin("delete-jmsdest", "--target", CLUSTER_NAME, "ejb_mdb_Queue");
+            System.out.println("Deleted JMS resources.");
+
+            super.clean(null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void undeploy(String name) {
+        try {
+            asadmin("undeploy", "--target", CLUSTER_NAME, name);
+            System.out.println("Undeployed " + name);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}