Author: andygumbrecht
Date: Mon Jul 21 20:37:13 2014
New Revision: 1612396
URL: http://svn.apache.org/r1612396
Log:
Keystore option
Modified:
tomee/tomee/branches/tomee-1.7.x/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.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=1612396&r1=1612395&r2=1612396&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
Mon Jul 21 20:37:13 2014
@@ -633,7 +633,11 @@ public abstract class AbstractTomEEMojo
String value = read(serverXml);
- File keystoreFile = new File(System.getProperty("user.home"),
".keystore");
+ File keystoreFile = new File(parser.keystore());
+
+ if (!keystoreFile.exists()) {
+ keystoreFile = new File(System.getProperty("user.home"),
".keystore");
+ }
if (!keystoreFile.exists()) {
keystoreFile = new File("target", ".keystore");
@@ -641,15 +645,14 @@ public abstract class AbstractTomEEMojo
final String keystoreFilePath = (keystoreFile.exists() ?
keystoreFile.getAbsolutePath() : "");
+
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\"
keystoreFile=\"" + keystoreFilePath + "\" />\n");
- }
-
- if (tomeeHttpsPort == null) {
+ } else if (tomeeHttpsPort == null) {
// avoid NPE
tomeeHttpsPort = 8443;
}
Modified:
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java?rev=1612396&r1=1612395&r2=1612396&view=diff
==============================================================================
---
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
(original)
+++
tomee/tomee/branches/tomee-1.7.x/tomee/tomee-util/src/main/java/org/apache/tomee/util/QuickServerXmlParser.java
Mon Jul 21 20:37:13 2014
@@ -27,8 +27,10 @@ import java.io.File;
import java.util.Map;
import java.util.TreeMap;
+@SuppressWarnings("UnusedDeclaration")
public class QuickServerXmlParser extends DefaultHandler {
private static final SAXParserFactory FACTORY =
SAXParserFactory.newInstance();
+
static {
FACTORY.setNamespaceAware(true);
FACTORY.setValidating(false);
@@ -41,6 +43,7 @@ public class QuickServerXmlParser extend
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;
+ private static final String KEYSTORE_KEY = "keystoreFile";
public static final String DEFAULT_HTTP_PORT = "8080";
public static final String DEFAULT_HTTPS_PORT = "8443";
@@ -48,6 +51,7 @@ public class QuickServerXmlParser extend
public static final String DEFAULT_AJP_PORT = "8009";
public static final String DEFAULT_HOST = "localhost";
public static final String DEFAULT_APP_BASE = "webapps";
+ public static final String DEFAULT_KEYSTORE = new
File(System.getProperty("user.home"), ".keystore").getAbsolutePath();
private final Map<String, String> values = new TreeMap<String,
String>(String.CASE_INSENSITIVE_ORDER);
@@ -57,6 +61,7 @@ public class QuickServerXmlParser extend
values.put(AJP_KEY, DEFAULT_AJP_PORT);
values.put(HOST_KEY, DEFAULT_HOST);
values.put(APP_BASE_KEY, DEFAULT_APP_BASE);
+ values.put(KEYSTORE_KEY, DEFAULT_KEYSTORE);
}
@Override
@@ -78,11 +83,17 @@ public class QuickServerXmlParser extend
}
final String port = attributes.getValue("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);
}
+
+ final String keystore = attributes.getValue("keystoreFile");
+ if (null != keystore) {
+ values.put(KEYSTORE_KEY, keystore);
+ }
} else if ("Host".equalsIgnoreCase(localName)) {
final String host = attributes.getValue("name");
if (host != null) {
@@ -142,12 +153,16 @@ public class QuickServerXmlParser extend
return value(HOST_KEY, DEFAULT_HOST);
}
+ public String keystore() {
+ return value(KEYSTORE_KEY, DEFAULT_KEYSTORE);
+ }
+
public String value(final String key, final String defaultValue) {
- final String port = values.get(key);
- if (port == null) {
+ final String val = values.get(key);
+ if (val == null) {
return defaultValue;
}
- return port;
+ return val;
}
public String securedValue(final String key, final String defaultValue) {
