Revert "Merge pull request #844 from sonatype/ui-session-timeout"

This reverts commit c47efb8, reversing changes made to daf7f7f.
sonatype · May 1, 2013 · 72eb270 · 72eb270
1 parent fbad2e7
commit 72eb270
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/plugins/nexus-ui-extjs3-plugin/src/main/resources/static/js/Sonatype/utils.js b/plugins/nexus-ui-extjs3-plugin/src/main/resources/static/js/Sonatype/utils.js
@@ -729,7 +729,7 @@ define('Sonatype/utils',['../extjs', 'Nexus/config', 'Nexus/util/Format', 'Sonat
           }
         },
         start : function() {
-          if (running === null && !Sonatype.utils.noSessionTimeout) {
+          if (running === null) {
             running = Ext.TaskMgr.start(config);
           }
         }};
@@ -833,8 +833,6 @@ define('Sonatype/utils',['../extjs', 'Nexus/config', 'Nexus/util/Format', 'Sonat
 
                 ns.formattedAppName = Ext.namespace('Sonatype.utils').parseFormattedAppName(respObj.data.formattedAppName);
 
-                ns.noSessionTimeout = respObj.data.noSessionTimeout;
-
                 Ext.get('logo').update('<span>' + ns.formattedAppName + '</span>');
 
                 Sonatype.view.headerPanel.doLayout();
@@ -860,8 +858,6 @@ define('Sonatype/utils',['../extjs', 'Nexus/config', 'Nexus/util/Format', 'Sonat
                 Sonatype.user.curr.username = null;
                 Sonatype.user.curr.loggedInUserSource = null;
 
-                // nexusStatus REST call unsuccessful, so we just turn off the ping here
-                ns.noSessionTimeout = true;
               }
 
               var availSvrs = Sonatype.config.installedServers;

diff --git a/plugins/restlet1x/nexus-restlet1x-model/src/main/mdo/vos.xml b/plugins/restlet1x/nexus-restlet1x-model/src/main/mdo/vos.xml
@@ -3150,13 +3150,6 @@
           <required>true</required>
           <description>Flag that states if current installed license is a trial license.</description>
         </field>
-        <field>
-          <name>noSessionTimeout</name>
-          <version>1.0.0+</version>
-          <type>boolean</type>
-          <required>true</required>
-          <description>Flag that enables or disables the UI 'pinging' the status resource.</description>
-        </field>
       </fields>
     </class>
 

diff --git a/...s-restlet1x-plugin/src/main/java/org/sonatype/nexus/rest/status/StatusPlexusResource.java b/...s-restlet1x-plugin/src/main/java/org/sonatype/nexus/rest/status/StatusPlexusResource.java
@@ -33,7 +33,6 @@
 import org.sonatype.nexus.rest.model.NexusAuthenticationClientPermissions;
 import org.sonatype.nexus.rest.model.StatusResource;
 import org.sonatype.nexus.rest.model.StatusResourceResponse;
-import org.sonatype.nexus.util.SystemPropertiesHelper;
 import org.sonatype.plexus.rest.resource.ManagedPlexusResource;
 import org.sonatype.plexus.rest.resource.PathProtectionDescriptor;
 import org.sonatype.security.rest.authentication.AbstractUIPermissionCalculatingPlexusResource;
@@ -51,8 +50,6 @@ public class StatusPlexusResource
     @Requirement
     private Nexus nexus;
 
-    private boolean noSessionTimeout = SystemPropertiesHelper.getBoolean( "nexus.ui.noSessionTimeout", false );
-
     @Override
     public Object getPayloadInstance()
     {
@@ -151,8 +148,6 @@ public Object get( Context context, Request request, Response response, Variant
 
         resource.setTrialLicense( status.isTrialLicense() );
 
-        resource.setNoSessionTimeout( noSessionTimeout );
-
         StatusResourceResponse result = new StatusResourceResponse();
 
         result.setData( resource );