[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] admin/web/build/server license.html,1.7.4.5,1.7.4.6
From:       svaidhya () helixcommunity ! org
Date:       2010-07-15 22:16:09
Message-ID: 201007152215.o6FMFpDw000355 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/admin/web/build/server
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10951

Modified Files:
      Tag: SERVER_14_0
	license.html 
Log Message:
Synopsis 
======
SSPL is not shown in Admin GUI     

Branches:  14.0 , HEAD
Suggested Reviewer: Dean

Description 
=========
The Admin System is case-sensitive in terms of license checks whereas the server is \
not. The 14.0 license had the License variable as "ServerSidePlaylist" whereas the \
earlier releases had it as "ServersidePlaylist". Since the server is \
case-insensitive, the sspl functionality works fine on server but, the admin system \
does not show the sspl page, also does not display it as licensed in the about box.

The correct solution for this is to make the admin system in-sync with theserver, i.e \
to make admin system case-insensitive.

This involves changes to a lot of places in the admin system, because of the numerous \
"hard-coding" of values. Also we would require the server to send the registry values \
as lowercase case, i.e converting to lowercase before sending. This would not only be \
restricted to license variables but also to config variables (becasue there is no way \
we can differentialte license values from config vaules while sending). This requires \
changes with config values too in the admin system, which in essence means a LOT of \
changes and almost re-test of the whole admin system.

Hence for 14.0.1, I was asked to just add a workaround for making \
"ServersidePlaylist" and "ServerSidePlaylist" as valid license variables for SSPL. \
This CR addresses this workaround.


Files Affected 
==========
./server/admin/web/src/srvprxy/toc.html
./server/admin/web/src/srvprxy/license.html

Testing Performed 
=============
Unit Tests: 
None. 

Integration Tests: 
Verified that SSPL page is displayed and also appears as licensed in abuot box for \
"ServersidePlaylist" and "ServersidePlaylist" licensed.
Verified that when removed from license, the page is not displayed and About box \
shows as "not licensed"

Leak Tests: 
None. 

Performance Tests: 
- None 

Platforms Tested: linux-rhel5-i686
Build verified: linux-rhel5-i686



Index: license.html
===================================================================
RCS file: /cvsroot/server/admin/web/build/server/license.html,v
retrieving revision 1.7.4.5
retrieving revision 1.7.4.6
diff -u -d -r1.7.4.5 -r1.7.4.6
--- license.html	13 Jul 2010 19:56:31 -0000	1.7.4.5
+++ license.html	15 Jul 2010 22:16:06 -0000	1.7.4.6
@@ -80,20 +80,33 @@
 		defVal = false ;
 
 	var propValue = null;
-	if ( propPath )
-	{
-		propValue = license["Summary"];
-		var a = propPath.split( '.' );
-		for ( var i = 0; a && i < a.length; i++ )
-		{
-			if ( ! (propValue && propValue[ a[ i ] ]) )
-			{
-				propValue = null;
-				break;
-			}
-			propValue = propValue[ a[ i ] ];
-		}
-	}
+
+        if ( propPath )
+        {
+                propValue = license["Summary"];
+                var a = propPath.split( '.' );
+                for ( var i = 0; a && i < a.length; i++ )
+                {
+                        if ( ! (propValue && propValue[ a[ i ] ]) )
+                        {
+                                if (a[i] == "ServersidePlaylist")
+                                {
+                                        a[i] = "ServerSidePlaylist";
+                                        if (! (propValue[ a[i] ] ) )
+                                        {
+                                                propValue = null;
+                                                break;
+                                        }
+                                }
+                                else
+                                {
+                                        propValue = null;
+                                        break;
+                                }
+                        }
+                        propValue = propValue[ a[ i ] ];
+                }
+        }
 
 	this.base = Prop ;
 	this.base( (propValue!=null ? (propValue ? "yes" : "no") : (defVal ? "yes" : \
"no")), 


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]