svn commit: r1387566 - in /openejb/trunk/openejb: maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java

[rmannibucau]

Author: rmannibucau
Date: Wed Sep 19 12:54:21 2012
New Revision: 1387566

URL: http://svn.apache.org/viewvc?rev=1387566&view=rev
Log:
managing https port in tomee-maven-plugin (workaround was to declare https 
connector before http)

Modified:
    
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
    
openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java

Modified: 
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1387566&r1=1387565&r2=1387566&view=diff
==============================================================================
--- 
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 (original)
+++ 
openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 Wed Sep 19 12:54:21 2012
@@ -142,6 +142,11 @@ public abstract class AbstractTomEEMojo 
     protected int tomeeAjpPort = 8009;
 
     /**
+     * @parameter expression="${tomee-plugin.https}" default-value="8443"
+     */
+    protected int tomeeHttpsPort = 8080;
+
+    /**
      * @parameter expression="${tomee-plugin.args}"
      */
     protected String args;
@@ -460,6 +465,7 @@ public abstract class AbstractTomEEMojo 
             writer = new FileWriter(serverXml);
             writer.write(value
                     .replace(parser.http(), Integer.toString(tomeeHttpPort))
+                    .replace(parser.https(), Integer.toString(tomeeHttpsPort))
                     .replace(parser.ajp(), Integer.toString(tomeeAjpPort))
                     .replace(parser.stop(), 
Integer.toString(tomeeShutdownPort))
                     .replace(parser.host(), tomeeHost)

Modified: 
openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java?rev=1387566&r1=1387565&r2=1387566&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
 Wed Sep 19 12:54:21 2012
@@ -35,12 +35,14 @@ public class QuickServerXmlParser extend
 
     private static final String STOP_KEY = "STOP";
     private static final String HTTP_KEY = "HTTP";
+    private static final String SECURED_SUFFIX = "S";
     private static final String AJP_KEY = "AJP";
     private static final String HOST_KEY = "host";
     private static final String APP_BASE_KEY = "app-base";
     private static final String DEFAULT_CONNECTOR_KEY = HTTP_KEY;
 
     public static final String DEFAULT_HTTP_PORT = "8080";
+    public static final String DEFAULT_HTTPS_PORT = "8443";
     public static final String DEFAULT_STOP_PORT = "8005";
     public static final String DEFAULT_AJP_PORT = "8009";
     public static final String DEFAULT_HOST = "localhost";
@@ -74,7 +76,12 @@ public class QuickServerXmlParser extend
                 protocol = protocol.substring(0, protocol.indexOf("/"));
             }
             final String port = attributes.getValue("port");
-            values.put(protocol.toUpperCase(), port);
+            final String ssl = attributes.getValue("secure");
+            if (ssl == null || "false".equalsIgnoreCase(ssl)) {
+                values.put(protocol.toUpperCase(), port);
+            } else {
+                values.put(protocol.toUpperCase() + SECURED_SUFFIX, port);
+            }
         } else if ("Host".equalsIgnoreCase(localName)) {
             final String host = attributes.getValue("name");
             if (host != null) {
@@ -103,6 +110,10 @@ public class QuickServerXmlParser extend
         return value(HTTP_KEY, DEFAULT_HTTP_PORT);
     }
 
+    public String https() { // enough common to be exposed as method
+        return securedValue(HTTP_KEY, DEFAULT_HTTPS_PORT);
+    }
+
     public String ajp() {
         return value(AJP_KEY, DEFAULT_AJP_PORT);
     }
@@ -119,7 +130,7 @@ public class QuickServerXmlParser extend
         return value(HOST_KEY, DEFAULT_HOST);
     }
 
-    private String value(final String key, final String defaultValue) {
+    public String value(final String key, final String defaultValue) {
         final String port = values.get(key);
         if (port == null) {
             return defaultValue;
@@ -127,6 +138,10 @@ public class QuickServerXmlParser extend
         return port;
     }
 
+    public String securedValue(final String key, final String defaultValue) {
+        return value(key + SECURED_SUFFIX, defaultValue);
+    }
+
     @Override
     public String toString() {
         return "QuickServerXmlParser" + values;