svn commit: r1611909 - /tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

[andygumbrecht]

Author: andygumbrecht
Date: Sat Jul 19 13:05:13 2014
New Revision: 1611909

URL: http://svn.apache.org/r1611909
Log:
Don't configure https unless specified - Looks like a typo, but will confirm 
with author.

Modified:
    
tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1611909&r1=1611908&r2=1611909&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
 Sat Jul 19 13:05:13 2014
@@ -633,7 +633,7 @@ public abstract class AbstractTomEEMojo 
 
         String value = read(serverXml);
 
-        if (tomeeHttpsPort != null && tomeeHttpsPort > 0 && 
parser.value("HTTPS", null) == null) {
+        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" +
@@ -753,9 +753,9 @@ public abstract class AbstractTomEEMojo 
 
             server.setPortStartup(tomeeHttpPort);
 
-            getLog().info("Running '" + 
getClass().getSimpleName().replace("TomEEMojo", "").toLowerCase(Locale.ENGLISH)
+            getLog().info("Running '" + 
getClass().getName().replace("TomEEMojo", "").toLowerCase(Locale.ENGLISH)
                 + "'. Configured TomEE in plugin is " + tomeeHost + ":" + 
tomeeHttpPort
-                + " (plugin shutdown port is " + tomeeShutdownPort + ")");
+                + " (plugin shutdown port is " + tomeeShutdownPort + ") " + 
tomeeHttpsPort);
         } else {
             getLog().info("Running '" + 
getClass().getSimpleName().replace("TomEEMojo", 
"").toLowerCase(Locale.ENGLISH));
         }