Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote-tracking branch 'origin/master' into preemptive-auth-test

  • Loading branch information...
commit 3b43a244a5613379b7476d3e1377af4d9522a156 2 parents 8bc4f36 + fba49a7
Tamas Cservenak cstamas authored
11 nexus-oss-webapp/src/main/resources/content/bin/jsw/conf/wrapper.conf
@@ -26,11 +26,12 @@ wrapper.java.classpath.3=./conf/
26 26 wrapper.java.library.path.1=bin/jsw/lib
27 27
28 28 # Additional JVM parameters (tune if needed, but match the sequence of numbers!)
29   -#wrapper.java.additional.1=-Xdebug
30   -#wrapper.java.additional.2=-Xnoagent
31   -#wrapper.java.additional.3=-Djava.compiler=NONE
32   -#wrapper.java.additional.4=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
33   -#wrapper.java.additional.5=-XX:+HeapDumpOnOutOfMemoryError
  29 +wrapper.java.additional.1=-Djava.net.preferIPv4Stack=true
  30 +#wrapper.java.additional.2=-Xdebug
  31 +#wrapper.java.additional.3=-Xnoagent
  32 +#wrapper.java.additional.4=-Djava.compiler=NONE
  33 +#wrapper.java.additional.5=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
  34 +#wrapper.java.additional.6=-XX:+HeapDumpOnOutOfMemoryError
34 35
35 36 wrapper.app.parameter.1=./conf/jetty.xml
36 37
2  ...est-harness-launcher/src/main/java/org/sonatype/nexus/integrationtests/AbstractNexusIntegrationTest.java
@@ -164,6 +164,8 @@
164 164
165 165 // guice finalizer turned OFF
166 166 System.setProperty( "guice.executor.class", "NONE" );
  167 + // NEXUS-5660 test with ipv4 as app runs with this set now
  168 + System.setProperty( "java.net.preferIPv4Stack", "true" );
167 169 }
168 170
169 171 static
31 nexus-webapp/src/main/webapp/js/ext/form/field.js
@@ -16,10 +16,12 @@ Ext.override(Ext.form.Field, {
16 16 /*
17 17 * Override default form field rendering to include help text quick tip on
18 18 * question mark rendered after field label.
  19 + * Specifying 'helpText' will cause a help icon and text to be added as a QuickTip.
  20 + * Specifying 'persistent' in conjunction with 'helpTest' will create a ToolTip that remains visible, useful for embedding links in the text.
19 21 */
20 22 afterRenderOrig : Ext.form.Field.prototype.afterRender,
21 23 afterRender : function() {
22   - var helpClass = null, wrapDiv = null, helpMark = null;
  24 + var helpClass = null, wrapDiv = null, helpMark = null, self = this;
23 25 if ( this.helpMarker === true )
24 26 {
25 27 wrapDiv = this.getEl().up('div');
@@ -79,12 +81,27 @@ Ext.override(Ext.form.Field, {
79 81 cls : helpClass
80 82 });
81 83
82   - Ext.QuickTips.register({
83   - target : helpMark,
84   - title : '',
85   - text : this.helpText,
86   - enabled : true
87   - });
  84 + // Use a ToolTip instead of QuickTip if we want the tip to remain in place.
  85 + // In this case the entire html fo the ToolTip will be set to the provided
  86 + // 'helpText'.
  87 + if(this.persistent)
  88 + {
  89 + var help = new Ext.ToolTip({
  90 + html : self.helpText,
  91 + anchor: 'left',
  92 + hideDelay: 10000
  93 + });
  94 + help.initTarget(helpMark);
  95 + }
  96 + else
  97 + {
  98 + Ext.QuickTips.register({
  99 + target : helpMark,
  100 + title : '',
  101 + text : this.helpText,
  102 + enabled : true
  103 + });
  104 + }
88 105 }
89 106
90 107 // original method
2  nexus-webapp/src/main/webapp/style/Sonatype.css
@@ -197,7 +197,7 @@ button.st-icon-refresh {
197 197
198 198 .form-label-helpmark-combo {
199 199 /* large margin needed to place helpmark next to combobox - the box is position:absolute, and helpmark was covered by dropdown arrow */
200   - margin-left: 18px;
  200 + margin-left: 19px;
201 201 height: 16px;
202 202 width: 16px;
203 203 vertical-align: middle;

0 comments on commit 3b43a24

Please sign in to comment.
Something went wrong with that request. Please try again.