You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2017/11/12 16:24:04 UTC

svn commit: r1815028 - /openwebbeans/meecrowave/trunk/meecrowave-junit/src/main/java/org/apache/meecrowave/junit/MeecrowaveRule.java

Author: rmannibucau
Date: Sun Nov 12 16:24:03 2017
New Revision: 1815028

URL: http://svn.apache.org/viewvc?rev=1815028&view=rev
Log:
MEECROWAVE-80 adding docBase as configuration of the rule

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-junit/src/main/java/org/apache/meecrowave/junit/MeecrowaveRule.java

Modified: openwebbeans/meecrowave/trunk/meecrowave-junit/src/main/java/org/apache/meecrowave/junit/MeecrowaveRule.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-junit/src/main/java/org/apache/meecrowave/junit/MeecrowaveRule.java?rev=1815028&r1=1815027&r2=1815028&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-junit/src/main/java/org/apache/meecrowave/junit/MeecrowaveRule.java (original)
+++ openwebbeans/meecrowave/trunk/meecrowave-junit/src/main/java/org/apache/meecrowave/junit/MeecrowaveRule.java Sun Nov 12 16:24:03 2017
@@ -18,11 +18,17 @@
  */
 package org.apache.meecrowave.junit;
 
+import org.apache.catalina.Context;
 import org.apache.meecrowave.Meecrowave;
 
+import java.io.File;
+import java.util.function.Consumer;
+
 public class MeecrowaveRule extends MeecrowaveRuleBase<MeecrowaveRule> {
     private final Meecrowave.Builder configuration;
     private final String context;
+    private File docBase;
+    private Consumer<Context> customizer;
 
     public MeecrowaveRule() {
         this(new Meecrowave.Builder().randomHttpPort(), "");
@@ -33,6 +39,16 @@ public class MeecrowaveRule extends Meec
         this.context = context;
     }
 
+    public MeecrowaveRule setDocBase(File docBase) {
+        this.docBase = docBase;
+        return this;
+    }
+
+    public MeecrowaveRule setCustomizer(Consumer<Context> customizer) {
+        this.customizer = customizer;
+        return this;
+    }
+
     @Override
     public Meecrowave.Builder getConfiguration() {
         return configuration;
@@ -40,6 +56,9 @@ public class MeecrowaveRule extends Meec
 
     @Override
     protected AutoCloseable onStart() {
-        return new Meecrowave(configuration).bake(context);
+        final Meecrowave meecrowave = new Meecrowave(configuration);
+        meecrowave.start();
+        meecrowave.deployClasspath(new Meecrowave.DeploymentMeta(context, docBase, customizer));
+        return meecrowave;
     }
 }