[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openam-commit
Subject: [CommitOpenAM] [16164] trunk/openam-agents/jee-agents/jee-agents-jboss/jee-agents-jboss-v7
From: noreply () forgerock ! org
Date: 2015-10-22 3:51:21
Message-ID: 20151022035121.9775B20C82 () sources2 ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[16164] trunk/openam-agents/jee-agents/jee-agents-jboss/jee-agents-jboss-v7/src/main/java/org/forgerock/openam/agents/jboss/install/JBossValidator.java: \
Enable installation on Wildvly v8 and v9</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openam/?cs=16164">16164</a></dd> \
<dt>Author</dt> <dd>markdr</dd> <dt>Date</dt> <dd>2015-10-22 04:51:21 +0100 (Thu, 22 \
Oct 2015)</dd> </dl>
<h3>Log Message</h3>
<pre>Enable installation on Wildvly v8 and v9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopenamagentsjeeagentsjeeagentsjbossjeeagentsjbossv7srcmainjavaorgfo \
rgerockopenamagentsjbossinstallJBossValidatorjava">trunk/openam-agents/jee-agents/jee- \
agents-jboss/jee-agents-jboss-v7/src/main/java/org/forgerock/openam/agents/jboss/install/JBossValidator.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopenamagentsjeeagentsjeeagentsjbossjeeagentsjbossv7srcmainjavaorgforgerockopenamagentsjbossinstallJBossValidatorjava"></a>
<div class="modfile"><h4>Modified: \
trunk/openam-agents/jee-agents/jee-agents-jboss/jee-agents-jboss-v7/src/main/java/org/forgerock/openam/agents/jboss/install/JBossValidator.java \
(16163 => 16164)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/openam-agents/jee-agents/jee-agents-jboss/jee-agents-jboss-v7/src/main/java/org/forgerock/openam/agents/jboss/install/JBossValidator.java 2015-10-20 \
13:56:41 UTC (rev 16163)
+++ trunk/openam-agents/jee-agents/jee-agents-jboss/jee-agents-jboss-v7/src/main/java/org/forgerock/openam/agents/jboss/install/JBossValidator.java 2015-10-22 \
03:51:21 UTC (rev 16164) </span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
</span><span class="cx"> *
</span><del>- * Copyright (c) 2013 ForgeRock, Inc. All Rights Reserved
</del><ins>+ * Copyright (c) 2013-2015 ForgeRock AS. All Rights Reserved
</ins><span class="cx"> *
</span><span class="cx"> * The contents of this file are subject to the terms
</span><span class="cx"> * of the Common Development and Distribution License
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> import java.io.InputStreamReader;
</span><span class="cx"> import java.util.Map;
</span><span class="cx"> import org.forgerock.agents.tools.jboss.CommonConstants;
</span><ins>+import org.forgerock.openam.utils.IOUtils;
+
</ins><span class="cx"> import static \
org.forgerock.openam.agents.jboss.install.InstallerConstants.*; </span><span \
class="cx"> </span><span class="cx"> /**
</span><span class="lines">@@ -110,7 +112,7 @@
</span><span class="cx"> Debug.log("Command output:");
</span><span class="cx"> while ((line = br.readLine()) != null) {
</span><span class="cx"> Debug.log(line);
</span><del>- if (line.contains("AS 7") || \
line.contains("Application Server 7")) { </del><ins>+ if \
(isValidVersion(line)) { </ins><span class="cx"> status = \
ValidationResultStatus.STATUS_SUCCESS; </span><span class="cx"> \
message = LocalizedMessage.get(LOC_VERSION_VALID, BUNDLE_NAME); </span><span \
class="cx"> break; </span><span class="lines">@@ -119,12 +121,7 \
@@ </span><span class="cx"> } catch (IOException ioe) {
</span><span class="cx"> Debug.log("An IOException occurred while \
verifying JBoss version", ioe); </span><span class="cx"> } finally {
</span><del>- if (is != null) {
- try {
- is.close();
- } catch (IOException ioe) {
- }
- }
</del><ins>+ IOUtils.closeIfNotNull(is);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return new ValidationResult(status, null, message);
</span><span class="lines">@@ -148,4 +145,19 @@
</span><span class="cx"> throw new \
InstallException(LocalizedMessage.get(LOC_VA_ERR_VAL_METHOD_NOT_FOUND), ex); \
</span><span class="cx"> } </span><span class="cx"> }
</span><ins>+
+ private boolean isValidVersion(String line) {
+
+ if (line.contains("AS 7") || line.contains("Application \
Server 7")) { + return true;
+ }
+
+ if (line.contains("WildFly")) {
+ if (line.contains(" 8.") || line.contains(" 9.")) {
+ return true;
+ }
+ }
+
+ return false;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
CommitOpenAM mailing list
CommitOpenAM@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commitopenam
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic