openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1765585 - in /openwebbeans/microwave/trunk: ./ microwave-core/ microwave-core/src/main/java/org/apache/microwave/ microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/ microwave-maven-plugin/src/main/java/org/apache/microwave/...
Date Wed, 19 Oct 2016 12:50:05 GMT
Author: rmannibucau
Date: Wed Oct 19 12:50:05 2016
New Revision: 1765585

URL: http://svn.apache.org/viewvc?rev=1765585&view=rev
Log:
tomcat jaspic api(snapshot)

Modified:
    openwebbeans/microwave/trunk/microwave-core/pom.xml
    openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
    openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
    openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
    openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
    openwebbeans/microwave/trunk/pom.xml

Modified: openwebbeans/microwave/trunk/microwave-core/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/pom.xml?rev=1765585&r1=1765584&r2=1765585&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/pom.xml (original)
+++ openwebbeans/microwave/trunk/microwave-core/pom.xml Wed Oct 19 12:50:05 2016
@@ -71,15 +71,16 @@
       <version>1.0-alpha-1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jaspic_1.0_spec</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-el-api</artifactId>
       <version>${tomcat.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jaspic-api</artifactId>
+      <!--<version>${tomcat.version}</version>-->
+      <version>9.0-SNAPSHOT</version>
+    </dependency>
 
     <dependency>
       <groupId>commons-cli</groupId>

Modified: openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java?rev=1765585&r1=1765584&r2=1765585&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
(original)
+++ openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.java
Wed Oct 19 12:50:05 2016
@@ -66,7 +66,6 @@ import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.security.Security;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -184,9 +183,6 @@ public class Microwave implements AutoCl
     }
 
     public Microwave start() {
-        if (!configuration.skipJaspicProperty) {
-            Security.setProperty("authconfigprovider.factory", "org.apache.catalina.authenticator.jaspic.AuthConfigFactoryImpl");
-        }
         if (configuration.quickSession) {
             tomcat = new TomcatWithFastSessionIDs();
         } else {
@@ -615,9 +611,6 @@ public class Microwave implements AutoCl
         @CliOption(name = "jaxrs-provider-setup", description = "Should default JAX-RS provider
be configured")
         private boolean jaxrsProviderSetup;
 
-        @CliOption(name = "jaspic-skip-override", description = "Should Tomcat jaspic AuthConfigFactory
implementation not be forced (global for the JVM)")
-        public boolean skipJaspicProperty;
-
         public Builder() { // load defaults
             loadFrom("microwave.properties");
         }
@@ -874,14 +867,6 @@ public class Microwave implements AutoCl
             this.cdiConversation = cdiConversation;
         }
 
-        public boolean isSkipJaspicProperty() {
-            return skipJaspicProperty;
-        }
-
-        public void setSkipJaspicProperty(final boolean skipJaspicProperty) {
-            this.skipJaspicProperty = skipJaspicProperty;
-        }
-
         public Builder randomHttpPort() {
             try (final ServerSocket serverSocket = new ServerSocket(0)) {
                 this.httpPort = serverSocket.getLocalPort();

Modified: openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java?rev=1765585&r1=1765584&r2=1765585&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
(original)
+++ openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveExtension.java
Wed Oct 19 12:50:05 2016
@@ -58,9 +58,16 @@ public class MicrowaveExtension {
     private String jaxrsMapping;
     private boolean cdiConversation;
     private boolean skip;
-    private boolean skipJaspicProperty;
     private boolean jaxrsProviderSetup = true;
 
+    public boolean isJaxrsProviderSetup() {
+        return jaxrsProviderSetup;
+    }
+
+    public void setJaxrsProviderSetup(final boolean jaxrsProviderSetup) {
+        this.jaxrsProviderSetup = jaxrsProviderSetup;
+    }
+
     public String getContext() {
         return context;
     }
@@ -324,12 +331,4 @@ public class MicrowaveExtension {
     public void setSkip(final boolean skip) {
         this.skip = skip;
     }
-
-    public boolean isSkipJaspicProperty() {
-        return skipJaspicProperty;
-    }
-
-    public void setSkipJaspicProperty(final boolean skipJaspicProperty) {
-        this.skipJaspicProperty = skipJaspicProperty;
-    }
 }

Modified: openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java?rev=1765585&r1=1765584&r2=1765585&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
(original)
+++ openwebbeans/microwave/trunk/microwave-gradle-plugin/src/main/java/org/apache/microwave/gradle/MicrowaveTask.java
Wed Oct 19 12:50:05 2016
@@ -177,10 +177,6 @@ public class MicrowaveTask extends Defau
 
     @Input
     @Optional
-    private boolean skipJaspicProperty;
-
-    @Input
-    @Optional
     private List<File> modules;
 
     @Input

Modified: openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java?rev=1765585&r1=1765584&r2=1765585&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
(original)
+++ openwebbeans/microwave/trunk/microwave-maven-plugin/src/main/java/org/apache/microwave/maven/MicrowaveRunMojo.java
Wed Oct 19 12:50:05 2016
@@ -141,9 +141,6 @@ public class MicrowaveRunMojo extends Ab
     @Parameter(name = "microwave.skip")
     private boolean skip;
 
-    @Parameter(name = "microwave.skip-jaspic-setup", defaultValue = "false")
-    private boolean skipJaspicProperty;
-
     @Parameter(name = "microwave.jaxrs-provider-setup", defaultValue = "true")
     private boolean jaxrsProviderSetup;
 

Modified: openwebbeans/microwave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/pom.xml?rev=1765585&r1=1765584&r2=1765585&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/pom.xml (original)
+++ openwebbeans/microwave/trunk/pom.xml Wed Oct 19 12:50:05 2016
@@ -56,4 +56,17 @@
       </plugin>
     </plugins>
   </build>
+
+  <repositories>
+    <repository>
+      <id>asf-snapshot</id>
+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
 </project>



Mime
View raw message