Changeset 1159

Show
Ignore:
Timestamp:
11/09/08 02:09:19 (2 months ago)
Author:
laurentj
Message:

worked on jelix script:
ticket #163: createapp, added the possibility to indicate a path for the document root of the application
Ticket #486: new command createentrypoint to create any type of entrypoints
Ticket #609: Make application.init.php the single entry point for framework path dependancy
no ticket: now project.xml and module.xml are generated with a default content according the new schema
added some constant in scripts.conf.php so we can define default values for the copyright, the author, the licence etc.

all templates use now this constants when needed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/manifests/jelix-dev.mn

    r907 r1159  
    111111  createdao.cmd.php 
    112112  createdaocrud.cmd.php 
     113  createentrypoint.cmd.php 
    113114  createform.cmd.php 
    114115  createmodule.cmd.php 

  • trunk/lib/jelix-scripts/commands/createapp.cmd.php

    r1110 r1159  
    33/** 
    44* @package     jelix-scripts 
    5 * @author      Jouanneau Laurent 
     5* @author      Laurent Jouanneau 
    66* @contributor Loic Mathaud 
    77* @contributor Gildas Givaja (bug #83) 
    88* @contributor Christophe Thiriot 
    99* @contributor Bastien Jaillot 
    10 * @copyright   2005-2007 Jouanneau laurent, 2006 Loic Mathaud, 2007 Gildas Givaja, 2007 Christophe Thiriot, 2008 Bastien Jaillot 
     10* @copyright   2005-2008 Laurent Jouanneau, 2006 Loic Mathaud, 2007 Gildas Givaja, 2007 Christophe Thiriot, 2008 Bastien Jaillot 
    1111* @link        http://www.jelix.org 
    1212* @licence     GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html 
    …… 
    1616 
    1717    public  $name = 'createapp'; 
    18     public  $allowed_options=array('-nodefaultmodule'=>false, '-withcmdline'=>false, '-withrpc'=>false); 
     18    public  $allowed_options=array('-nodefaultmodule'=>false, 
     19                                   '-withcmdline'=>false, 
     20                                   '-wwwpath'=>true); 
    1921    public  $allowed_parameters=array(); 
    2022 
    21     public  $syntaxhelp = "[-nodefaultmodule] [-withcmdline] [-withrpc]"; 
     23    public  $syntaxhelp = "[-nodefaultmodule] [-withcmdline] [-wwwpath a_path]"; 
    2224    public  $help=''; 
    2325 
    …… 
    6062       } 
    6163 
    62        $this->createDir(JELIX_APP_PATH); 
     64        $this->createDir(JELIX_APP_PATH); 
     65 
     66        if ($p = $this->getOption('-wwwpath')) { 
     67            $wwwpath = realpath(JELIX_APP_PATH.$p).'/'; 
     68        } 
     69        else { 
     70            $wwwpath = JELIX_APP_WWW_PATH; 
     71        } 
     72 
    6373       $this->createDir(JELIX_APP_TEMP_PATH); 
    64        $this->createDir(JELIX_APP_WWW_PATH); 
     74       $this->createDir($wwwpath); 
    6575       $this->createDir(JELIX_APP_VAR_PATH); 
    6676       $this->createDir(JELIX_APP_LOG_PATH); 
    …… 
    8393       $this->createDir(JELIX_APP_PATH.'responses'); 
    8494 
    85        $param = array('appname'=>$GLOBALS['APPNAME']); 
     95        $param = array(); 
     96        $param['default_id'] = $GLOBALS['APPNAME'].JELIXS_INFO_DEFAULT_IDSUFFIX; 
    8697 
    8798        if($this->getOption('-nodefaultmodule')) 
    …… 
    89100        else 
    90101            $param['tplname'] = $GLOBALS['APPNAME'].'~main'; 
     102 
     103        $param['config_file'] = 'index/config.ini.php'; 
    91104 
    92105       $this->createFile(JELIX_APP_PATH.'.htaccess','htaccess_deny',$param); 
    …… 
    102115       $param['rp_log'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_LOG_PATH,  true); 
    103116       $param['rp_conf']= jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CONFIG_PATH, true); 
    104        $param['rp_www'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_WWW_PATH,  true); 
     117       $param['rp_www'] = jxs_getRelativePath(JELIX_APP_PATH, $wwwpath,  true); 
    105118       $param['rp_cmd'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CMD_PATH,  true); 
    106  
     119       $param['rp_jelix'] = jxs_getRelativePath(JELIX_APP_PATH, JELIX_LIB_PATH, true); 
     120       $param['rp_app']   = jxs_getRelativePath($wwwpath, JELIX_APP_PATH, true); 
     121        
    107122       $this->createFile(JELIX_APP_PATH.'application.init.php','application.init.php.tpl',$param); 
    108123 
    109        $param = array('appname'=>$GLOBALS['APPNAME'], 'modulename'=>''); 
    110        $param['rp_jelix'] = jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_LIB_PATH, true); 
    111        $param['rp_app']   = jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_APP_PATH, true); 
    112  
    113        $this->createFile(JELIX_APP_WWW_PATH.'index.php','www/index.php.tpl',$param); 
    114        $this->createFile(JELIX_APP_WWW_PATH.'.htaccess','htaccess_allow',$param); 
     124       $this->createFile($wwwpath.'index.php','www/index.php.tpl',$param); 
     125       $this->createFile($wwwpath.'.htaccess','htaccess_allow',$param); 
    115126 
    116127       if(!$this->getOption('-nodefaultmodule')){ 
    …… 
    134145            $this->createFile(JELIX_APP_CMD_PATH.'cmdline.php','scripts/cmdline.php.tpl',$param); 
    135146       } 
    136  
    137        if($this->getOption('-withrpc')){ 
    138           $this->createDir(JELIX_APP_CONFIG_PATH.'jsonrpc/'); 
    139           $this->createDir(JELIX_APP_CONFIG_PATH.'xmlrpc/'); 
    140           $this->createFile(JELIX_APP_WWW_PATH.'jsonrpc.php','www/jsonrpc.php.tpl',$param); 
    141           $this->createFile(JELIX_APP_WWW_PATH.'xmlrpc.php','www/xmlrpc.php.tpl',$param); 
    142           $this->createFile(JELIX_APP_CONFIG_PATH.'jsonrpc/config.ini.php','var/config/jsonrpc/config.ini.php.tpl',$param); 
    143           $this->createFile(JELIX_APP_CONFIG_PATH.'xmlrpc/config.ini.php','var/config/xmlrpc/config.ini.php.tpl',$param); 
    144        } 
    145147    } 
    146148} 

  • trunk/lib/jelix-scripts/commands/createctrl.cmd.php

    r1018 r1159  
    5858       $method = $this->getParam('method','index'); 
    5959 
    60        $param= array('name'=>$this->_parameters['name'] , 'method'=>$method); 
     60       $param= array('name'=>$this->_parameters['name'] , 
     61                     'method'=>$method, 
     62                     'module'=>$this->_parameters['module']); 
    6163 
    6264       if ($this->getOption('-cmdline')) { 

  • trunk/lib/jelix-scripts/commands/createdaocrud.cmd.php

    r1018 r1159  
    6767 
    6868        $this->createDir($path.'controllers/'); 
    69         $this->createFile($path.'controllers/'.$ctrlname.'.classic.php','controller.daocrud.tpl',array('name'=>$ctrlname,  
    70                 'module'=>$this->_parameters['module'], 'table'=>$table, 'profil'=>$profil)); 
     69        $params = array('name'=>$ctrlname,  
     70                'module'=>$this->_parameters['module'], 
     71                'table'=>$table, 
     72                'profil'=>$profil); 
     73         
     74        $this->createFile($path.'controllers/'.$ctrlname.'.classic.php','controller.daocrud.tpl',$params); 
    7175    } 
    7276} 

  • trunk/lib/jelix-scripts/commands/createmodule.cmd.php

    r1093 r1159  
    5151        } 
    5252        $this->createDir($path); 
    53         $this->createFile($path.'module.xml','module.xml.tpl',array('name'=>$this->_parameters['module'])); 
     53         
     54        $param = array(); 
     55        $param['name']=$this->_parameters['module']; 
     56        $param['default_id'] = $this->_parameters['module'].JELIXS_INFO_DEFAULT_IDSUFFIX; 
     57 
     58        $this->createFile($path.'module.xml','module.xml.tpl',$param); 
    5459 
    5560        if(!$this->getOption('-nosubdir')){ 

  • trunk/lib/jelix-scripts/commands/createzone.cmd.php

    r1018 r1159  
    4545       $filename.=strtolower($this->_parameters['name']).'.zone.php'; 
    4646 
    47        $param= array('name'=>$this->_parameters['name'] , 'module'=>$this->_parameters['module']); 
     47       $param= array('name'=>$this->_parameters['name'] , 
     48                     'module'=>$this->_parameters['module']); 
    4849 
    4950       if(!$this->getOption('-notpl')){ 

  • trunk/lib/jelix-scripts/commands/installapp.cmd.php

    r1018 r1159  
    33/** 
    44* @package     jelix-scripts 
    5 * @author      Jouanneau Laurent 
     5* @author      Laurent Jouanneau 
    66* @contributor 
    77* @copyright   2008 Laurent Jouanneau 

  • trunk/lib/jelix-scripts/includes/command.class.php

    r1018 r1159  
    6363 
    6464   protected function createFile($filename, $template, $tplparam=array()){ 
     65       
     66      $defaultparams = array( 
     67         'default_website' => JELIXS_INFO_DEFAULT_WEBSITE, 
     68         'default_licence' => JELIXS_INFO_DEFAULT_LICENCE, 
     69         'default_licence_url' => JELIXS_INFO_DEFAULT_LICENCE_URL, 
     70         'default_creator_name' => JELIXS_INFO_DEFAULT_CREATOR_NAME, 
     71         'default_creator_email' => JELIXS_INFO_DEFAULT_CREATOR_EMAIL, 
     72         'default_copyright' => JELIXS_INFO_DEFAULT_COPYRIGHT, 
     73         'createdate' => date('Y-m-d'), 
     74         'jelix_version' => file_get_contents(JELIXS_LIB_PATH.'jelix/VERSION'), 
     75         'appname'=>$GLOBALS['APPNAME'], 
     76         'default_timezone'=>JELIXS_INFO_DEFAULT_TIMEZONE, 
     77         'default_locale'=>JELIXS_INFO_DEFAULT_LOCALE, 
     78      ); 
     79       
     80      $tplparam = array_merge($defaultparams, $tplparam); 
     81       
    6582      if(file_exists($filename)){ 
    6683         echo "Warning: the file '".$filename."' already exists\n"; 
    …… 
    7087 
    7188      if(!file_exists($tplpath)){ 
    72           echo "Error: template file '".$tplpath."' doesn't exist\n"; 
     89         echo "Error: template file '".$tplpath."' doesn't exist\n"; 
    7390         return false; 
    7491      } 

  • trunk/lib/jelix-scripts/includes/utils.lib.php

    r1018 r1159  
    101101} 
    102102 
    103  
    104  
    105  
    106103function jxs_getRelativePath($path, $targetPath, $intoString=false){ 
    107104    $cut = (DIRECTORY_SEPARATOR == '/'? '!/!': "![/\\\\]!"); 
    …… 
    109106    $path = preg_split($cut,$path); 
    110107    $targetPath = preg_split($cut,$targetPath); 
    111  
    112108 
    113109    $dir=''; 

  • trunk/lib/jelix-scripts/jelix.php

    r1092 r1159  
    6868require($jelix_config); 
    6969 
    70 // include all jelix libraries and constants : needed by some commands. 
    71 include (JELIXS_INIT_PATH); 
    72  
    7370define ('JELIX_SCRIPT_PATH', dirname(__FILE__).'/'); 
    74  
    75  
    7671 
    7772if(file_exists(JELIXS_APPTPL_PATH.'application.init.php')){ 
    …… 
    8176     die("Error: the given application doesn't exist (".JELIXS_APPTPL_PATH." )\n"); 
    8277   } 
     78   include (JELIXS_INIT_PATH); 
    8379   define ('JELIX_APP_PATH',         JELIXS_APPTPL_PATH ); 
    8480   define ('JELIX_APP_TEMP_PATH',    JELIXS_APPTPL_TEMP_PATH); 
    …… 
    9288include('includes/command.class.php'); 
    9389include('includes/utils.lib.php'); 
     90 
     91if(function_exists('date_default_timezone_set')){ 
     92   date_default_timezone_set(JELIXS_INFO_DEFAULT_TIMEZONE); 
     93} 
    9494 
    9595/** 

  • trunk/lib/jelix-scripts/scripts.conf.php

    r812 r1159  
    22/** 
    33* @package     jelix-scripts 
    4 * @version     $Id$ 
    54* @author      Jouanneau Laurent 
    65* @contributor Loic Mathaud 
    7 * @copyright   2005-2006 Jouanneau laurent 
     6* @copyright   2005-2008 Jouanneau laurent 
    87* @link        http://www.jelix.org 
    98* @licence     GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html 
    …… 
    3635*/ 
    3736 
     37// informations which will stored into generated files 
     38define('JELIXS_INFO_DEFAULT_IDSUFFIX','@yourwebsite.undefined'); 
     39define('JELIXS_INFO_DEFAULT_WEBSITE','http://www.yourwebsite.undefined'); 
     40define('JELIXS_INFO_DEFAULT_LICENCE','All right reserved'); 
     41define('JELIXS_INFO_DEFAULT_LICENCE_URL',''); 
     42define('JELIXS_INFO_DEFAULT_CREATOR_NAME','yourname'); 
     43define('JELIXS_INFO_DEFAULT_CREATOR_EMAIL','youremail@yourwebsite.undefined'); 
     44define('JELIXS_INFO_DEFAULT_COPYRIGHT','2008 yourname'); 
     45define('JELIXS_INFO_DEFAULT_TIMEZONE','Europe/Paris'); 
     46define('JELIXS_INFO_DEFAULT_LOCALE','en_EN'); 
     47 
    3848define('JELIXS_APP_CONFIG_FILE'    , 'defaultconfig.ini.php'); 
    3949define('DO_CHMOD',false); // indique si lors de la création des fichiers, il faut faire un chmod 

  • trunk/lib/jelix-scripts/templates/application.init.php.tpl

    r932 r1159  
    11<?php 
    22/** 
    3 * @package  %%appname%% 
    4 * @subpackage 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
    8 * @link 
    9 * @licence  http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    109*/ 
     10 
     11require (dirname(__FILE__).'/%%rp_jelix%%init.php'); 
    1112 
    1213define ('JELIX_APP_PATH', dirname (__FILE__).DIRECTORY_SEPARATOR); // don't change 

  • trunk/lib/jelix-scripts/templates/controller.cmdline.tpl

    r932 r1159  
    11<?php 
    22/** 
    3 * @package 
     3* @package   %%appname%% 
    44* @subpackage %%module%% 
    5 * @author 
    6 * @copyright 
    7 * @link 
    8 * @licence  http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file 
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence  %%default_licence_url%% %%default_licence%% 
    99*/ 
    1010 

  • trunk/lib/jelix-scripts/templates/controller.daocrud.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package 
     3* @package   %%appname%% 
    44* @subpackage %%module%% 
    5 * @author 
    6 * @copyright 
    7 * @link 
    8 * @licence  http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file 
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence  %%default_licence_url%% %%default_licence%% 
    99*/ 
    1010 

  • trunk/lib/jelix-scripts/templates/controller.newapp.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package 
     3* @package   %%appname%% 
    44* @subpackage %%module%% 
    5 * @author 
    6 * @copyright 
    7 * @link 
    8 * @licence  http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file 
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence  %%default_licence_url%% %%default_licence%% 
    99*/ 
    1010 

  • trunk/lib/jelix-scripts/templates/controller.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package 
     3* @package   %%appname%% 
    44* @subpackage %%module%% 
    5 * @author 
    6 * @copyright 
    7 * @link 
    8 * @licence  http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file 
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence  %%default_licence_url%% %%default_licence%% 
    99*/ 
    1010 

  • trunk/lib/jelix-scripts/templates/module.xml.tpl

    r386 r1159  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<module xmlns="http://jelix.org/ns/module/1.0"> 
     3    <info id="%%default_id%%" name="%%name%%" createdate="%%createdate%%"> 
     4        <version stability="pre-alpha" date="">0.1pre</version> 
     5        <label lang="%%default_locale%%">%%name%%</label> 
     6        <description lang="%%default_locale%%"></description> 
     7        <licence URL="%%default_licence_url%%">%%default_licence%%</licence> 
     8        <copyright>%%default_copyright%%</copyright> 
     9        <creator name="%%default_creator_name%%" email="%%default_creator_email%%" active="true" /> 
     10        <!--<contributor name="hisname" email="hisemail@yoursite.undefined" active="true" since="" role=""/>--> 
     11        <homepageURL>%%default_website%%</homepageURL> 
     12        <!--<updateURL>%%default_website%%/update.xml</updateURL>--> 
     13    </info> 
     14    <dependencies> 
     15        <jelix minversion="%%jelix_version%%" maxversion="%%jelix_version%%" /> 
     16    </dependencies> 
    317</module> 

  • trunk/lib/jelix-scripts/templates/myHtmlResponse.class.php.tpl

    r1110 r1159  
    1 <?php  
     1<?php 
     2/** 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
     9*/ 
     10 
     11 
    212require_once (JELIX_LIB_CORE_PATH.'response/jResponseHtml.class.php'); 
    313 

  • trunk/lib/jelix-scripts/templates/project.xml.tpl

    r386 r1159  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<project xmlns="http://jelix.org/ns/project/1.0"> 
    3  
     3    <info id="%%default_id%%" name="%%appname%%" createdate="%%createdate%%"> 
     4        <version stability="pre-alpha" date="">0.1pre</version> 
     5        <label lang="%%default_locale%%">%%appname%%</label> 
     6        <description lang="%%default_locale%%"></description> 
     7        <licence URL="%%default_licence_url%%">%%default_licence%%</licence> 
     8        <copyright>%%default_copyright%%</copyright> 
     9        <creator name="%%default_creator_name%%" email="%%default_creator_email%%" active="true" /> 
     10        <!--<contributor name="hisname" email="hisemail@yoursite.undefined" active="true" since="" role=""/>--> 
     11        <homepageURL>%%default_website%%</homepageURL> 
     12        <!--<updateURL>%%default_website%%/update.xml</updateURL>--> 
     13    </info> 
     14    <dependencies> 
     15        <jelix minversion="%%jelix_version%%" maxversion="%%jelix_version%%" /> 
     16    </dependencies> 
     17    <directories> 
     18        <config>%%rp_conf%%</config> 
     19        <log>%%rp_log%%</log> 
     20        <var>%%rp_var%%</var> 
     21        <www>%%rp_www%%</www> 
     22        <temp>%%rp_temp%%</temp> 
     23    </directories> 
     24    <entrypoints> 
     25        <entry file="index.php" config="index/config.ini.php" /> 
     26    </entrypoints> 
    427</project> 

  • trunk/lib/jelix-scripts/templates/scripts/cmdline.php.tpl

    r932 r1159  
    11<?php 
    22/** 
    3 * @package  %%appname%% 
    4 * @subpackage scripts 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    89*/ 
    9  
    10 require_once ('%%rp_jelix%%init.php'); 
    1110 
    1211require_once ('%%rp_app%%application.init.php'); 

  • trunk/lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl

    r1107 r1159  
    33;this file doesn't list all possible properties. See lib/jelix/core/defaultconfig.ini.php for that 
    44 
    5 locale = "en_EN" 
     5locale = "%%default_locale%%" 
    66charset = "UTF-8" 
    77 
    88; see http://www.php.net/manual/en/timezones.php for supported values 
    9 timeZone = "Europe/Paris" 
     9timeZone = "%%default_timezone%%" 
    1010 
    1111checkTrustedModules = off 

  • trunk/lib/jelix-scripts/templates/www/index.php.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package  %%appname%% 
    4 * @subpackage www 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    89*/ 
    910 
    10 require ('%%rp_jelix%%init.php'); 
    1111require ('%%rp_app%%application.init.php'); 
    1212require (JELIX_LIB_CORE_PATH.'request/jClassicRequest.class.php'); 
    1313 
    14 $config_file = 'index/config.ini.php'; 
     14$config_file = '%%config_file%%'; 
    1515 
    1616$jelix = new jCoordinator($config_file); 

  • trunk/lib/jelix-scripts/templates/www/jsonrpc.php.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package  %%appname%% 
    4 * @subpackage www 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    89*/ 
    910 
    10 require ('%%rp_jelix%%init.php'); 
    1111require ('%%rp_app%%application.init.php'); 
    1212require (JELIX_LIB_CORE_PATH.'request/jJsonRpcRequest.class.php'); 
    1313 
    14 $config_file = 'jsonrpc/config.ini.php'; 
     14$config_file = '%%config_file%%'; 
    1515$jelix = new jCoordinator($config_file); 
    1616$jelix->process(new jJsonRpcRequest()); 

  • trunk/lib/jelix-scripts/templates/www/rdf.php.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package  %%appname%% 
    4 * @subpackage www 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    89*/ 
    910 
    10 require ('%%rp_jelix%%init.php'); 
    1111require ('%%rp_app%%application.init.php'); 
    1212require (JELIX_LIB_CORE_PATH.'request/jRdfRequest.class.php'); 
    1313 
    14 $config_file = 'rdf/config.ini.php'; 
     14$config_file = '%%config_file%%'; 
    1515 
    1616$jelix = new jCoordinator($config_file); 

  • trunk/lib/jelix-scripts/templates/www/soap.php.tpl

    r879 r1159  
    11<?php 
    22/** 
    3 * @package       %%$appname%% 
    4 * @subpackage    www 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    89*/ 
    910 
    10 require_once ('%%rp_jelix%%init.php'); 
    1111require_once ('%%rp_app%%application.init.php'); 
    1212 
    …… 
    1616ini_set("soap.wsdl_cache_enabled", "0"); // disabling PHP's WSDL cache 
    1717 
    18 $config_file = 'soap/config.ini.php'; 
     18$config_file = '%%config_file%%'; 
    1919$jelix = new JSoapCoordinator($config_file); 
    2020$jelix->request = new JSoapRequest(); 

  • trunk/lib/jelix-scripts/templates/www/xmlrpc.php.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package  %%appname%% 
    4 * @subpackage www 
    5 * @author 
    6 * @contributor 
    7 * @copyright 
     3* @package   %%appname%% 
     4* @subpackage  
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence   %%default_licence_url%% %%default_licence%% 
    89*/ 
    910 
    10 require ('%%rp_jelix%%init.php'); 
    1111require ('%%rp_app%%application.init.php'); 
    1212require (JELIX_LIB_CORE_PATH.'request/jXmlRpcRequest.class.php'); 
    1313 
    14 $config_file = 'xmlrpc/config.ini.php'; 
     14$config_file = '%%config_file%%'; 
    1515$jelix = new JCoordinator($config_file); 
    1616$jelix->process(new jXmlRpcRequest()); 

  • trunk/lib/jelix-scripts/templates/zone.tpl

    r1026 r1159  
    11<?php 
    22/** 
    3 * @package 
     3* @package   %%appname%% 
    44* @subpackage %%module%% 
    5 * @author 
    6 * @copyright 
    7 * @link 
    8 * @licence  http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file 
     5* @author    %%default_creator_name%% 
     6* @copyright %%default_copyright%% 
     7* @link      %%default_website%% 
     8* @licence  %%default_licence_url%% %%default_licence%% 
    99*/ 
    1010 
    …… 
    1313 
    1414    protected function _prepareTpl(){ 
    15         $this->_tpl->assign('foo','bar'); 
     15        //$this->_tpl->assign('foo','bar'); 
    1616    } 
    1717} 

  • trunk/lib/jelix/docs/ns/item_infos.rng

    r1155 r1159  
    1111         <attribute name="name" /> 
    1212         <optional> 
    13             <attribute name="date"> 
    14                <data type="date" /> 
    15             </attribute> 
    16          </optional> 
    17          <optional> 
    18             <attribute name="datecreate"> 
     13            <attribute name="createdate"> 
    1914               <data type="date" /> 
    2015            </attribute> 
    …… 
    3025               </choice> 
    3126            </attribute> 
     27            <optional> 
     28               <attribute name="date"> 
     29                  <data type="date" /> 
     30               </attribute> 
     31            </optional> 
    3232            <text /> 
    3333         </element> 
    …… 
    7878         <element name="licence"> 
    7979            <optional> 
    80                <attribute name="url"> 
     80               <attribute name="URL"> 
    8181                  <data type="anyURI" /> 
    8282               </attribute> 
    8383            </optional> 
     84            <text /> 
     85         </element> 
     86         <element name="copyright"> 
    8487            <text /> 
    8588         </element> 

  • trunk/lib/jelix/docs/ns/module.rng

    r1152 r1159  
    1010      <element name="module"> 
    1111         <ref name="info" /> 
    12          <ref name="notes" /> 
     12         <optional> 
     13            <ref name="notes" /> 
     14         </optional> 
    1315         <ref name="dependencies" /> 
    1416      </element> 

  • trunk/lib/jelix/docs/ns/plugin.rng

    r1152 r1159  
    1111      <element name="plugin"> 
    1212         <ref name="info" /> 
    13          <ref name="notes" /> 
     13         <optional> 
     14            <ref name="notes" /> 
     15         </optional> 
    1416         <ref name="dependencies" /> 
    1517      </element> 

  • trunk/lib/jelix/docs/ns/project.rng

    r1152 r1159  
    1919      <element name="project"> 
    2020         <ref name="info" /> 
    21          <ref name="notes" /> 
     21         <optional> 
     22            <ref name="notes" /> 
     23         </optional> 
    2224         <ref name="dependencies" /> 
    2325         <ref name="directories"/> 
Download in other formats: Unified Diff Zip Archive