Changeset 598

Timestamp:

09/29/07 21:47:25 (1 year ago)

Author:

laurentj

Message:

ticket #153: old class namming is now disabled and enableOldClassNaming option in the configuration is removed

Files:

• trunk/build/buildjelix.php (modified) (2 diffs)
• trunk/build/buildjelix.php (modified) (2 diffs)
• trunk/build/config/jelix-dist-dev.ini (modified) (1 diff)
• trunk/build/config/jelix-dist-dev.ini (modified) (1 diff)
• trunk/build/config/jelix-dist-gold.ini (modified) (1 diff)
• trunk/build/config/jelix-dist-gold.ini (modified) (1 diff)
• trunk/build/config/jelix-dist-opt.ini (modified) (1 diff)
• trunk/build/config/jelix-dist-opt.ini (modified) (1 diff)
• trunk/build/config/jelix-test.ini (modified) (1 diff)
• trunk/build/config/jelix-test.ini (modified) (1 diff)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
• trunk/lib/jelix/core/jSelector.class.php (modified) (1 diff)
• trunk/lib/jelix/core/jSelector.class.php (modified) (1 diff)
• trunk/lib/jelix/events/jEventListenerFactory.class.php (modified) (1 diff)
• trunk/lib/jelix/events/jEventListenerFactory.class.php (modified) (1 diff)
• trunk/lib/jelix/plugins/urls/significant/significant.urls.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/urls/significant/significant.urls.php (modified) (2 diffs)
• trunk/lib/jelix/utils/jZone.class.php (modified) (1 diff)
• trunk/lib/jelix/utils/jZone.class.php (modified) (1 diff)

trunk/build/buildjelix.php

@@ -56 +56 @@
-    false,
-    ),
-'ENABLE_OLD_CLASS_NAMING'=>array(
-    "old module class naming (jelix <= 1.0a5) can be used",
-    true, //TODO false pour la 1.0 finale
-    ),
-'PACKAGE_TAR_GZ'=>array(
-    "create a tar.gz package",
@@ -66 +62 @@
-'PACKAGE_ZIP'=>array(
-    "create a zip package",
+    false,
+    ),
+'ENABLE_OLD_CLASS_NAMING'=>array(
+    "old module class naming (jelix <= 1.0a5) can be used. deprecated for Jelix 1.0.",
-    false,
-    ),

trunk/build/buildjelix.php

@@ -56 +56 @@
-    false,
-    ),
-'ENABLE_OLD_CLASS_NAMING'=>array(
-    "old module class naming (jelix <= 1.0a5) can be used",
-    true, //TODO false pour la 1.0 finale
-    ),
-'PACKAGE_TAR_GZ'=>array(
-    "create a tar.gz package",
@@ -66 +62 @@
-'PACKAGE_ZIP'=>array(
-    "create a zip package",
+    false,
+    ),
+'ENABLE_OLD_CLASS_NAMING'=>array(
+    "old module class naming (jelix <= 1.0a5) can be used. deprecated for Jelix 1.0.",
-    false,
-    ),

trunk/build/config/jelix-dist-dev.ini

@@ -12 +12 @@
-STRIP_COMMENT =
-ENABLE_OPTIMIZED_SOURCE =
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ = 1

trunk/build/config/jelix-dist-dev.ini

@@ -12 +12 @@
-STRIP_COMMENT =
-ENABLE_OPTIMIZED_SOURCE =
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ = 1

trunk/build/config/jelix-dist-gold.ini

@@ -12 +12 @@
-STRIP_COMMENT = 1
-ENABLE_OPTIMIZED_SOURCE = 1
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ = 1

trunk/build/config/jelix-dist-gold.ini

@@ -12 +12 @@
-STRIP_COMMENT = 1
-ENABLE_OPTIMIZED_SOURCE = 1
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ = 1

trunk/build/config/jelix-dist-opt.ini

@@ -12 +12 @@
-STRIP_COMMENT = 1
-ENABLE_OPTIMIZED_SOURCE = 1
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ = 1

trunk/build/config/jelix-dist-opt.ini

@@ -12 +12 @@
-STRIP_COMMENT = 1
-ENABLE_OPTIMIZED_SOURCE = 1
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ = 1

trunk/build/config/jelix-test.ini

@@ -12 +12 @@
-STRIP_COMMENT =
-ENABLE_OPTIMIZED_SOURCE =
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ =

trunk/build/config/jelix-test.ini

@@ -12 +12 @@
-STRIP_COMMENT =
-ENABLE_OPTIMIZED_SOURCE =
-ENABLE_OLD_CLASS_NAMING = 1
-
-PACKAGE_TAR_GZ =

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -21 +21 @@
-use_error_handler = on
-shared_session = off
-
-enableOldClassNaming = off
-
-[plugins]

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -21 +21 @@
-use_error_handler = on
-shared_session = off
-
-enableOldClassNaming = off
-
-[plugins]

trunk/lib/jelix/core/jSelector.class.php

@@ -226 +226 @@
-
-    public function getClass(){
+        $className = $this->controller.'Ctrl';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-            if(class_exists('CT'.$this->controller,false))
-                $className = 'CT'.$this->controller;
-        }
-#else
-        $className = $this->controller.'Ctrl';
-#endif
-        return $className;

trunk/lib/jelix/core/jSelector.class.php

@@ -226 +226 @@
-
-    public function getClass(){
+        $className = $this->controller.'Ctrl';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-            if(class_exists('CT'.$this->controller,false))
-                $className = 'CT'.$this->controller;
-        }
-#else
-        $className = $this->controller.'Ctrl';
-#endif
-        return $className;

trunk/lib/jelix/events/jEventListenerFactory.class.php

@@ -86 +86 @@
-            global $gJConfig;
-            require_once ($gJConfig->_modulesPathList[$module].'classes/'.strtolower ($listenerName).'.listener.php');
+            $className = $listenerName.'Listener';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-                $className = 'Listener'.$listenerName;
-            }
-#else
-            $className = $listenerName.'Listener';
-#endif
-            self::$_listenersSingleton[$module][$listenerName] =  new $className ();

trunk/lib/jelix/events/jEventListenerFactory.class.php

@@ -86 +86 @@
-            global $gJConfig;
-            require_once ($gJConfig->_modulesPathList[$module].'classes/'.strtolower ($listenerName).'.listener.php');
+            $className = $listenerName.'Listener';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-                $className = 'Listener'.$listenerName;
-            }
-#else
-            $className = $listenerName.'Listener';
-#endif
-            self::$_listenersSingleton[$module][$listenerName] =  new $className ();

trunk/lib/jelix/plugins/urls/significant/significant.urls.php

@@ -157 +157 @@
-                // array( 0=> 'module', 1=>'action', 2=>'selecteur handler', 3=>array('actions','secondaires'))
-                $s = new jSelectorUrlHandler($infoparsing[2]);
+                $c =$s->className.'UrlsHandler';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-                    $c ='URLS'.$s->resource;
-                }
-#else
-                $c =$s->className.'UrlsHandler';
-#endif
-                $handler =new $c();
@@ -352 +350 @@
-        if($urlinfo[0]==0){
-            $s = new jSelectorUrlHandler($urlinfo[3]);
+            $c =$s->resource.'UrlsHandler';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-                $c ='URLS'.$s->resource;
-            }
-#else
-            $c =$s->resource.'UrlsHandler';
-#endif
-            $handler =new $c();

trunk/lib/jelix/plugins/urls/significant/significant.urls.php

@@ -157 +157 @@
-                // array( 0=> 'module', 1=>'action', 2=>'selecteur handler', 3=>array('actions','secondaires'))
-                $s = new jSelectorUrlHandler($infoparsing[2]);
+                $c =$s->className.'UrlsHandler';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-                    $c ='URLS'.$s->resource;
-                }
-#else
-                $c =$s->className.'UrlsHandler';
-#endif
-                $handler =new $c();
@@ -352 +350 @@
-        if($urlinfo[0]==0){
-            $s = new jSelectorUrlHandler($urlinfo[3]);
+            $c =$s->resource.'UrlsHandler';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-                $c ='URLS'.$s->resource;
-            }
-#else
-            $c =$s->resource.'UrlsHandler';
-#endif
-            $handler =new $c();

trunk/lib/jelix/utils/jZone.class.php

@@ -285 +285 @@
-        $fileName = $sel->getPath();
-        require_once($fileName);
+        $className = $sel->resource.'Zone';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-            $className = 'Zone'.$sel->resource;
-        }
-#else
-        $className = $sel->resource.'Zone';
-#endif
-        $zone = new $className ($params);

trunk/lib/jelix/utils/jZone.class.php

@@ -285 +285 @@
-        $fileName = $sel->getPath();
-        require_once($fileName);
+        $className = $sel->resource.'Zone';
-#if ENABLE_OLD_CLASS_NAMING
-
-
+
-            $className = 'Zone'.$sel->resource;
-        }
-#else
-        $className = $sel->resource.'Zone';
-#endif
-        $zone = new $className ($params);