[TASK] EXT:dbal Uniform extension directory structure 96/41796/2
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 21 Jul 2015 21:44:03 +0000 (23:44 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Wed, 22 Jul 2015 12:55:23 +0000 (14:55 +0200)
Move mod1 directory to Modules/Dbal/
Move language files to Resources/PRivate/Language/

Resolves: #68451
Releases: master
Change-Id: I9e3c2238b2c71714c2f936a13dffc4029b3712f2
Reviewed-on: http://review.typo3.org/41796
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/dbal/Classes/Controller/ModuleController.php
typo3/sysext/dbal/Modules/Dbal/index.php [new file with mode: 0644]
typo3/sysext/dbal/Resources/Private/Language/locallang.xlf [new file with mode: 0644]
typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf [new file with mode: 0644]
typo3/sysext/dbal/ext_tables.php
typo3/sysext/dbal/mod1/clear.gif [deleted file]
typo3/sysext/dbal/mod1/index.php [deleted file]
typo3/sysext/dbal/mod1/locallang.xlf [deleted file]
typo3/sysext/dbal/mod1/locallang_mod.xlf [deleted file]

index 1c420e2..2069b5e 100644 (file)
@@ -42,7 +42,7 @@ class ModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $this->MCONF = array(
                        'name' => $this->moduleName,
                );
-               $this->getLanguageService()->includeLLFile('EXT:dbal/mod1/locallang.xlf');
+               $this->getLanguageService()->includeLLFile('EXT:dbal/Resources/Private/Language/locallang.xlf');
                parent::init();
        }
 
diff --git a/typo3/sysext/dbal/Modules/Dbal/index.php b/typo3/sysext/dbal/Modules/Dbal/index.php
new file mode 100644 (file)
index 0000000..cb0b405
--- /dev/null
@@ -0,0 +1,22 @@
+<?php
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+/**
+ * Module 'DBAL Debug' for the 'dbal' extension.
+ */
+
+$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Dbal\Controller\ModuleController::class);
+$GLOBALS['SOBE']->init();
+$GLOBALS['SOBE']->main();
+$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/dbal/Resources/Private/Language/locallang.xlf b/typo3/sysext/dbal/Resources/Private/Language/locallang.xlf
new file mode 100644 (file)
index 0000000..8d63f03
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814811" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="dbal">
+               <header/>
+               <body>
+                       <trans-unit id="title">
+                               <source>DBAL Analysis Module</source>
+                       </trans-unit>
+                       <trans-unit id="Debug_log">
+                               <source>Debug log</source>
+                       </trans-unit>
+                       <trans-unit id="Cached_info">
+                               <source>Cached info</source>
+                       </trans-unit>
+                       <trans-unit id="SQL_check">
+                               <source>SQL Check</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf b/typo3/sysext/dbal/Resources/Private/Language/locallang_mod.xlf
new file mode 100644 (file)
index 0000000..b7d6690
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814812" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="dbal">
+               <header/>
+               <body>
+                       <trans-unit id="mlang_tabs_tab">
+                               <source>DBAL Debug</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
index d4d5ce9..0144f9c 100644 (file)
@@ -6,16 +6,16 @@ if (TYPO3_MODE === 'BE') {
                'tools',
                'txdbalM1',
                '',
-               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/',
+               'EXT:dbal/Modules/Dbal/',
                array(
                        'script' => '_DISPATCH',
                        'access' => 'admin',
                        'name' => 'tools_txdbalM1',
                        'labels' => array(
                                'tabs_images' => array(
-                                       'tab' => '../Resources/Public/Icons/module-dbal.svg',
+                                       'tab' => 'EXT:dbal/Resources/Public/Icons/module-dbal.svg',
                                ),
-                               'll_ref' => 'LLL:EXT:dbal/mod1/locallang_mod.xlf',
+                               'll_ref' => 'LLL:EXT:dbal/Resources/Private/Language/locallang_mod.xlf',
                        ),
                )
        );
diff --git a/typo3/sysext/dbal/mod1/clear.gif b/typo3/sysext/dbal/mod1/clear.gif
deleted file mode 100644 (file)
index e1d2d83..0000000
Binary files a/typo3/sysext/dbal/mod1/clear.gif and /dev/null differ
diff --git a/typo3/sysext/dbal/mod1/index.php b/typo3/sysext/dbal/mod1/index.php
deleted file mode 100644 (file)
index cb0b405..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-/**
- * Module 'DBAL Debug' for the 'dbal' extension.
- */
-
-$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Dbal\Controller\ModuleController::class);
-$GLOBALS['SOBE']->init();
-$GLOBALS['SOBE']->main();
-$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/dbal/mod1/locallang.xlf b/typo3/sysext/dbal/mod1/locallang.xlf
deleted file mode 100644 (file)
index 8d63f03..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814811" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="dbal">
-               <header/>
-               <body>
-                       <trans-unit id="title">
-                               <source>DBAL Analysis Module</source>
-                       </trans-unit>
-                       <trans-unit id="Debug_log">
-                               <source>Debug log</source>
-                       </trans-unit>
-                       <trans-unit id="Cached_info">
-                               <source>Cached info</source>
-                       </trans-unit>
-                       <trans-unit id="SQL_check">
-                               <source>SQL Check</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/dbal/mod1/locallang_mod.xlf b/typo3/sysext/dbal/mod1/locallang_mod.xlf
deleted file mode 100644 (file)
index b7d6690..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814812" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:32Z" product-name="dbal">
-               <header/>
-               <body>
-                       <trans-unit id="mlang_tabs_tab">
-                               <source>DBAL Debug</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>