Merge pull request #53 from kaltura/master-merge-Lynx-12.7.0

Master merge lynx 12.7.0
kaltura · Dec 19, 2016 · 1ae5dfa · 1ae5dfa
2 parents d6f59d9 + 995eeba
commit 1ae5dfa
Show file tree

Hide file tree

Showing 45 changed files with 5,547 additions and 88 deletions.
diff --git a/config/generator.ini b/config/generator.ini
@@ -15,7 +15,7 @@
 [public]
 package = Kaltura
 subpackage = Client
-exclude = batch.*, batchcontrol.*, jobs.*, media.addfrombulk, multicenters_filesyncimportbatch.*, metadata_metadataBatch.*, wowza_liveconversionprofile.*, fileSync_fileSync.*, businessProcessNotification_businessProcessServer.*, tvcomdistribution_tvcom.*, captionSearch_captionAssetItem.parse, doubleclickdistribution_doubleclick.*, comcastmrssdistribution_comcastmrss.*, avndistribution_avn.*, contentDistribution_contentDistributionBatch.*, systemPartner_systemPartner.*, KalturaInternalTools_KalturaInternalTools.*, KalturaInternalTools_KalturaInternalToolsSystemHelper.*, adminconsole_uiconfadmin.*, adminconsole_thumbparamsoutput.*, adminConsole_entryAdmin.*, adminConsole_thumbParamsOutput.*, adminconsole_flavorparamsoutput.*, adminconsole_reportadmin.*, , captureSpace_captureSpace.*, media.addfrombulk, document.*, categoryentry.addfrombulkupload, xInternal.*
+exclude = batch.*, batchcontrol.*, jobs.*, media.addfrombulk, multicenters_filesyncimportbatch.*, metadata_metadataBatch.*, wowza_liveconversionprofile.*, fileSync_fileSync.*, businessProcessNotification_businessProcessServer.*, tvcomdistribution_tvcom.*, captionSearch_captionAssetItem.parse, doubleclickdistribution_doubleclick.*, comcastmrssdistribution_comcastmrss.*, avndistribution_avn.*, contentDistribution_contentDistributionBatch.*, systemPartner_systemPartner.*, KalturaInternalTools_KalturaInternalTools.*, KalturaInternalTools_KalturaInternalToolsSystemHelper.*, adminconsole_uiconfadmin.*, adminconsole_thumbparamsoutput.*, adminConsole_entryAdmin.*, adminConsole_thumbParamsOutput.*, adminconsole_flavorparamsoutput.*, adminconsole_reportadmin.*, captureSpace_captureSpace.*, media.addfrombulk, document.*, categoryentry.addfrombulkupload, xInternal.*
 generateDocs = true
 ignore = KalturaVarConsolePartnerFilter, KalturaUploadedFileResource, KalturaCopyJobData
 additional = KalturaHttpNotification
@@ -111,7 +111,8 @@ ignore = KalturaUploadedFileResource, KalturaCopyJobData
 generator = Php4ClientGenerator
 
 [csharp : public]
-generator = CSharpClientGenerator
+generator = CSharp2ClientGenerator
+exclude = batch.*, batchcontrol.*, jobs.*, media.addfrombulk, multicenters_filesyncimportbatch.*, metadata_metadataBatch.*, wowza_liveconversionprofile.*, fileSync_fileSync.*, businessProcessNotification_businessProcessServer.*, tvcomdistribution_tvcom.*, captionSearch_captionAssetItem.parse, doubleclickdistribution_doubleclick.*, comcastmrssdistribution_comcastmrss.*, avndistribution_avn.*, contentDistribution_contentDistributionBatch.*, systemPartner_systemPartner.*, KalturaInternalTools_KalturaInternalTools.*, KalturaInternalTools_KalturaInternalToolsSystemHelper.*, adminconsole_uiconfadmin.*, adminconsole_thumbparamsoutput.*, adminConsole_entryAdmin.*, adminConsole_thumbParamsOutput.*, adminconsole_flavorparamsoutput.*, adminconsole_reportadmin.*, captureSpace_captureSpace.*, media.addfrombulk, document.*, categoryentry.addfrombulkupload, xInternal.*, liveReports.getReport, partner.getUsage
 
 [ruby : public]
 generator = RubyClientGenerator

diff --git a/exec.php b/exec.php
@@ -54,6 +54,7 @@
 require_once(__DIR__ . "/lib/BpmnClientGenerator.php");
 require_once(__DIR__ . "/lib/CliClientGenerator.php");
 require_once(__DIR__ . "/lib/CSharpClientGenerator.php");
+require_once(__DIR__ . "/lib/CSharp2ClientGenerator.php");
 require_once(__DIR__ . "/lib/ErlangClientGenerator.php");
 require_once(__DIR__ . "/lib/JsClientGenerator.php");
 require_once(__DIR__ . "/lib/NodeClientGenerator.php");

diff --git a/lib/AjaxClientGenerator.php b/lib/AjaxClientGenerator.php
@@ -197,9 +197,6 @@ protected function writeService(SimpleXMLElement $serviceNodes)
 					if (count($info)>0)
 						$infoTxt = ' ('.join(', ', $info).')';
 					$this->appendLine("	 * @param\t$paramName\t$paramType\t\t{$description}{$infoTxt}");
-				} else {
-					$rettype = $actionParam->attributes()->type;
-					$this->appendLine("	 * @return\t$rettype.");
 				}
 			}