CDPP / AMDA_Integration

Commit 8f32f7bf3ae40f65cb5569d0483f318b37080392

Authored by Elena.Budnik
2 parents 577d5c04 007b11f6
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Integration 

IMPEX Integration
Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
Inline Side-by-side
config/AMDAIntegrationConfig.php
  Diff comments   View file @8f32f7b
... ... @@ -103,12 +103,12 @@ switch ($localIP)
103 103  
104 104 break;
105 105  
106   - case '195.83.102.54' :
  106 + case '10.121.0.31' :
107 107 define('PLATFORM_NAME','amdatest');
108 108  
109 109 //AKKA - Force the IP client value to prevent a bug with DDServer
110 110 // The IP client must be write with the pattern : xxx.xxx.xxx.xxx
111   - define('FORCE_CLIENT_IP', '195.083.102.054');
  111 + define('FORCE_CLIENT_IP', '010.121.000.031');
112 112  
113 113 // true for AKKA
114 114 // false or not defined for IRAP
... ... @@ -116,10 +116,10 @@ switch ($localIP)
116 116 //define('AKKA_SVN', 'true');
117 117  
118 118 //Path to AMDA_Kernel base dir
119   - define('NEWKERNEL_BASE_PATH', '/home/myriam/AMDA_Kernel/');
  119 + define('NEWKERNEL_BASE_PATH', '/home/myriam/AMDA_20161215/AMDA_Kernel/');
120 120  
121 121 //Path to AMDA_IHM base dir
122   - define('IHM_SRC_DIR', '/home/myriam/AMDA_IHM/');
  122 + define('IHM_SRC_DIR', '/home/myriam/AMDA_20161215/AMDA_IHM/');
123 123 break;
124 124 }
125 125  
... ... @@ -135,10 +135,10 @@ define('INTEGRATION_SRC_DIR', INTEGRATION_BASE_PATH.'src/');
135 135 define('NEWKERNEL_SRC_DIR', NEWKERNEL_BASE_PATH.'src/');
136 136  
137 137 //Path to AMDA_Kernel install dir dir
138   -define ('NEWKERNEL_INSTALL_DIR', NEWKERNEL_BASE_PATH.'build/Debug/');
  138 +define ('NEWKERNEL_INSTALL_DIR', NEWKERNEL_BASE_PATH.'build/Release/');
139 139  
140 140 //Path to AMDA_Kernel config dir
141   -define('NEWKERNEL_CONFIG_DIR', NEWKERNEL_BASE_PATH.'app-debug/');
  141 +define('NEWKERNEL_CONFIG_DIR', NEWKERNEL_BASE_PATH.'app-release/');
142 142  
143 143 //Path to AMDA_Kernel XSD dir
144 144 define('NEWKERNEL_XSD_DIR', NEWKERNEL_BASE_PATH.'config/DataBaseParameters/xsd/');
... ... @@ -153,6 +153,6 @@ define('PARAMS_LOCALDB_DIR', IHM_SRC_DIR.'generic_data/newKernelDDBase/');
153 153 define('PARAMS_LOCALINFO_DIR', IHM_SRC_DIR.'generic_data/ParamInfo/');
154 154  
155 155 //Path to dir that include DD.res file
156   -define('DDRES_DIR', NEWKERNEL_BASE_PATH.'app-debug/');
  156 +define('DDRES_DIR', NEWKERNEL_BASE_PATH.'app-release/');
157 157  
158 158 ?>
... ...