openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1780337 - in /openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian: MeecrowaveConfiguration.java MeecrowaveContainer.java
Date Thu, 26 Jan 2017 08:01:34 GMT
Author: rmannibucau
Date: Thu Jan 26 08:01:33 2017
New Revision: 1780337

URL: http://svn.apache.org/viewvc?rev=1780337&view=rev
Log:
MEECROWAVE-11 allowing to configure container default protocol in arquillian

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
    openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveContainer.java

Modified: openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java?rev=1780337&r1=1780336&r2=1780337&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
Thu Jan 26 08:01:33 2017
@@ -103,6 +103,9 @@ public class MeecrowaveConfiguration imp
     private boolean injectServletContainerInitializer = true;
     private String tomcatAccessLogPattern;
 
+    // configurable cause when set to Local arquillian bypass some protocol configuration
cause of container default
+    private String arquillianProtocol = "Servlet 3.1";
+
     @Override
     public void validate() throws ConfigurationException {
         // no-op
@@ -737,4 +740,12 @@ public class MeecrowaveConfiguration imp
     public void setTomcatAccessLogPattern(final String tomcatAccessLogPattern) {
         this.tomcatAccessLogPattern = tomcatAccessLogPattern;
     }
+
+    public String getArquillianProtocol() {
+        return arquillianProtocol;
+    }
+
+    public void setArquillianProtocol(final String arquillianProtocol) {
+        this.arquillianProtocol = arquillianProtocol;
+    }
 }

Modified: openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveContainer.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveContainer.java?rev=1780337&r1=1780336&r2=1780337&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveContainer.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveContainer.java
Thu Jan 26 08:01:33 2017
@@ -38,6 +38,7 @@ import static java.util.Optional.ofNulla
 public class MeecrowaveContainer implements DeployableContainer<MeecrowaveConfiguration>
{
     private Meecrowave.Builder configuration;
     private Meecrowave container;
+    private ProtocolDescription defaultProtocol;
 
     @Override
     public Class<MeecrowaveConfiguration> getConfigurationClass() {
@@ -47,6 +48,7 @@ public class MeecrowaveContainer impleme
     @Override
     public void setup(final MeecrowaveConfiguration configuration) {
         this.configuration = configuration.toMeecrowaveConfiguration();
+        this.defaultProtocol = new ProtocolDescription(configuration.getArquillianProtocol());
     }
 
     @Override
@@ -62,7 +64,7 @@ public class MeecrowaveContainer impleme
 
     @Override
     public ProtocolDescription getDefaultProtocol() {
-        return new ProtocolDescription("Servlet 3.1");
+        return defaultProtocol;
     }
 
     @Override



Mime
View raw message