svn commit: r1425973 - /openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

[rm...@apache.org]

Author: rmannibucau
Date: Wed Dec 26 17:23:56 2012
New Revision: 1425973

URL: http://svn.apache.org/viewvc?rev=1425973&view=rev
Log:
TOMEE-681 ensure ssl connector is here when configured with tomee mvn plugin

Modified:
    openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.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=1425973&r1=1425972&r2=1425973&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 Dec 26 17:23:56 2012
@@ -117,8 +117,8 @@ public abstract class AbstractTomEEMojo 
     @Parameter(property = "tomee-plugin.ajp", defaultValue = "8009")
     protected int tomeeAjpPort = 8009;
 
-    @Parameter(property = "tomee-plugin.https", defaultValue = "8443")
-    protected int tomeeHttpsPort = 8080;
+    @Parameter(property = "tomee-plugin.https")
+    protected Integer tomeeHttpsPort;
 
     @Parameter(property = "tomee-plugin.args")
     protected String args;
@@ -421,9 +421,23 @@ public abstract class AbstractTomEEMojo 
 
     private void overrideAddresses() {
         final File serverXml = new File(catalinaBase, "conf/server.xml");
-        final String value = read(serverXml);
         final QuickServerXmlParser parser = QuickServerXmlParser.parse(serverXml);
 
+        String value = read(serverXml);
+
+        if (tomeeHttpsPort != null && tomeeHttpsPort > 0 && parser.value("HTTPS", null) == null) {
+            // ensure connector is not commented
+            value = value.replace("<Service name=\"Catalina\">", "<Service name=\"Catalina\">\n"
+                    + "    <Connector port=\"" + tomeeHttpsPort + "\" protocol=\"HTTP/1.1\" SSLEnabled=\"true\"\n" +
+                    "                scheme=\"https\" secure=\"true\"\n" +
+                    "                clientAuth=\"false\" sslProtocol=\"TLS\" />\n");
+        }
+
+        if (tomeeHttpsPort == null) {
+            // avoid NPE
+            tomeeHttpsPort = 8443;
+        }
+
         FileWriter writer = null;
         try {
             writer = new FileWriter(serverXml);