Skip to content

Commit 029d924

Browse files
reem-atalahreem-atalah
committed
#25 namespaces to Joomla #26 arrange the used models alphabetically
1 parent 71a00e2 commit 029d924

30 files changed

+94
-94
lines changed

‎component_manifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<creationDate>2025-07-06</creationDate>
55
<author>Joomla! Project</author>
66
<authorUrl>https://github.com/username/gsoc25_api</authorUrl>
7-
<copyright>Copyright (C) 2025 Reem. All rights reserved.</copyright>
7+
<copyright>Copyright (C) 2025 Joomla. All rights reserved.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
99
<version>0.8.0-alpha</version>
1010
<description>COM_CCM_DESCRIPTION</description>

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "reem/joomla-ccm-component",
2+
"name": "joomla/ccm-component",
33
"description": "Content Creation Management Component for Joomla",
44
"type": "project",
55
"license": "GPL-2.0-or-later",
@@ -12,8 +12,8 @@
1212
},
1313
"autoload": {
1414
"psr-4": {
15-
"Reem\\Component\\CCM\\": "src/administrator/components/com_ccm/src/",
16-
"Reem\\Tests\\": "tests/"
15+
"Joomla\\Component\\CCM\\": "src/administrator/components/com_ccm/src/",
16+
"Joomla\\Tests\\": "tests/"
1717
}
1818
},
1919
"config": {

‎src/administrator/components/com_ccm/ccm.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
88
<version>1.0.1</version>
99
<description>COM_CCM_DESCRIPTION</description>
10-
<namespace path="src">Reem\Component\CCM</namespace>
10+
<namespace path="src">Joomla\Component\CCM</namespace>
1111
<install>
1212
<sql>
1313
<file driver="mysql" charset="utf8">sql/install.mysql.utf8.sql</file>
@@ -50,6 +50,6 @@
5050
</submenu>
5151
</administration>
5252

53-
<extensionclass>Reem\Component\CCM\Administrator\Extension\CCMComponent</extensionclass>
53+
<extensionclass>Joomla\Component\CCM\Administrator\Extension\CCMComponent</extensionclass>
5454

5555
</extension>

‎src/administrator/components/com_ccm/forms/cms.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<form addfieldprefix="Reem\Component\CCM\Administrator\Fields">
2+
<form addfieldprefix="Joomla\Component\CCM\Administrator\Fields">
33
<field
44
name="name"
55
type="text"

‎src/administrator/components/com_ccm/forms/migration.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<form addfieldprefix="Reem\Component\CCM\Administrator\Fields">
2+
<form addfieldprefix="Joomla\Component\CCM\Administrator\Fields">
33
<!-- Simplified form - automatically migrates all compatible content types -->
44
<field
55
name="source_cms"
66
type="cms"
7-
label="MIGRATION_SOURCE_CMS"
7+
label="COM_CCM_MIGRATION_SOURCE_CMS"
88
required="true"
99
default=""
1010
/>
1111
<field
1212
name="target_cms"
1313
type="cms"
14-
label="MIGRATION_TARGET_CMS"
14+
label="COM_CCM_MIGRATION_TARGET_CMS"
1515
required="true"
1616
default=""
1717
/>

‎src/administrator/components/com_ccm/language/en-GB/com_ccm.ini‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT"
2-
COM_CCM_MENU_BACKEND="CMSs"
3-
COM_CCM_CONFIGURATION="CCM Migration Configuration"
4-
COM_CCM_OPTIONS="Options"
5-
COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from."
6-
COM_CCM_CONFIG_NAME_LABEL="CMS Name"
7-
COM_CCM_CONFIG_ID_LABEL="CMS ID"
81
COM_CCM="CMS Migration"
9-
COM_CCM_FILTER_SEARCH="Search"
10-
COM_CCM_CMS_NAME="CMS Name"
2+
COM_CCM_APPLY_MIGRATION_BTN="Apply Migration"
113
COM_CCM_CMS_ID="CMS ID"
4+
COM_CCM_CMS_NAME="CMS Name"
5+
COM_CCM_CMS_NAME_ADD="Add new CMS"
126
COM_CCM_CMS_NAME_EDIT="Edit CMS"
13-
COM_CCM_CONFIG_URL_LABEL="CMS URL"
14-
COM_CCM_CONFIG_CREDENTIALS_LABEL="Credentials"
15-
COM_CCM_CONFIG_CREDENTIALS_DESC="Enter credentials details as a Token or username:password. Example: cmVlbTE6TXpla3 or joomla:password"
16-
COM_CCM_CONFIG_CCM_MAPPING_LABEL="CCM Mapping"
7+
COM_CCM_CMS_NAME_LIST="CMS Names List"
178
COM_CCM_CONFIG_CCM_MAPPED_FIELDS_LABEL="CCM Mapped Fields"
9+
COM_CCM_CONFIG_CCM_MAPPING_LABEL="CCM Mapping"
1810
COM_CCM_CONFIG_CCM_UNMAPPED_FIELDS_LABEL="CCM Unmapped Fields"
11+
COM_CCM_CONFIG_CREDENTIALS_DESC="Enter credentials details as a Token or username:password. Example: cmVlbTE6TXpla3 or joomla:password"
12+
COM_CCM_CONFIG_CREDENTIALS_LABEL="Credentials"
13+
COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from."
14+
COM_CCM_CONFIG_ID_LABEL="CMS ID"
1915
COM_CCM_CONFIG_MIGRATION_LABEL="Select CMS you want to migrate with"
20-
COM_CCM_CMS_NAME_LIST="CMS Names List"
21-
COM_CCM_CMS_NAME_ADD="Add new CMS"
16+
COM_CCM_CONFIG_NAME_LABEL="CMS Name"
17+
COM_CCM_CONFIG_URL_LABEL="CMS URL"
18+
COM_CCM_CONFIGURATION="CCM Migration Configuration"
19+
COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT"
20+
COM_CCM_FILTER_SEARCH="Search"
21+
COM_CCM_MENU_BACKEND="CMSs"
22+
COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings"
23+
COM_CCM_MIGRATION_SOURCE_CMS="Source CMS"
24+
COM_CCM_MIGRATION_TARGET_CMS="Target CMS"
25+
COM_CCM_OPTIONS="Options"
2226
COM_CCM_SUBMENU_CMS="CMS Management"
2327
COM_CCM_SUBMENU_MIGRATION="Migration"
2428
COM_CCM_TITLE_CMS="Content Management Systems"
25-
COM_CCM_TITLE_MIGRATION="Content Migration"
26-
APPLY_MIGRATION_BTN="Apply Migration"
27-
MIGRATION_SOURCE_CMS="Source CMS"
28-
MIGRATION_TARGET_CMS="Target CMS"
29-
COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings"
29+
COM_CCM_TITLE_MIGRATION="Content Migration"

‎src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT"
2-
COM_CCM_MENU_BACKEND="CMSs"
3-
COM_CCM_CONFIGURATION="CCM Migration Configuration"
4-
COM_CCM_OPTIONS="Options"
5-
COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from."
6-
COM_CCM_CONFIG_NAME_LABEL="CMS Name"
7-
COM_CCM_CONFIG_ID_LABEL="CMS ID"
81
COM_CCM="CMS Migration"
9-
COM_CCM_FILTER_SEARCH="Search"
10-
COM_CCM_CMS_NAME="CMS Name"
2+
COM_CCM_APPLY_MIGRATION_BTN="Apply Migration"
113
COM_CCM_CMS_ID="CMS ID"
4+
COM_CCM_CMS_NAME="CMS Name"
5+
COM_CCM_CMS_NAME_ADD="Add new CMS"
126
COM_CCM_CMS_NAME_EDIT="Edit CMS"
13-
COM_CCM_CONFIG_URL_LABEL="CMS URL"
14-
COM_CCM_CONFIG_CREDENTIALS_LABEL="Credentials"
15-
COM_CCM_CONFIG_CCM_MAPPING_LABEL="CCM Mapping"
7+
COM_CCM_CMS_NAME_LIST="CMS Names List"
168
COM_CCM_CONFIG_CCM_MAPPED_FIELDS_LABEL="CCM Mapped Fields"
9+
COM_CCM_CONFIG_CCM_MAPPING_LABEL="CCM Mapping"
1710
COM_CCM_CONFIG_CCM_UNMAPPED_FIELDS_LABEL="CCM Unmapped Fields"
11+
COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from."
12+
COM_CCM_CONFIG_CREDENTIALS_LABEL="Credentials"
13+
COM_CCM_CONFIG_ID_LABEL="CMS ID"
1814
COM_CCM_CONFIG_MIGRATION_LABEL="Select CMS you want to migrate with"
19-
COM_CCM_CMS_NAME_LIST="CMS Names List"
20-
COM_CCM_CMS_NAME_ADD="Add new CMS"
15+
COM_CCM_CONFIG_NAME_LABEL="CMS Name"
16+
COM_CCM_CONFIG_URL_LABEL="CMS URL"
17+
COM_CCM_CONFIGURATION="CCM Migration Configuration"
18+
COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT"
19+
COM_CCM_FILTER_SEARCH="Search"
20+
COM_CCM_MENU_BACKEND="CMSs"
21+
COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings"
22+
COM_CCM_MIGRATION_SOURCE_CMS="Source CMS"
23+
COM_CCM_MIGRATION_TARGET_CMS="Target CMS"
24+
COM_CCM_OPTIONS="Options"
2125
COM_CCM_SUBMENU_CMS="CMS Management"
2226
COM_CCM_SUBMENU_MIGRATION="Migration"
2327
COM_CCM_TITLE_CMS="Content Management Systems"
24-
COM_CCM_TITLE_MIGRATION="Content Migration"
25-
APPLY_MIGRATION_BTN="Apply Migration"
26-
MIGRATION_SOURCE_CMS="Source CMS"
27-
MIGRATION_TARGET_CMS="Target CMS"
28-
COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings"
28+
COM_CCM_TITLE_MIGRATION="Content Migration"

‎src/administrator/components/com_ccm/services/provider.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

10-
use Reem\Component\CCM\Administrator\Extension\CCMComponent;
10+
use Joomla\Component\CCM\Administrator\Extension\CCMComponent;
1111

1212
defined('_JEXEC') or die;
1313

@@ -25,8 +25,8 @@
2525
{
2626
public function register(Container $container)
2727
{
28-
$container->registerServiceProvider(new ComponentDispatcherFactory('\\Reem\\Component\\CCM'));
29-
$container->registerServiceProvider(new MVCFactory('\\Reem\\Component\\CCM'));
28+
$container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\CCM'));
29+
$container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\CCM'));
3030

3131
$container->set(
3232
ComponentInterface::class,

‎src/administrator/components/com_ccm/src/Controller/CmsController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

10-
namespace Reem\Component\CCM\Administrator\Controller;
10+
namespace Joomla\Component\CCM\Administrator\Controller;
1111
use Joomla\CMS\MVC\Controller\FormController;
1212
class CmsController extends FormController
1313
{
@@ -19,7 +19,7 @@ protected function getRedirectToListAppend()
1919
public function migrate()
2020
{
2121
error_log('CmsController::migrate called');
22-
$migration = new \Reem\Component\CCM\Administrator\Migration\Migration();
22+
$migration = new \Joomla\Component\CCM\Administrator\Migration\Migration();
2323
$migration->migrate();
2424

2525
// Optionally redirect or set a message

‎src/administrator/components/com_ccm/src/Controller/CmssController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @license GNU General Public License version 2 or later; see LICENSE.txt
88
*/
99

10-
namespace Reem\Component\CCM\Administrator\Controller;
10+
namespace Joomla\Component\CCM\Administrator\Controller;
1111

1212
defined('_JEXEC') or die;
1313

0 commit comments

Comments
 (0)