Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [3623] [RHQ-1872] - disable license expiration by treating all valid licenses as perpetual ones;
|
From: <jma...@rh...> - 2009-04-05 04:00:11
|
<!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><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { 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 {background:#eeeeee;padding: 0 0 10px 0;} #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 .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { 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 {background:#eeeeee;padding: 0 0 10px 0;} #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 .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [3623] [RHQ-1872] - disable license expiration by treating all valid licenses as perpetual ones; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>3623</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-04-04 23:00:07 -0500 (Sat, 04 Apr 2009)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-1872] - disable license expiration by treating all valid licenses as perpetual ones; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseExpirationTagjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/ExpirationTag.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseLicensejava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/License.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseLicenseManagerjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseManager.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseLicenseStoreManagerjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseStoreManager.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseExpirationTagjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/ExpirationTag.java (3622 => 3623)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/ExpirationTag.java 2009-04-05 03:37:10 UTC (rev 3622) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/ExpirationTag.java 2009-04-05 04:00:07 UTC (rev 3623) </span><span class="lines">@@ -25,6 +25,7 @@ </span><span class="cx"> import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.util.xmlparser.XmlAttr; import org.rhq.core.util.xmlparser.XmlAttrException; import org.rhq.core.util.xmlparser.XmlTagInfo; </span><span class="lines">@@ -113,7 +114,7 @@ </span><span class="cx"> } protected void termValidated() { </span><span class="rem">- getLicense().setExpiration(_expMillis); </span><span class="add">+ //getLicense().setExpiration(_expMillis); </span><span class="cx"> getLicense().setTrial(trial); } } \ No newline at end of file </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseLicensejava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/License.java (3622 => 3623)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/License.java 2009-04-05 03:37:10 UTC (rev 3622) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/License.java 2009-04-05 04:00:07 UTC (rev 3623) </span><span class="lines">@@ -22,6 +22,7 @@ </span><span class="cx"> import java.util.ArrayList; import java.util.Collections; import java.util.List; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.clientapi.util.StringUtil; public final class License implements Serializable { </span><span class="lines">@@ -56,7 +57,7 @@ </span><span class="cx"> = "_{my*K|c~1kJ@apv!6l?MF9ZeH\"+#L&NC3Y`>BV0nERiA:DGdqQuh 2S<=WgtOf%r'[\\7s5o}UPT$(^bx)X]/-I4wj8;.z,"; protected License() { </span><span class="rem">- _expiration = 0; </span><span class="add">+ _expiration = EXPIRES_NEVER; </span><span class="cx"> } protected String getMasterKey() { </span><span class="lines">@@ -99,9 +100,11 @@ </span><span class="cx"> _licenseePhone = p; } </span><span class="add">+ /* </span><span class="cx"> protected void setExpiration(long ex) { _expiration = ex; } </span><span class="add">+ */ </span><span class="cx"> public boolean getIsPerpetualLicense() { return (_expiration == EXPIRES_NEVER); </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseLicenseManagerjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseManager.java (3622 => 3623)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseManager.java 2009-04-05 03:37:10 UTC (rev 3622) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseManager.java 2009-04-05 04:00:07 UTC (rev 3623) </span><span class="lines">@@ -23,7 +23,9 @@ </span><span class="cx"> import java.io.InputStream; import java.io.Serializable; import java.util.Date; </span><span class="add">+ </span><span class="cx"> import javax.naming.InitialContext; </span><span class="add">+ </span><span class="cx"> import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverlicenseLicenseStoreManagerjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseStoreManager.java (3622 => 3623)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseStoreManager.java 2009-04-05 03:37:10 UTC (rev 3622) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseStoreManager.java 2009-04-05 04:00:07 UTC (rev 3623) </span><span class="lines">@@ -125,11 +125,7 @@ </span><span class="cx"> throw new CorruptLicenseException(LRES.get(LRES.ERR_CORRUPT_VALIDATION)); } </span><span class="rem">- /* - * it's the same one, so take the previously calculated date instead (because it's a duration), but - * do not store anything (no need to) - */ - return Math.min(license.getLicenseExpiration(), expiration); </span><span class="add">+ return license.getLicenseExpiration(); </span><span class="cx"> } else { // can't update a real/regular license with a trial one throw new UpdateTrialLicenseException(LRES.get(LRES.ERR_TRIAL_VALIDATION)); </span> </pre> </div> </div> </body> </html> |