[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-server-cvs
Subject: [Server-cvs] admin/web/build/server config_broad_real.html,1.2,1.3
From: stiwary () helixcommunity ! org
Date: 2008-02-26 15:42:57
Message-ID: 200802261543.m1QFh41T025951 () 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-serv18576
Modified Files:
config_broad_real.html
Log Message:
Approved By: Dean
Branches: Server12, Head
Synopsis
============
This CR include the fix for PR:213366:INeed to remove part of the \
Broadcast/RealNetworks-Encoding page.
Branches: SERVER_CURRENT_RN, SERVER_12_RN
Suggested Reviewer: Dean
Description
=============
As G2 to 8.5 Producer is no more valid. So, we need to remove the table G2 to 8.5 \
from admin page config_broad_real.html.wasm
Files Affected:
=============
server\admin\web\src\srvprxy\config_broad_real.html.wasm
server\admin\web\build\mserver\config_broad_real.html
server\admin\web\build\server\config_broad_real.html
Testing Performed
=============
Functional Tests:
-----------------
The page appears as expected.
Integration Tests:
-----------------
n/a
Leak Tests:
----------
n/a
Performance Tests:
-----------------
n/a
Build verified: win32-i386-vc7
Platforms tested: win32-i386-vc7
QA Hints
==============
--None
Regards,
Sandeep Tiwary
Index: config_broad_real.html
===================================================================
RCS file: /cvsroot/server/admin/web/build/server/config_broad_real.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config_broad_real.html 25 May 2007 19:33:48 -0000 1.2
+++ config_broad_real.html 26 Feb 2008 15:42:55 -0000 1.3
@@ -27,7 +27,7 @@
{
document.write( '<LINK REL=stylesheet HREF="main.css" TYPE="text/css">' );
}
-var contextID = "36";
+var contextID = "37";
</SCRIPT>
<SCRIPT SRC="propview_nolist.js"></SCRIPT>
@@ -63,7 +63,6 @@
*/
var FS_ENCODER_9 = "Encoder Admin File System";
-var FS_ENCODER_G2 = "RealSystem G2 Encoders";
propSet9 =
[
@@ -81,31 +80,12 @@
serverData9 = configList["FSMount"][FS_ENCODER_9];
}
-propSetG2 =
-[
- new PropObj( '_ShortName', "pn-encoder", true, true, null, null, null, "ShortName" \
),
- new PropObj( '_MountPoint', "/encoder/", false,true, null, null, "mountpoint", \
"Encoder MountPoint", true ),
- new PropObj( 'Port', "4040", false,true, null, null, "port", "Encoder Port" \
),
- new PropObj( 'EncoderTimeout', "30", false, true, null, null, "int", "Timeout" ),
- new PropObj( 'EncoderRealm', "EncoderRealm", false,false,null, null, "Realm", \
"Encoder Realm", true )
-];
-
-var serverDataG2 = null;
-if ( configList &&
- configList["FSMount"] &&
- configList["FSMount"][FS_ENCODER_G2] )
-{
- serverDataG2 = configList["FSMount"][FS_ENCODER_G2];
-}
-
var propSetAll =
[
- new PropList( FS_ENCODER_9, serverData9, propSet9 ),
- new PropList( FS_ENCODER_G2, serverDataG2, propSetG2 )
+ new PropList( FS_ENCODER_9, serverData9, propSet9 )
];
var propList = new PropList( "RealSystem Encoding", [], propSetAll );
var subList9 = propList.subList( FS_ENCODER_9 );
-var subListG2 = propList.subList( FS_ENCODER_G2 );
function Enc9PropView ()
{
@@ -121,8 +101,7 @@
// fillForm isn't recursive - have to do it for sublists
subList9.fillForm( theForm );
- subListG2.fillForm( theForm );
-
+
thePortRange.fillForm( theForm );
}
@@ -139,13 +118,6 @@
return rejectInput( ctrl, subList9.errMsg );
}
- ctrl = subListG2.validate( theForm );
- if ( ctrl )
- {
-
- return rejectInput( ctrl, subListG2.errMsg );
- }
-
return true;
}
@@ -163,28 +135,6 @@
}
}
- if ( subListG2.prop( "Port" ).isDirty() )
- {
- // check for port conflict with the rest of the server configuration
- var conflict = findPortConflictName( getCtrlValue( theForm.Port ) );
- if ( conflict )
- {
- return rejectInput( theForm.Port, getConflictErrMsg( conflict, "G2 Encoder Port" \
) );
- }
- }
-
- // make sure the mountpoint is unique among all mount points
- if ( subListG2 && subListG2.prop( "_MountPoint" ) )
- {
- var errMsg =
- subListG2.prop( "_MountPoint" ).getMountPointConflictErrMsg(
- configList.FSMount );
- if ( errMsg )
- {
- return rejectInput( theForm._MountPoint, errMsg );
- }
- }
-
return true;
}
@@ -195,7 +145,7 @@
isCtrlDirty( theForm.PortRange2 ) );
}
-initAllPortsList( configList, FS_ENCODER_G2, FS_ENCODER_9 );
+initAllPortsList( configList, FS_ENCODER_9 );
var propView = new Enc9PropView();
var theForm ;
@@ -223,7 +173,7 @@
aTmp.sort();
var ctrl;
- var ctrls = [ theForm.Realm, theForm.EncoderRealm ];
+ var ctrls = [ theForm.Realm ];
for ( var i = 0; i < ctrls.length; i++ )
{
ctrl = ctrls[ i ];
@@ -260,8 +210,7 @@
simpler of two methods of connecting a live broadcast source to the
server. Account-based broadcasting allows
Producer 9 to emulate the simpler broadcasting connection found in
-earlier versions of the Producer. This emulation also provides
-support for RealProducer G2 through 8.5..
+earlier versions of the Producer..
</td></tr>
</TABLE>
<BR>
@@ -286,69 +235,19 @@
</TABLE>
<table class="formTable" border="0" cellspacing="0" cellpadding="6" width="476">
<tr>
- <TD class="input" valign="top" align="RIGHT" width="25%">
+ <TD class="input" valign="top" align="RIGHT" width="50%">
<span class="offsetLabel">Port Range</span>
</td>
- <TD class="input" valign="top" align="left" width="75%">
+ <TD class="input" valign="top" align="left" width="50%">
<input type="text" class="input" name="PortRange1" size="6" maxlength="5"><SPAN \
class="unitsOffset"> to </span><input type="text" class="input" \
name="PortRange2" size="6" maxlength="5"> </td>
</tr>
<tr>
- <TD class="input" valign="top" align="RIGHT" width="25%">
- <span class="offsetLabel">Authentication<FONT color="red">*</FONT></span>
- </td>
- <TD class="input" valign="top" align="left" width="75%">
- <select CLASS="threeQInput" NAME="Realm" SIZE="1" WIDTH="340">
- <OPTION value="">Select an Authentication Realm</OPTION>
- <OPTION value="">None</OPTION>
- <OPTION value="A">B</OPTION>
- <OPTION value="C">D</OPTION>
- <OPTION value="E">F</OPTION>
- <OPTION value="G">H</OPTION>
- <OPTION value="I">J</OPTION>
- </SELECT><SPAN CLASS="units"><BR><A class="linkTextSmall" \
HREF="javascript:tocFrame.gotoPage('config_sec_uauth.html')">Create</a> user names \
and passwords.<BR><BR></SPAN>
- </td>
- </tr>
-</TABLE>
-<BR>
-<table border="0" cellspacing="0" cellpadding="0" width="476" style="width:476;">
-<TR><TD bgcolor="#E6E6E6" width="19"><img src="images/spacer.gif" BORDER="0" \
HEIGHT="17" HSPACE="0" NAME="IMG_DIRTY_TAB" VSPACE="0" \
WIDTH="19"></TD>
-<TD bgcolor="#E6E6E6" class="TabText" width="243" NOWRAP>G2 to 8.5 Producer</TD>
-<TD bgcolor="#FFFFFF" width="20"><img src="images/diagonal.gif"></TD>
-<TD bgcolor="#FFFFFF" width="194" align="right"></TD>
-</TR>
-</TABLE>
-<table class="formTable" border="0" cellspacing="0" cellpadding="6" width="476">
- <tr>
- <TD class="input" valign="top" align="RIGHT" width="25%">
- <span class="offsetLabel">Mount Point<FONT color="red">*</FONT></span>
- </td>
- <TD class="input" valign="top" align="left" width="75%">
- <input CLASS="threeQInput" MAXLENGTH="255" NAME="_MountPoint" SIZE="24" \
TYPE="text" VALUE="">
- </td>
- </tr>
- <tr>
- <TD class="input" valign="top" align="RIGHT" width="25%">
- <span class="offsetLabel">Port</span>
- </td>
- <TD class="input" valign="top" align="left" width="75%">
- <input CLASS="input" MAXLENGTH="255" NAME="Port" SIZE="6" TYPE="text" VALUE="">
- </td>
- </tr>
- <tr>
- <TD class="input" valign="top" align="RIGHT" width="25%">
- <span class="offsetLabel">Timeout</span>
- </td>
- <TD class="input" valign="top" align="left" width="75%">
- <input CLASS="input" MAXLENGTH="255" NAME="EncoderTimeout" SIZE="6" TYPE="text" \
VALUE="">
- </td>
- </tr>
- <tr>
- <TD class="input" valign="top" align="RIGHT" width="25%">
+ <TD class="input" valign="top" align="RIGHT" width="50%">
<span class="offsetLabel">Authentication<FONT color="red">*</FONT></span>
</td>
- <TD class="input" valign="top" align="left" width="75%">
- <select CLASS="threeQInput" NAME="EncoderRealm" SIZE="1" WIDTH="340">
+ <TD class="input" valign="top" align="left" width="50%">
+ <select CLASS="threeQInput" NAME="Realm" SIZE="1" WIDTH="226">
<OPTION value="">Select an Authentication Realm</OPTION>
<OPTION value="">None</OPTION>
<OPTION value="A">B</OPTION>
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic