You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by Romain Manni-Bucau <rm...@gmail.com> on 2014/07/19 19:19:33 UTC
Fwd: svn commit: r1611909 - /tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Hmm, not sure
if user wants https and https is commented then uncomment the block
otherwise use server.xml as it. That's what was here
Romain Manni-Bucau
Twitter: @rmannibucau
Blog: http://rmannibucau.wordpress.com/
LinkedIn: http://fr.linkedin.com/in/rmannibucau
Github: https://github.com/rmannibucau
---------- Forwarded message ----------
From: <an...@apache.org>
Date: 2014-07-19 15:05 GMT+02:00
Subject: svn commit: r1611909 -
/tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
To: commits@tomee.apache.org
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));
}