openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1853422 - in /openwebbeans/meecrowave/trunk: meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/ meecrowave-core/src/main/java/org/apache/meecrowave/ meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/ me...
Date Tue, 12 Feb 2019 08:48:46 GMT
Author: rmannibucau
Date: Tue Feb 12 08:48:45 2019
New Revision: 1853422

URL: http://svn.apache.org/viewvc?rev=1853422&view=rev
Log:
MEECROWAVE-182 renaming antijarlocking property to the actual tomcat one - and not the legacy
one

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-arquillian/src/main/java/org/apache/meecrowave/arquillian/MeecrowaveConfiguration.java
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
    openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
    openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
    openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.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=1853422&r1=1853421&r2=1853422&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
Tue Feb 12 08:48:45 2019
@@ -109,7 +109,7 @@ public class MeecrowaveConfiguration imp
     private Integer webSessionTimeout;
     private String webSessionCookieConfig;
     private boolean tomcatJspDevelopment;
-    private boolean antiJarLocking;
+    private boolean antiResourceLocking;
 
     // configurable cause when set to Local arquillian bypass some protocol configuration
cause of container default
     private String arquillianProtocol = "Servlet 3.1";
@@ -813,11 +813,11 @@ public class MeecrowaveConfiguration imp
         this.webSessionCookieConfig = webSessionCookieConfig;
     }
 
-    public boolean isAntiJarLocking() {
-        return antiJarLocking;
+    public boolean isAntiResourceLocking() {
+        return antiResourceLocking;
     }
 
-    public void setAntiJarLocking(final boolean antiJarLocking) {
-        this.antiJarLocking = antiJarLocking;
+    public void setAntiResourceLocking(final boolean antiResourceLocking) {
+        this.antiResourceLocking = antiResourceLocking;
     }
 }

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java?rev=1853422&r1=1853421&r2=1853422&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
Tue Feb 12 08:48:45 2019
@@ -191,7 +191,7 @@ public class Meecrowave implements AutoC
         final ProvidedLoader loader = new ProvidedLoader(classLoader, configuration.isTomcatWrapLoader());
         final Consumer<Context> builtInCustomizer = c -> {
             c.setLoader(loader);
-            if (configuration.antiJarLocking && StandardContext.class.isInstance(c))
{
+            if (configuration.antiResourceLocking && StandardContext.class.isInstance(c))
{
                 StandardContext.class.cast(c).setAntiResourceLocking(true);
             }
             configuration.getInitializers().forEach(i -> c.addServletContainerInitializer(i,
emptySet()));
@@ -1394,8 +1394,8 @@ public class Meecrowave implements AutoC
         @CliOption(name = "servlet-container-initializer", description = "ServletContainerInitializer
instances.")
         private Collection<ServletContainerInitializer> initializers = new ArrayList<>();
 
-        @CliOption(name = "tomcat-antijarlocking", description = "Should anti-jar-locking
be activated on StandardContext.")
-        private boolean antiJarLocking;
+        @CliOption(name = "tomcat-antiresourcelocking", description = "Should Tomcat anti
resource locking feature be activated on StandardContext.")
+        private boolean antiResourceLocking;
 
         @CliOption(name = "tomcat-context-configurer", description = "Configurers for all
webapps. The Consumer<Context> instances will be applied to all deployments.")
         private Collection<Consumer<Context>> contextConfigurers;
@@ -1419,12 +1419,12 @@ public class Meecrowave implements AutoC
             }));
         }
 
-        public boolean isAntiJarLocking() {
-            return antiJarLocking;
+        public boolean isAntiResourceLocking() {
+            return antiResourceLocking;
         }
 
-        public void setAntiJarLocking(final boolean antiJarLocking) {
-            this.antiJarLocking = antiJarLocking;
+        public void setAntiResourceLocking(final boolean antiResourceLocking) {
+            this.antiResourceLocking = antiResourceLocking;
         }
 
         public Collection<Consumer<Context>> getGlobalContextConfigurers() {

Modified: openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java?rev=1853422&r1=1853421&r2=1853422&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveExtension.java
Tue Feb 12 08:48:45 2019
@@ -100,14 +100,14 @@ public class MeecrowaveExtension {
     private Integer webSessionTimeout;
     private String webSessionCookieConfig;
     private boolean tomcatJspDevelopment;
-    private boolean antiJarLocking;
+    private boolean antiResourceLocking;
 
-    public boolean isAntiJarLocking() {
-        return antiJarLocking;
+    public boolean isAntiResourceLocking() {
+        return antiResourceLocking;
     }
 
-    public void setAntiJarLocking(final boolean antiJarLocking) {
-        this.antiJarLocking = antiJarLocking;
+    public void setAntiResourceLocking(final boolean antiResourceLocking) {
+        this.antiResourceLocking = antiResourceLocking;
     }
 
     public boolean isTomcatJspDevelopment() {

Modified: openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java?rev=1853422&r1=1853421&r2=1853422&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-gradle-plugin/src/main/java/org/apache/meecrowave/gradle/MeecrowaveTask.java
Tue Feb 12 08:48:45 2019
@@ -246,7 +246,7 @@ public class MeecrowaveTask extends Defa
 
     @Input
     @Optional
-    private boolean antiJarLocking = true;
+    private boolean antiResourceLocking = true;
 
     @Input
     @Optional
@@ -1237,11 +1237,11 @@ public class MeecrowaveTask extends Defa
         this.tomcatJspDevelopment = tomcatJspDevelopment;
     }
 
-    public boolean isAntiJarLocking() {
-        return antiJarLocking;
+    public boolean isAntiResourceLocking() {
+        return antiResourceLocking;
     }
 
-    public void setAntiJarLocking(final boolean antiJarLocking) {
-        this.antiJarLocking = antiJarLocking;
+    public void setAntiResourceLocking(final boolean antiResourceLocking) {
+        this.antiResourceLocking = antiResourceLocking;
     }
 }

Modified: openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java?rev=1853422&r1=1853421&r2=1853422&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-maven-plugin/src/main/java/org/apache/meecrowave/maven/MeecrowaveRunMojo.java
Tue Feb 12 08:48:45 2019
@@ -91,8 +91,8 @@ public class MeecrowaveRunMojo extends A
     @Parameter(property = "meecrowave.useTomcatDefaults", defaultValue = "true")
     private boolean useTomcatDefaults;
 
-    @Parameter(property = "meecrowave.antiJarLocking", defaultValue = "false")
-    private boolean antiJarLocking;
+    @Parameter(property = "meecrowave.antiResourceLocking", defaultValue = "false")
+    private boolean antiResourceLocking;
 
     @Parameter
     private Map<String, String> properties;



Mime
View raw message