Merge branch 'master' of https://github.com/jessp01/server into IX-9.…

…15.0 Conflicts: configurations/generator.ini
kaltura · Apr 23, 2014 · 3cfacf0 · 3cfacf0
2 parents beecc51 + 762c889
commit 3cfacf0
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 16 deletions.
diff --git a/batch/kaltura_batch.sh b/batch/kaltura_batch.sh
@@ -56,7 +56,7 @@ echo_failure() {
 	[ "$BOOTUP" = "color" ] && $SETCOLOR_NORMAL
 	echo -n "]"
 	echo -ne "\r"
-	return 0
+	return 1
 }
 
 
@@ -80,7 +80,7 @@ start() {
 			echo "Removing stale lock file at $LOCKFILE"
 			rm -f $LOCKFILE
 			start_scheduler
-			return 0
+			return 1
 		fi
 	else
 		if [ "X$KP" != "X" ]; then
@@ -112,7 +112,7 @@ show_status() {
 		return 0
 		else
 			echo "Service Batch isn't running"
-			return 0
+			return 1
 		fi
 }
 

diff --git a/configurations/generator.ini b/configurations/generator.ini
@@ -144,13 +144,13 @@ package = HostedPages
 internal = true
 nopackage = true
 
-[testsClient : all]
-generator = Php5ClientGenerator
-ignore = KalturaUploadedFileResource, KalturaCopyJobData
+[testsClient : php5]
 additional = KalturaBatchJobAppErrors, KalturaBulkUploadType, KalturaConversionEngineType, KalturaExportProtocol, KalturaSchemaType, KalturaIndexObjectType, KalturaDeleteObjectType, KalturaCopyObjectType
 internal = true
 nopackage = true
 copyPath = tests/lib
+exclude = media.addfrombulk
 
 [nodePlayServer : node]
 include = cuePoint_cuePoint.list, session.start
+
diff --git a/configurations/logrotate/kaltura_apache.template b/configurations/logrotate/kaltura_apache.template
@@ -19,7 +19,7 @@
  dateext
  notifempty
  lastaction
- mv @LOG_DIR@/kaltura_apache_access.log-`/bin/date +%Y%m%d`.gz @EVENTS_LOGS_DIR@/`hostname`-kaltura_apache_access.log-`/bin/date +%Y%m%d`.gz
+ mv @LOG_DIR@/kaltura_apache_access.log-`/bin/date +%Y%m%d`.gz @EVENTS_LOGS_DIR@/`hostname`-kaltura_apache_access.log-`/bin/date +%Y%m%d-%H`.gz
  service @APACHE_SERVICE@ reload
  endscript
 }
@@ -45,7 +45,7 @@
  dateext
  notifempty
  lastaction
- mv @LOG_DIR@/kaltura_apache_access_ssl.log-`/bin/date +%Y%m%d`.gz @EVENTS_LOGS_DIR@/`hostname`-kaltura_apache_access_ssl.log-`/bin/date +%Y%m%d`.gz
+ mv @LOG_DIR@/kaltura_apache_access_ssl.log-`/bin/date +%Y%m%d`.gz @EVENTS_LOGS_DIR@/`hostname`-kaltura_apache_access_ssl.log-`/bin/date +%Y%m%d-%H`.gz
  service @APACHE_SERVICE@ reload
  endscript
 }
diff --git a/deployment/base/scripts/init_data/03.uiConf.ini b/deployment/base/scripts/init_data/03.uiConf.ini
@@ -1929,3 +1929,18 @@ creationMode=3
 confFile=@ui_conf/8776542.xml
 confFileFeatures=@ui_conf/8776542.features.xml
 
+
+[8700151]
+id=8700151
+objType=8
+partnerId=0
+name="Share target"
+width=500
+height=300
+swfUrl=/flash/kdp3/v3.8/kdp3.swf
+html5Url=/html5/html5lib/v2.1.1/mwEmbedLoader.php
+useCdn=1
+status=2
+displayInSearch=2
+creationMode=3
+confFile=@ui_conf/8700151.xml
diff --git a/deployment/base/scripts/init_data/ui_conf/8700151.xml b/deployment/base/scripts/init_data/ui_conf/8700151.xml
@@ -0,0 +1 @@
+<layout id="full" name="minimum player" skinPath="/content/uiconf/kaltura/kmc/appstudio/kdp3/eagle/skin/v3.5.9/skin.swf">   <HBox id="topLevel" width="100%" height="100%">     <VBox id="player" width="100%" height="100%" styleName="black">       <Plugin id="kalturaMix" width="0%" height="0%" includeInLayout="false" loadingPolicy="onDemand"/>       <Plugin id="statistics" width="0%" height="0%" includeInLayout="false"/>       <Plugin id="fader" width="0%" height="0%" includeInLayout="false" target="{controllersVbox}" hoverTarget="{PlayerHolder}" duration="0.5" autoHide="true"/>       <Canvas id="PlayerHolder" height="100%" width="100%" styleName="black">         <Video id="video" width="100%" height="100%"/>         <VBox id="offlineMessageHolder" verticalAlign="middle" horizontalAlign="center" includeInLayout="false" width="100%" height="100%">           <Spacer height="100%"/>           <Spacer height="100%"/>           <Label id="offlineMessage" styleName="offlineMessage" text="{mediaProxy.entry.offlineMessage}" visible="{mediaProxy.isOffline}" width="100%" height="30"/>           <Spacer height="100%"/>         </VBox>         <VBox id="generalPluginContainer" width="100%" height="100%">           <Spacer id="contentPusher" height="100%"/>           <Plugin id="closedCaptionsOverPlayer" width="100%" height="15%" fontsize="12" bg="0x000000" fontFamily="Arial" fontColor="0xFFFFFF" opacity="0" path="closedCaptionsPlugin.swf" useGlow="true" glowColor="0x000333" glowBlur="4"/>           <Spacer id="contentPusherBottom" height="30"/>         </VBox>         <Screens id="screensLayer" width="100%" height="100%" mouseOverTarget="{PlayerHolder}" styleName="clickThrough" startScreenId="startScreen" startScreenOverId="startScreen" pauseScreenOverId="pauseScreen" pauseScreenId="pauseScreen" playScreenOverId="playScreen" endScreenId="endScreen" endScreenOverId="endScreen"/>         <VBox id="controllersVbox" width="100%" height="100%" verticalAlign="Bottom" paddingRight="5" paddingLeft="5">           <Spacer id="controllerPusher" width="100%" height="100%"/>           <HBox id="ControllerScreenHolder" width="100%" height="30" verticalAlign="middle" styleName="hoverBg">             <HBox id="ControllerScreen" width="100%" height="30" horizontalGap="9" paddingLeft="9" verticalAlign="middle" styleName="">               <Button color1="14540253" color2="16777215" color3="3355443" color4="10066329" color5="16777215" id="playBtnControllerScreen" command="play" buttonType="iconButton" focusRectPadding="0" icon="playIcon" overIcon="playIcon" downIcon="playIcon" disabeledIcon="playIcon" selectedUpIcon="pauseIcon" selectedOverIcon="pauseIcon" selectedDownIcon="pauseIcon" selectedDisabledIcon="pauseIcon" tooltip="" upTooltip="" selectedTooltip="" k_buttonType="buttonIconControllerArea" font="Arial"/>               <Button color1="14540253" color2="16777215" color3="3355443" color4="10066329" color5="16777215" id="liveToggleStatus" toggle="true" upIcon="onAirIcon" overIcon="onAirIcon" downIcon="onAirIcon" disabeledIcon="onAirIcon" selectedUpIcon="offlineIcon" selectedOverIcon="offlineIcon" selectedDownIcon="offlineIcon" selectedDisabledIcon="offlineIcon" isSelected="{mediaProxy.isOffline}" visible="{mediaProxy.isLive}" includeInLayout="{mediaProxy.isLive}" mouseEnable="false" useHandCursor=""/>               <VBox id="scrubberContainer" width="100%" height="30" verticalAlign="middle" verticalGap="-3" notVisible="{mediaProxy.isLive}">                 <Spacer height="10"/>                 <Scrubber id="scrubber" width="100%" height="10" styleName="" color1="14540253" color2="14540253"/>                 <HBox width="100%">                   <Timer id="timerControllerScreen1" width="60" styleName="timerProgressLeft" format="mm:ss" height="12" dynamicColor="true" timerType="forwards" color1="14540253"/>                   <Spacer width="100%" height="8"/>                   <Timer id="timerControllerScreen2" width="60" styleName="timerProgressRight" format="mm:ss" height="12" timerType="total" dynamicColor="true" color1="14540253"/>                 </HBox>               </VBox>               <VolumeBar id="volumeBar" styleName="volumeBtn" buttonWidth="20" width="20" height="20" buttonType="iconButton" tooltip="" initialValue="1" forceInitialValue="false" color1="14540253" color2="16777215" color3="3355443" color4="10066329" color5="16777215" font="Arial"/>               <Button color1="14540253" color2="16777215" color3="3355443" color4="10066329" color5="16777215" id="fullScreenBtnControllerScreen" command="fullScreen" buttonType="iconButton" height="22" styleName="controllerScreen" icon="openFullScreenIcon" selectedUpIcon="closeFullScreenIcon" selectedOverIcon="closeFullScreenIcon" selectedDownIcon="closeFullScreenIcon" selectedDisabledIcon="closeFullScreenIcon" focusRectPadding="0" allowDisable="false" tooltip="" k_buttonType="buttonIconControllerArea" upTooltip="" selectedTooltip="" font="Arial"/>             </HBox>             <Spacer width="13"/>             <Button color1="14540253" color2="16777215" color3="3355443" color4="10066329" color5="16777215" id="kalturaLogo" height="50" width="100" kClick="navigate('http://www.kaltura.com')" styleName="controllerScreen" icon="kalturaLogo"/>             <Spacer width="13"/>           </HBox>           <Spacer id="PaddingBottom" height="5"/>         </VBox>         <HBox id="ccOverComboBoxWrapper" horizontalAlign="left" width="100%" height="100%" paddingLeft="5" paddingTop="5">           <Plugin id="captionsOverFader" width="0%" height="0%" includeInLayout="false" target="{ccOverComboBoxWrapper}" hoverTarget="{PlayerHolder}" duration="0.5" autoHide="true" path="faderPlugin.swf"/>           <ComboBox id="ccOverComboBox" width="90" styleName="_kdp" selectedIndex="{closedCaptionsOverPlayer.currentCCFileIndex}" kevent_change="sendNotification( 'closedCaptionsSelected' , ccOverComboBox.selectedItem)" dataProvider="{closedCaptionsOverPlayer.availableCCFilesLabels}" prompt="Captions" includeInLayout="{closedCaptionsOverPlayer.hasCaptions}" visible="{closedCaptionsOverPlayer.hasCaptions}" tooltip=""/>         </HBox>       </Canvas>     </VBox>   </HBox>   <screens>     <screen id="startScreen">       <VBox id="startContainer" width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">         <Spacer width="100%"/>         <Tile id="startTile" width="100%" verticalGap="10" verticalAlign="middle" horizontalAlign="center"/>         <Spacer width="100%"/>       </VBox>     </screen>     <screen id="pauseScreen">       <VBox id="pauseContainer" width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">         <Spacer height="100%"/>         <Tile id="pauseTile" width="100%" verticalGap="10" verticalAlign="middle" horizontalAlign="center"/>         <Spacer height="100%"/>       </VBox>     </screen>     <screen id="playScreen">       <VBox id="playContainer" width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">         <Spacer height="100%"/>         <Tile id="playTile" width="100%" verticalGap="10" verticalAlign="middle" horizontalAlign="center"/>         <Spacer height="100%"/>       </VBox>     </screen>     <screen id="endScreen">       <VBox id="endContainer" width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">         <Spacer height="100%"/>         <Tile id="endTile" width="100%" verticalGap="10" verticalAlign="middle" horizontalAlign="center"/>         <Spacer height="100%"/>       </VBox>     </screen>   </screens>   <strings>     <string key="ENTRY_CONVERTING" value="Entry is processing, please try again in a few minutes."/>   </strings>   <extraData>     <GigyaUI theme="dark">       <config>         <display showEmail="true" useTransitions="true" showBookmark="false" codeBoxHeight="auto" showCodeBox="true" showCloseButton="true" networksWithCodeBox="" networksToHide="livespaces, piczo, orkut, pageflakes, vox, tagged, hi5, multiply" networksToShow="facebook, twitter, wordpress" bookmarksToShow="googlebookmarks,delicious,digg,facebookshare,newsvine,reddit,twitter,ask,myaol,slashdot,skimbit,simpy,blogmarks,spurl,linkagogo,Magnolia,faves,segnalo,netvouz,blinklist,dropjack,feedmelinks"/>         <body>           <background frame-color="#BFBFBF" background-color="#292929" frame-thickness="0" gradient-color-begin="#292929" gradient-color-end="#292929" corner-roundness="0;0;0;0"/>           <controls corner-roundness="4;4;4;4" gradient-color-begin="#EAEAEA" gradient-color-end="#F4F4F4" bold="false">             <snbuttons type="textUnder" frame-color="#666666" background-color="#292929" over-frame-color="#FFFFFF" color="#BFBFBF" gradient-color-begin="#666666" gradient-color-end="Transparent" size="10" bold="false" down-frame-color="#666666" down-gradient-color-begin="Transparent" over-gradient-color-end="#ffffff" down-gradient-color-end="#666666" over-color="#ffffff" down-color="#ffffff" over-bold="false">               <more frame-color="#A4DBFF" over-frame-color="#A4DBFF" gradient-color-begin="#F4F4F4" gradient-color-end="#BBE4FF" over-gradient-color-begin="#A4DBFF" over-gradient-color-end="#F4F4F4"/>               <previous frame-color="#BBE4FF" over-frame-color="#A4DBFF" gradient-color-begin="#FFFFFF" gradient-color-end="#A4DBFF" over-gradient-color-begin="#A4DBFF" over-gradient-color-end="#F4F4F4"/>             </snbuttons>             <textboxes frame-color="#CACACA" background-color="#292929" color="#757575" gradient-color-begin="#292929" gradient-color-end="#292929" bold="false">               <codeboxes color="#808080" frame-color="#6A6A6A" background-color="#606060" gradient-color-begin="Transparent" gradient-color-end="Transparent" size="10"/>               <inputs frame-color="#6a6a6a" color="#808080" gradient-color-begin="Transparent" gradient-color-end="Transparent"/>               <dropdowns list-item-over-color="#52A4DA" frame-color="#6a6a6a" background-color="#292929" color="#808080" gradient-color-begin="#292929" gradient-color-end="#292929"/>             </textboxes>             <buttons frame-color="#6a6a6a" background-color="Transparent" gradient-color-begin="#666666" gradient-color-end="Transparent" color="#FFFFFF" frame-thickness="1" size="12" bold="false" over-frame-color="#FFFFFF" down-frame-color="#6a6a6a" over-gradient-color-begin="#666666" down-gradient-color-begin="Transparent" over-gradient-color-end="#353535" down-gradient-color-end="Transparent" over-size="12" over-bold="false">               <post-buttons frame-color="#6a6a6a" gradient-color-end="Transparent"/>             </buttons>             <listboxes frame-color="#CACACA" corner-roundness="4;4;4;4" gradient-color-begin="#F4F4F4" gradient-color-end="#FFFFFF"/>             <checkboxes checkmark-color="#202020" frame-color="#6a6a6a" down-gradient-color-begin="#292929" down-gradient-color-end="#292929" background-color="#292929" corner-roundness="3;3;3;3" gradient-color-begin="Transparent" gradient-color-end="Transparent" over-background-color="#292929" down-background-color="#292929"/>             <servicemarker gradient-color-begin="Transparent" gradient-color-end="#666666"/>             <tooltips frame-thickness="0" color="#292929" gradient-color-begin="#FFFFFF" gradient-color-end="#FFFFC8" size="10" frame-color="#FFDBA4"/>           </controls>           <texts color="808080">             <privacy color="#808080"/>             <headers color="#FFFFFF" bold="false"/>             <labels color="#FFFFFF" bold="false"/>             <messages color="#202020" background-color="#FFFFA4" frame-thickness="0" corner-roundness="4;4;4;4"/>             <links color="#FFFFFF" underline="false" over-color="#666666" down-color="#666666" down-bold="false"/>           </texts>         </body>       </config>     </GigyaUI>   </extraData>   <plugins/>   <uiVars>     <var key="video.keepAspectRatio" value="true"/>     <var key="playlistAPI.autoContinue" value="false"/>     <var key="imageDefaultDuration" value="2"/>     <var key="autoPlay" value="true"/>     <var key="autoMute" value="false"/>   </uiVars> </layout>
diff --git a/tests/sanity/04.dwhEntry.php b/tests/sanity/04.dwhEntry.php
@@ -10,6 +10,7 @@
 
 
 $logrotate = $config['dwh']['logRotateBin'];
+$kitchen_script= $config['dwh']['kitchenScript'];
 $appDir = $config['global']['appDir'];
 $dwhDir = $config['dwh']['baseDir'];
 $kalturaUser = $config['os']['kalturaUser'];
@@ -181,7 +182,7 @@
  * Rotate logs.
  */
 $returnedValue = null;
-$cmd = "$logrotate -f -vv $appDir/tests/sanity/lib/logrotate.ini";
+$cmd = "$logrotate -f -vv $appDir/configurations/logrotate/kaltura_apache";
 echo "Executing [$cmd]";
 passthru($cmd, $returnedValue);
 if($returnedValue !== 0)
@@ -196,7 +197,7 @@
 /**
  * Run hourly scripts.
  */
-$cmd = "su $kalturaUser -c '$dwhDir/etlsource/execute/etl_hourly.sh -p $dwhDir'";
+$cmd = "su $kalturaUser -c '$dwhDir/etlsource/execute/etl_hourly.sh -p $dwhDir  -k $kitchen_script '";
 echo "Executing [$cmd]";
 passthru($cmd, $returnedValue);
 if($returnedValue !== 0)
@@ -210,7 +211,7 @@
 /**
  * Run update dimensions.
  */
-$cmd = "su $kalturaUser -c '$dwhDir/etlsource/execute/etl_update_dims.sh -p $dwhDir'";
+$cmd = "su $kalturaUser -c '$dwhDir/etlsource/execute/etl_update_dims.sh -p $dwhDir -k $kitchen_script'";
 echo "Executing [$cmd]";
 passthru($cmd, $returnedValue);
 //if($returnedValue !== 0)
@@ -225,7 +226,7 @@
 /**
  * Run daily scripts.
  */
-$cmd = "su $kalturaUser -c '$dwhDir/etlsource/execute/etl_daily.sh -p $dwhDir'";
+$cmd = "su $kalturaUser -c '$dwhDir/etlsource/execute/etl_daily.sh -p $dwhDir -k $kitchen_script'";
 echo "Executing [$cmd]";
 passthru($cmd, $returnedValue);
 if($returnedValue !== 0)
@@ -321,12 +322,12 @@
 
 if($reloadedEntry->plays <= $entry->plays)
 {
-	echo "Entry [$entry->id] plays [$reloadedEntry->plays] did not incremented\n";
+	echo "Entry [$entry->id] plays [$reloadedEntry->plays] was not incremented\n";
 	exit(-1);
 }
 if($reloadedEntry->views <= $entry->views)
 {
-	echo "Entry [$entry->id] views [$reloadedEntry->views] did not incremented\n";
+	echo "Entry [$entry->id] views [$reloadedEntry->views] was not incremented\n";
 	exit(-1);
 }
 echo "Plays and views OK\n";

diff --git a/tests/sanity/lib/config.template.ini b/tests/sanity/lib/config.template.ini
@@ -24,9 +24,17 @@ verifySSL 					= false
 [dwh]
 baseDir						= @DWH_DIR@
 logRotateBin				= @LOG_ROTATE_BIN@
+kitchenScript                           = @KITCHEN_BIN@
 
 [adminConsoleSession]
-adminSecret					= @ADMIN_CONSOLE_PARTNER_ADMIN_SECRET@
+partnerId				= @ADMIN_CONSOLE_PARTNER_ID@
+adminSecret                             = @ADMIN_CONSOLE_PARTNER_ADMIN_SECRET@
+
+
+[session]
+partnerId                                       = @PARTNER_ID@
+adminSecret					= @PARTNER_ADMIN_SECRET@
+
 
 [os]
-kalturaUser					= @OS_KALTURA_USER@
+kalturaUser					= @OS_KALTURA_USER@