Changeset 477
- Timestamp:
- 06/30/07 00:06:40 (2 years ago)
- Files:
-
- trunk/build/manifests/jelix-lib.mn (modified) (2 diffs)
- trunk/build/manifests/jelix-lib.mn (modified) (2 diffs)
- trunk/build/manifests/jelix-no-opt.mn (modified) (1 diff)
- trunk/build/manifests/jelix-no-opt.mn (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_EN/errors.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_EN/errors.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_EN/errors.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_EN/errors.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_US/errors.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_US/errors.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_US/errors.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/en_US/errors.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-plugins/urls (added)
- trunk/lib/jelix-plugins/urls (added)
- trunk/lib/jelix-plugins/urls/significant (added)
- trunk/lib/jelix-plugins/urls/significant (added)
- trunk/lib/jelix-plugins/urls/significant/jSignificantUrlsCompiler.class.php (moved) (moved from trunk/lib/jelix/core/url/jUrlCompiler.significant.class.php) (1 diff)
- trunk/lib/jelix-plugins/urls/significant/jSignificantUrlsCompiler.class.php (moved) (moved from trunk/lib/jelix/core/url/jUrlCompiler.significant.class.php) (1 diff)
- trunk/lib/jelix-plugins/urls/significant/significant.urls.php (moved) (moved from trunk/lib/jelix/core/url/jUrlEngine.significant.class.php) (2 diffs)
- trunk/lib/jelix-plugins/urls/significant/significant.urls.php (moved) (moved from trunk/lib/jelix/core/url/jUrlEngine.significant.class.php) (2 diffs)
- trunk/lib/jelix-plugins/urls/simple (added)
- trunk/lib/jelix-plugins/urls/simple (added)
- trunk/lib/jelix-plugins/urls/simple/simple.urls.php (moved) (moved from trunk/lib/jelix/core/url/jUrlEngine.simple.class.php) (1 diff)
- trunk/lib/jelix-plugins/urls/simple/simple.urls.php (moved) (moved from trunk/lib/jelix/core/url/jUrlEngine.simple.class.php) (1 diff)
- trunk/lib/jelix/core/jUrl.class.php (moved) (moved from trunk/lib/jelix/core/url/jUrl.class.php) (1 diff)
- trunk/lib/jelix/core/jUrl.class.php (moved) (moved from trunk/lib/jelix/core/url/jUrl.class.php) (1 diff)
- trunk/lib/jelix/db/jDb.class.php (modified) (1 diff)
- trunk/lib/jelix/db/jDb.class.php (modified) (1 diff)
- trunk/lib/jelix/init.php (modified) (2 diffs)
- trunk/lib/jelix/init.php (modified) (2 diffs)
- trunk/testapp/var/config/dbprofils.ini.php.dist (modified) (1 diff)
- trunk/testapp/var/config/dbprofils.ini.php.dist (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/manifests/jelix-lib.mn
r475 r477 63 63 64 64 cd lib/jelix/core/url 65 jUrlCompiler.significant.class.php 66 * jUrlEngine.significant.class.php 67 jUrlEngine.simple.class.php 65 68 66 69 67 cd lib/jelix/dao … … 340 338 meta.xul.php 341 339 340 cd lib/jelix-plugins/urls/significant 341 jSignificantUrlsCompiler.class.php 342 * significant.urls.php 343 cd lib/jelix-plugins/urls/simple 344 simple.urls.php 345 342 346 cd lib/jelix-www 343 347 json.js trunk/build/manifests/jelix-lib.mn
r475 r477 63 63 64 64 cd lib/jelix/core/url 65 jUrlCompiler.significant.class.php 66 * jUrlEngine.significant.class.php 67 jUrlEngine.simple.class.php 65 68 66 69 67 cd lib/jelix/dao … … 340 338 meta.xul.php 341 339 340 cd lib/jelix-plugins/urls/significant 341 jSignificantUrlsCompiler.class.php 342 * significant.urls.php 343 cd lib/jelix-plugins/urls/simple 344 simple.urls.php 345 342 346 cd lib/jelix-www 343 347 json.js trunk/build/manifests/jelix-no-opt.mn
r367 r477 11 11 jResponse.class.php 12 12 * jSelector.class.php 13 14 cd lib/jelix/core/url 15 * jUrl.class.php 13 * jUrl.class.php 16 14 17 15 cd lib/jelix/db trunk/build/manifests/jelix-no-opt.mn
r367 r477 11 11 jResponse.class.php 12 12 * jSelector.class.php 13 14 cd lib/jelix/core/url 15 * jUrl.class.php 13 * jUrl.class.php 16 14 17 15 cd lib/jelix/db trunk/lib/jelix-modules/jelix/locales/en_EN/errors.ISO-8859-1.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- action 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_EN/errors.ISO-8859-1.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- action 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_EN/errors.UTF-8.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- action 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_EN/errors.UTF-8.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- action 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_US/errors.ISO-8859-1.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- actions 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_US/errors.ISO-8859-1.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- actions 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_US/errors.UTF-8.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- action 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/en_US/errors.UTF-8.properties
r475 r477 17 17 inifile.write.error = (24)Error while writing ini file %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Url engine "%s" is not found 21 22 #---- action 20 23 ad.controller.file.unknow=(100)Action %s : controller file %s doesn't exists 21 24 ad.controller.class.unknow=(101)Action %s : controller class %s doesn't exists (file : %s) trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.ISO-8859-1.properties
r475 r477 17 17 inifile.write.error = (24)Un probl� est survenu lors de l'�iture du fichier ini %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Le moteur d'url %s est introuvable 21 22 #---- actions 20 23 ad.controller.file.unknow=(100)Action %s : le fichier contr�r %s n'existe pas 21 24 ad.controller.class.unknow=(101)Action %s : la classe contr�r %s n'existe pas (fichier : %s) trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.ISO-8859-1.properties
r475 r477 17 17 inifile.write.error = (24)Un probl� est survenu lors de l'�iture du fichier ini %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Le moteur d'url %s est introuvable 21 22 #---- actions 20 23 ad.controller.file.unknow=(100)Action %s : le fichier contr�r %s n'existe pas 21 24 ad.controller.class.unknow=(101)Action %s : la classe contr�r %s n'existe pas (fichier : %s) trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.UTF-8.properties
r475 r477 17 17 inifile.write.error = (24)Un problème est survenu lors de l'écriture du fichier ini %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Le moteur d'url %s est introuvable 21 22 #---- actions 20 23 ad.controller.file.unknow=(100)Action %s : le fichier contrôleur %s n'existe pas 21 24 ad.controller.class.unknow=(101)Action %s : la classe contrôleur %s n'existe pas (fichier : %s) trunk/lib/jelix-modules/jelix/locales/fr_FR/errors.UTF-8.properties
r475 r477 17 17 inifile.write.error = (24)Un problème est survenu lors de l'écriture du fichier ini %s 18 18 19 #---- actiondesc 19 #---- urls 20 urls.engine.notfound=(30)Le moteur d'url %s est introuvable 21 22 #---- actions 20 23 ad.controller.file.unknow=(100)Action %s : le fichier contrôleur %s n'existe pas 21 24 ad.controller.class.unknow=(101)Action %s : la classe contrôleur %s n'existe pas (fichier : %s) trunk/lib/jelix-plugins/urls/significant/jSignificantUrlsCompiler.class.php
r470 r477 17 17 * @subpackage core_url 18 18 */ 19 class j UrlCompilerSignificantimplements jISimpleCompiler{19 class jSignificantUrlsCompiler implements jISimpleCompiler{ 20 20 21 21 public function compile($aSelector){ trunk/lib/jelix-plugins/urls/significant/jSignificantUrlsCompiler.class.php
r470 r477 17 17 * @subpackage core_url 18 18 */ 19 class j UrlCompilerSignificantimplements jISimpleCompiler{19 class jSignificantUrlsCompiler implements jISimpleCompiler{ 20 20 21 21 public function compile($aSelector){ trunk/lib/jelix-plugins/urls/significant/significant.urls.php
r409 r477 20 20 21 21 public function getCompiler(){ 22 require_once( JELIX_LIB_CORE_PATH.'url/jUrlCompiler.significant.class.php');23 $o = new j UrlCompilerSignificant();22 require_once(dirname(__FILE__).'/jSignificantUrlsCompiler.class.php'); 23 $o = new jSignificantUrlsCompiler(); 24 24 return $o; 25 25 } … … 70 70 * @copyright 2005-2006 Laurent Jouanneau 71 71 */ 72 class jUrlEngineSignificantimplements jIUrlEngine {72 class significantUrlEngine implements jIUrlEngine { 73 73 74 74 /** trunk/lib/jelix-plugins/urls/significant/significant.urls.php
r409 r477 20 20 21 21 public function getCompiler(){ 22 require_once( JELIX_LIB_CORE_PATH.'url/jUrlCompiler.significant.class.php');23 $o = new j UrlCompilerSignificant();22 require_once(dirname(__FILE__).'/jSignificantUrlsCompiler.class.php'); 23 $o = new jSignificantUrlsCompiler(); 24 24 return $o; 25 25 } … … 70 70 * @copyright 2005-2006 Laurent Jouanneau 71 71 */ 72 class jUrlEngineSignificantimplements jIUrlEngine {72 class significantUrlEngine implements jIUrlEngine { 73 73 74 74 /** trunk/lib/jelix-plugins/urls/simple/simple.urls.php
r426 r477 17 17 * @see jIUrlEngine 18 18 */ 19 class jUrlEngineSimple implements jIUrlEngine {19 class simpleUrlEngine implements jIUrlEngine { 20 20 21 21 /** trunk/lib/jelix-plugins/urls/simple/simple.urls.php
r426 r477 17 17 * @see jIUrlEngine 18 18 */ 19 class jUrlEngineSimple implements jIUrlEngine {19 class simpleUrlEngine implements jIUrlEngine { 20 20 21 21 /** trunk/lib/jelix/core/jUrl.class.php
r386 r477 343 343 344 344 if($engine === null){ 345 $file = JELIX_LIB_CORE_PATH.'url/jUrlEngine.'.$GLOBALS['gJConfig']->urlengine['engine'].'.class.php'; 346 if(!file_exists($file)){ 347 trigger_error("Url engine doesn't exist (".$GLOBALS['gJConfig']->urlengine['engine'].')',E_USER_ERROR); 348 return null; 345 global $gJConfig; 346 $name = $gJConfig->urlengine['engine']; 347 if(!isset($gJConfig->_pluginsPathList_urls) 348 || !isset($gJConfig->_pluginsPathList_urls[$name]) 349 || !file_exists($gJConfig->_pluginsPathList_urls[$name]) ){ 350 throw new jException('jelix~errors.urls.engine.notfound', $name); 349 351 } 350 include_once($file); 351 $cl='jUrlEngine'.$GLOBALS['gJConfig']->urlengine['engine']; 352 $p = $gJConfig->_pluginsPathList_urls[$name]; 353 require_once($p.$name.'.urls.php'); 354 355 $cl=$name.'UrlEngine'; 352 356 $engine = new $cl(); 353 357 } trunk/lib/jelix/core/jUrl.class.php
r386 r477 343 343 344 344 if($engine === null){ 345 $file = JELIX_LIB_CORE_PATH.'url/jUrlEngine.'.$GLOBALS['gJConfig']->urlengine['engine'].'.class.php'; 346 if(!file_exists($file)){ 347 trigger_error("Url engine doesn't exist (".$GLOBALS['gJConfig']->urlengine['engine'].')',E_USER_ERROR); 348 return null; 345 global $gJConfig; 346 $name = $gJConfig->urlengine['engine']; 347 if(!isset($gJConfig->_pluginsPathList_urls) 348 || !isset($gJConfig->_pluginsPathList_urls[$name]) 349 || !file_exists($gJConfig->_pluginsPathList_urls[$name]) ){ 350 throw new jException('jelix~errors.urls.engine.notfound', $name); 349 351 } 350 include_once($file); 351 $cl='jUrlEngine'.$GLOBALS['gJConfig']->urlengine['engine']; 352 $p = $gJConfig->_pluginsPathList_urls[$name]; 353 require_once($p.$name.'.urls.php'); 354 355 $cl=$name.'UrlEngine'; 352 356 $engine = new $cl(); 353 357 } trunk/lib/jelix/db/jDb.class.php
r475 r477 73 73 } 74 74 75 //pas de vérification sur l'éventuel partage de l'élément. 76 77 global $gJConfig; 78 if(!isset($gJConfig->_pluginsPathList_coord) 79 || !isset($gJConfig->_pluginsPathList_coord[$config['driver']]) 80 || !file_exists($gJConfig->_pluginsPathList_coord[$config['driver']]) ){ 81 throw new jException('jelix~auth.error.driver.notfound'); 82 } 83 require_once($gJConfig->_pluginsPathList_coord[$config['driver']]); 84 85 86 87 require_once(JELIX_LIB_DB_PATH.'/drivers/'.$driver.'/jDbTools.'.$driver.'.class.php'); 88 $class = 'jDbTools'.$driver; 75 global $gJConfig; 76 if(!isset($gJConfig->_pluginsPathList_db) 77 || !isset($gJConfig->_pluginsPathList_db[$profil['driver']]) 78 || !file_exists($gJConfig->_pluginsPathList_db[$profil['driver']]) ){ 79 throw new jException('jelix~db.error.driver.notfound', $profil['driver']); 80 } 81 $p = $gJConfig->_pluginsPathList_db[$profil['driver']]; 82 require_once($p.$profil['driver'].'.dbtools.php'); 83 $class = $profil['driver'].'DbTools'; 89 84 90 85 //Création de l'objet trunk/lib/jelix/db/jDb.class.php
r475 r477 73 73 } 74 74 75 //pas de vérification sur l'éventuel partage de l'élément. 76 77 global $gJConfig; 78 if(!isset($gJConfig->_pluginsPathList_coord) 79 || !isset($gJConfig->_pluginsPathList_coord[$config['driver']]) 80 || !file_exists($gJConfig->_pluginsPathList_coord[$config['driver']]) ){ 81 throw new jException('jelix~auth.error.driver.notfound'); 82 } 83 require_once($gJConfig->_pluginsPathList_coord[$config['driver']]); 84 85 86 87 require_once(JELIX_LIB_DB_PATH.'/drivers/'.$driver.'/jDbTools.'.$driver.'.class.php'); 88 $class = 'jDbTools'.$driver; 75 global $gJConfig; 76 if(!isset($gJConfig->_pluginsPathList_db) 77 || !isset($gJConfig->_pluginsPathList_db[$profil['driver']]) 78 || !file_exists($gJConfig->_pluginsPathList_db[$profil['driver']]) ){ 79 throw new jException('jelix~db.error.driver.notfound', $profil['driver']); 80 } 81 $p = $gJConfig->_pluginsPathList_db[$profil['driver']]; 82 require_once($p.$profil['driver'].'.dbtools.php'); 83 $class = $profil['driver'].'DbTools'; 89 84 90 85 //Création de l'objet trunk/lib/jelix/init.php
r476 r477 83 83 #includephp core/jConfig.class.php 84 84 #includephp core/jSelector.class.php 85 #includephp core/ url/jUrl.class.php85 #includephp core/jUrl.class.php 86 86 #includephp core/jCoordinator.class.php 87 87 #includephp core/jController.class.php … … 101 101 require_once (JELIX_LIB_CORE_PATH . 'jConfig.class.php'); 102 102 require_once (JELIX_LIB_CORE_PATH . 'jSelector.class.php'); 103 require_once (JELIX_LIB_CORE_PATH . ' url/jUrl.class.php');103 require_once (JELIX_LIB_CORE_PATH . 'jUrl.class.php'); 104 104 require_once (JELIX_LIB_CORE_PATH . 'jCoordinator.class.php'); 105 105 require_once (JELIX_LIB_CORE_PATH . 'jController.class.php'); trunk/lib/jelix/init.php
r476 r477 83 83 #includephp core/jConfig.class.php 84 84 #includephp core/jSelector.class.php 85 #includephp core/ url/jUrl.class.php85 #includephp core/jUrl.class.php 86 86 #includephp core/jCoordinator.class.php 87 87 #includephp core/jController.class.php … … 101 101 require_once (JELIX_LIB_CORE_PATH . 'jConfig.class.php'); 102 102 require_once (JELIX_LIB_CORE_PATH . 'jSelector.class.php'); 103 require_once (JELIX_LIB_CORE_PATH . ' url/jUrl.class.php');103 require_once (JELIX_LIB_CORE_PATH . 'jUrl.class.php'); 104 104 require_once (JELIX_LIB_CORE_PATH . 'jCoordinator.class.php'); 105 105 require_once (JELIX_LIB_CORE_PATH . 'jController.class.php'); trunk/testapp/var/config/dbprofils.ini.php.dist
r468 r477 49 49 [jelix_tests_forward] 50 50 driver="mysql" 51 database=" unittest_forward"51 database="jelix_tests_forward" 52 52 host= "localhost_forward" 53 53 user= "plop_forward" trunk/testapp/var/config/dbprofils.ini.php.dist
r468 r477 49 49 [jelix_tests_forward] 50 50 driver="mysql" 51 database=" unittest_forward"51 database="jelix_tests_forward" 52 52 host= "localhost_forward" 53 53 user= "plop_forward"
