diff --git a/wizard-server-test/pom.xml b/wizard-server-test/pom.xml
index 02b1327..eac022f 100644
--- a/wizard-server-test/pom.xml
+++ b/wizard-server-test/pom.xml
@@ -34,23 +34,6 @@ This code is available under the Apache License, version 2: http://www.apache.or
embedded-redis
0.6
-
-
- org.cobbzilla
- restex
- 1.0.1-SNAPSHOT
-
-
- org.codehaus.jackson
- jackson-mapper-asl
-
-
- org.codehaus.jackson
- jackson-core-asl
-
-
-
-
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsApiRunnerListener.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsApiRunnerListener.java
deleted file mode 100644
index 34e5ebb..0000000
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsApiRunnerListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.cobbzilla.wizardtest.resources;
-
-import org.cobbzilla.restex.targets.TemplateCaptureTarget;
-import org.cobbzilla.wizard.client.script.ApiRunnerListenerBase;
-import org.cobbzilla.wizard.client.script.ApiScript;
-
-import java.util.Map;
-
-public class ApiDocsApiRunnerListener extends ApiRunnerListenerBase {
-
- private TemplateCaptureTarget apiDocs;
-
- @SuppressWarnings("unused") // called from ApiRunner copy constructor via reflection (which is called from ApiScriptMultiDriver.run)
- public ApiDocsApiRunnerListener(ApiDocsApiRunnerListener other) {
- super(other.getName());
- this.apiDocs = other.apiDocs;
- }
-
- public ApiDocsApiRunnerListener(String name, TemplateCaptureTarget apiDocs) {
- super(name);
- this.apiDocs = apiDocs;
- }
-
- @Override public void beforeCall(ApiScript script, Map ctx) {
- apiDocs.addNote(script.getComment());
- }
-
-}
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsModelSetupListener.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsModelSetupListener.java
deleted file mode 100644
index 18218e2..0000000
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsModelSetupListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.cobbzilla.wizardtest.resources;
-
-import lombok.AllArgsConstructor;
-import org.cobbzilla.restex.targets.TemplateCaptureTarget;
-import org.cobbzilla.wizard.model.Identifiable;
-import org.cobbzilla.wizard.model.entityconfig.EntityConfig;
-import org.cobbzilla.wizard.model.entityconfig.ModelSetupListenerBase;
-
-@AllArgsConstructor
-public class ApiDocsModelSetupListener extends ModelSetupListenerBase {
-
- private TemplateCaptureTarget apiDocs;
-
- protected void note(String s) { if (apiDocs != null) apiDocs.addNote(s); }
-
- @Override public void preCreate (EntityConfig entityConfig, Identifiable entity) { note("Create " + entityConfig.getName()); }
- @Override public void preUpdate (EntityConfig entityConfig, Identifiable entity) { note("Update " + entityConfig.getName()); }
-
- @Override public void preEntityConfig (String entityType) { note("Lookup EntityConfig for " + entityType); }
-
- @Override public void preLookup (Identifiable entity) { note("Checking to see if " + entity.getClass().getSimpleName() + " already exists: " + entity); }
-
-}
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsResourceIT.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsResourceIT.java
deleted file mode 100644
index 6444b92..0000000
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiDocsResourceIT.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.cobbzilla.wizardtest.resources;
-
-import lombok.Getter;
-import org.apache.http.client.HttpClient;
-import org.cobbzilla.restex.RestexClientConnectionManager;
-import org.cobbzilla.restex.targets.TemplateCaptureTarget;
-import org.cobbzilla.wizard.client.ApiClientBase;
-import org.cobbzilla.wizard.server.RestServer;
-import org.cobbzilla.wizard.server.config.PgRestServerConfiguration;
-import org.junit.After;
-import org.junit.AfterClass;
-
-public abstract class ApiDocsResourceIT>
- extends AbstractResourceIT {
-
- protected static boolean docsEnabled = true;
-
- protected static TemplateCaptureTarget apiDocs = new TemplateCaptureTarget("target/api-examples");
-
- @Getter(lazy=true) private final ApiClientBase api = initDocsApi();
- protected ApiClientBase initDocsApi() { return new ApiDocsApiClient(super.getApi()); }
-
- @After public void commitDocCapture () throws Exception { if (docsEnabled) apiDocs.commit(); }
-
- @AfterClass public static void finalizeDocCapture () throws Exception { if (docsEnabled) apiDocs.close(); }
-
- public static final ApiDocsApiRunnerListener apiDocsRunnerListener = initApiDocsApiRunnerListener();
-
- protected static ApiDocsApiRunnerListener initApiDocsApiRunnerListener() {
- return new ApiDocsApiRunnerListener("api-docs", apiDocs);
- }
-
- public static class ApiDocsApiClient extends ApiClientBase {
-
- @Override public HttpClient getHttpClient() {
- if (httpClient == null) httpClient = initHttpClient();
- return httpClient;
- }
- @Override public void setHttpClient(HttpClient httpClient) { this.httpClient = httpClient; }
-
- private final ApiClientBase api;
-
- public ApiDocsApiClient(ApiClientBase api) {
- super(api.getBaseUri());
- this.api = api;
- }
-
- protected HttpClient initHttpClient() {
- return docsEnabled ? new RestexClientConnectionManager(apiDocs).getHttpClient() : api.getHttpClient();
- }
-
- @Override public String getBaseUri() { return api.getBaseUri(); }
- }
-}
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
index 4ba0099..07b08c1 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
@@ -45,7 +45,7 @@ import static org.cobbzilla.wizard.model.entityconfig.ModelSetup.setupModel;
@Slf4j
public abstract class ApiModelTestBase>
- extends ApiDocsResourceIT
+ extends AbstractResourceIT
implements ApiScriptIncludeHandler {
protected String getModelPrefix() { return "models/"; }
@@ -68,11 +68,7 @@ public abstract class ApiModelTestBase getModelSetupListenerClass() { return ModelSetupListenerBase.class; }
@Getter(lazy=true) private final ModelSetupListener modelSetupListener = instantiate(getModelSetupListenerClass(), getConfiguration());
- public ApiRunnerMultiListener getApiListener() {
- final ApiRunnerMultiListener listener = new ApiRunnerMultiListener(getClass().getName());
- if (docsEnabled) listener.addApiListener(apiDocsRunnerListener);
- return listener;
- }
+ public ApiRunnerMultiListener getApiListener() { return new ApiRunnerMultiListener(getClass().getName()); }
@Before public void resetSystemClock() { setSystemTimeOffset(0); }