openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1768658 - in /openwebbeans/microwave/trunk: microwave-core/pom.xml microwave-core/src/main/java/org/apache/microwave/Microwave.java pom.xml
Date Tue, 08 Nov 2016 10:41:07 GMT
Author: rmannibucau
Date: Tue Nov  8 10:41:07 2016
New Revision: 1768658

URL: http://svn.apache.org/viewvc?rev=1768658&view=rev
Log:
tomcat upgrade

Modified:
    openwebbeans/microwave/trunk/microwave-core/pom.xml
    openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/Microwave.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=1768658&r1=1768657&r2=1768658&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/pom.xml (original)
+++ openwebbeans/microwave/trunk/microwave-core/pom.xml Tue Nov  8 10:41:07 2016
@@ -33,7 +33,7 @@
   <name>Microwave :: Core</name>
 
   <properties>
-    <tomcat.version>9.0.0.M11</tomcat.version>
+    <tomcat.version>9.0.0.M13</tomcat.version>
     <openwebbeans.version>1.7.1-SNAPSHOT</openwebbeans.version>
     <cxf.version>3.1.9-SNAPSHOT</cxf.version>
     <johnzon.version>0.9.5</johnzon.version>
@@ -324,4 +324,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

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=1768658&r1=1768657&r2=1768658&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
Tue Nov  8 10:41:07 2016
@@ -19,9 +19,7 @@
 package org.apache.microwave;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.Engine;
 import org.apache.catalina.Globals;
-import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Manager;
@@ -425,7 +423,6 @@ public class Microwave implements AutoCl
                 host.setWorkDir(new File(base, "work").getAbsolutePath());
             }
             tomcat.setHost(host);
-            tomcat.getEngine().addChild(host);
         }
 
         if (configuration.realm != null) {
@@ -1531,27 +1528,15 @@ public class Microwave implements AutoCl
     }
 
     private static class InternalTomcat extends Tomcat {
+        private Connector connector;
+
         private void server(final Server s) {
             server = s;
-            if (service == null) {
-                final Service[] services = server.findServices();
-                if (services.length > 0) {
-                    service = services[0];
-                    if (service.getContainer() != null) {
-                        engine = Engine.class.cast(service.getContainer());
-                        final org.apache.catalina.Container[] hosts = engine.findChildren();
-                        if (hosts.length > 0) {
-                            host = Host.class.cast(hosts[0]);
-                        }
-                    }
-                }
-                if (service.findConnectors().length > 0) {
-                    connector = service.findConnectors()[0];
-                }
-            }
+            connector = server != null && server.findServices().length > 0 &&
server.findServices()[0].findConnectors().length > 0 ?
+                    server.findServices()[0].findConnectors()[0] : null;
         }
 
-        public Connector getRawConnector() {
+        Connector getRawConnector() {
             return connector;
         }
     }

Modified: openwebbeans/microwave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/pom.xml?rev=1768658&r1=1768657&r2=1768658&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/pom.xml (original)
+++ openwebbeans/microwave/trunk/pom.xml Tue Nov  8 10:41:07 2016
@@ -64,6 +64,14 @@
           <target>1.8</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <trimStackTrace>false</trimStackTrace>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 



Mime
View raw message