diff --git a/.gitignore b/.gitignore index 17d28c5..1963cbe 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,8 @@ selenium-server-standalone.jar codecept.phar selenium.log tests/cache + +# Package building related +/dist +jbuild.ini + diff --git a/.travis.yml b/.travis.yml index 85292bb..3c0faf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,5 +36,8 @@ before_script: - composer install script: +# Build +- mv jbuild.dist.ini jbuild.ini +- vendor/bin/robo build - mv tests/acceptance.suite.dist.yml tests/acceptance.suite.yml - vendor/bin/robo run:tests true diff --git a/README.md b/README.md index 023671f..1a39f31 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,13 @@ This repo is meant to hold the decoupled com_weblinks component and related code. +# Building + +```bash +$ composer install +$ vendor/bin/robo build +``` + # Tests The tests in Weblinks Extension use Codeception Testing Framework, if you want to know more about the technology used for testing please check: [Testing Joomla Extensions with Codeception](https://docs.joomla.org/Testing_Joomla_Extensions_with_Codeception). diff --git a/RoboFile.php b/RoboFile.php index 5b68639..423f404 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -10,10 +10,16 @@ require_once 'vendor/autoload.php'; +if (!defined('JPATH_BASE')) +{ + define('JPATH_BASE', __DIR__); +} + class RoboFile extends \Robo\Tasks { // Load tasks from composer, see composer.json use \joomla_projects\robo\loadTasks; + use \JBuild\Tasks\loadTasks; /** * File extension for executables @@ -291,6 +297,14 @@ class RoboFile extends \Robo\Tasks $this->_exec('chown -R ' . $this->configuration->localUser . ' ' . $this->cmsPath); } + // Copy current package + if (!file_exists('dist/pkg-weblinks-current.zip')) + { + $this->build(true); + } + + $this->_copy('dist/pkg-weblinks-current.zip', $this->cmsPath . "/pkg-weblinks-current.zip"); + $this->say('Joomla CMS site created at ' . $this->cmsPath); // Optionally uses Joomla default htaccess file. Used by TravisCI @@ -447,4 +461,21 @@ class RoboFile extends \Robo\Tasks { $this->_exec('phpcpd' . $this->extension . ' ' . __DIR__ . '/src'); } + + /** + * Build the joomla extension package + * + * @param array $params Additional params + * + * @return void + */ + public function build($params = ['dev' => false]) + { + if (!file_exists('jbuild.ini')) + { + $this->_copy('jbuild.dist.ini', 'jbuild.ini'); + } + + $this->taskBuild($params)->run(); + } } diff --git a/composer.json b/composer.json index 515565b..3d337f0 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "codegyre/robo": "~0.5", "joomla-projects/robo": "dev-master", "joomla-projects/selenium-server-standalone": "v2.47.1", - "fzaninotto/faker": "^1.5" + "fzaninotto/faker": "^1.5", + "yvesh/jbuild": "dev-master" } } diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..2d277b2 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,5 @@ +How to install + +Just install the package file over the normal Joomla! installer + +You can also only install certain parts by unzipping the package before. \ No newline at end of file diff --git a/jbuild.dist.ini b/jbuild.dist.ini new file mode 100644 index 0000000..f3dc621 --- /dev/null +++ b/jbuild.dist.ini @@ -0,0 +1,4 @@ +extension = weblinks +version = 3.4.3 +source = src +target = package \ No newline at end of file diff --git a/src/com_weblinks/admin/access.xml b/src/administrator/components/com_weblinks/access.xml similarity index 100% rename from src/com_weblinks/admin/access.xml rename to src/administrator/components/com_weblinks/access.xml diff --git a/src/com_weblinks/admin/config.xml b/src/administrator/components/com_weblinks/config.xml similarity index 100% rename from src/com_weblinks/admin/config.xml rename to src/administrator/components/com_weblinks/config.xml diff --git a/src/com_weblinks/admin/controller.php b/src/administrator/components/com_weblinks/controller.php similarity index 100% rename from src/com_weblinks/admin/controller.php rename to src/administrator/components/com_weblinks/controller.php diff --git a/src/com_weblinks/admin/controllers/weblink.php b/src/administrator/components/com_weblinks/controllers/weblink.php similarity index 100% rename from src/com_weblinks/admin/controllers/weblink.php rename to src/administrator/components/com_weblinks/controllers/weblink.php diff --git a/src/com_weblinks/admin/controllers/weblinks.php b/src/administrator/components/com_weblinks/controllers/weblinks.php similarity index 100% rename from src/com_weblinks/admin/controllers/weblinks.php rename to src/administrator/components/com_weblinks/controllers/weblinks.php diff --git a/src/com_weblinks/admin/helpers/weblinks.php b/src/administrator/components/com_weblinks/helpers/weblinks.php similarity index 100% rename from src/com_weblinks/admin/helpers/weblinks.php rename to src/administrator/components/com_weblinks/helpers/weblinks.php diff --git a/src/com_weblinks/admin/models/forms/weblink.xml b/src/administrator/components/com_weblinks/models/forms/weblink.xml similarity index 100% rename from src/com_weblinks/admin/models/forms/weblink.xml rename to src/administrator/components/com_weblinks/models/forms/weblink.xml diff --git a/src/com_weblinks/admin/models/weblink.php b/src/administrator/components/com_weblinks/models/weblink.php similarity index 100% rename from src/com_weblinks/admin/models/weblink.php rename to src/administrator/components/com_weblinks/models/weblink.php diff --git a/src/com_weblinks/admin/models/weblinks.php b/src/administrator/components/com_weblinks/models/weblinks.php similarity index 100% rename from src/com_weblinks/admin/models/weblinks.php rename to src/administrator/components/com_weblinks/models/weblinks.php diff --git a/src/com_weblinks/script.php b/src/administrator/components/com_weblinks/script.php similarity index 100% rename from src/com_weblinks/script.php rename to src/administrator/components/com_weblinks/script.php diff --git a/src/com_weblinks/admin/sql/install.mysql.sql b/src/administrator/components/com_weblinks/sql/install.mysql.sql similarity index 100% rename from src/com_weblinks/admin/sql/install.mysql.sql rename to src/administrator/components/com_weblinks/sql/install.mysql.sql diff --git a/src/com_weblinks/admin/sql/install.postgresql.sql b/src/administrator/components/com_weblinks/sql/install.postgresql.sql similarity index 100% rename from src/com_weblinks/admin/sql/install.postgresql.sql rename to src/administrator/components/com_weblinks/sql/install.postgresql.sql diff --git a/src/com_weblinks/admin/sql/install.sqlsrv.sql b/src/administrator/components/com_weblinks/sql/install.sqlsrv.sql similarity index 100% rename from src/com_weblinks/admin/sql/install.sqlsrv.sql rename to src/administrator/components/com_weblinks/sql/install.sqlsrv.sql diff --git a/src/com_weblinks/admin/sql/uninstall.mysql.sql b/src/administrator/components/com_weblinks/sql/uninstall.mysql.sql similarity index 100% rename from src/com_weblinks/admin/sql/uninstall.mysql.sql rename to src/administrator/components/com_weblinks/sql/uninstall.mysql.sql diff --git a/src/com_weblinks/admin/sql/uninstall.postgresql.sql b/src/administrator/components/com_weblinks/sql/uninstall.postgresql.sql similarity index 100% rename from src/com_weblinks/admin/sql/uninstall.postgresql.sql rename to src/administrator/components/com_weblinks/sql/uninstall.postgresql.sql diff --git a/src/com_weblinks/admin/sql/uninstall.sqlsrv.sql b/src/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql similarity index 100% rename from src/com_weblinks/admin/sql/uninstall.sqlsrv.sql rename to src/administrator/components/com_weblinks/sql/uninstall.sqlsrv.sql diff --git a/src/com_weblinks/admin/sql/updates/mysql/3.4.0.sql b/src/administrator/components/com_weblinks/sql/updates/mysql/3.4.0.sql similarity index 100% rename from src/com_weblinks/admin/sql/updates/mysql/3.4.0.sql rename to src/administrator/components/com_weblinks/sql/updates/mysql/3.4.0.sql diff --git a/src/com_weblinks/admin/sql/updates/postgresql/3.4.0.sql b/src/administrator/components/com_weblinks/sql/updates/postgresql/3.4.0.sql similarity index 100% rename from src/com_weblinks/admin/sql/updates/postgresql/3.4.0.sql rename to src/administrator/components/com_weblinks/sql/updates/postgresql/3.4.0.sql diff --git a/src/com_weblinks/admin/sql/updates/sqlsrv/3.4.0.sql b/src/administrator/components/com_weblinks/sql/updates/sqlsrv/3.4.0.sql similarity index 100% rename from src/com_weblinks/admin/sql/updates/sqlsrv/3.4.0.sql rename to src/administrator/components/com_weblinks/sql/updates/sqlsrv/3.4.0.sql diff --git a/src/com_weblinks/admin/tables/weblink.php b/src/administrator/components/com_weblinks/tables/weblink.php similarity index 100% rename from src/com_weblinks/admin/tables/weblink.php rename to src/administrator/components/com_weblinks/tables/weblink.php diff --git a/src/com_weblinks/admin/views/weblink/tmpl/edit.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php similarity index 100% rename from src/com_weblinks/admin/views/weblink/tmpl/edit.php rename to src/administrator/components/com_weblinks/views/weblink/tmpl/edit.php diff --git a/src/com_weblinks/admin/views/weblink/tmpl/edit_metadata.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php similarity index 100% rename from src/com_weblinks/admin/views/weblink/tmpl/edit_metadata.php rename to src/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php diff --git a/src/com_weblinks/admin/views/weblink/tmpl/edit_params.php b/src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php similarity index 100% rename from src/com_weblinks/admin/views/weblink/tmpl/edit_params.php rename to src/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php diff --git a/src/com_weblinks/admin/views/weblink/view.html.php b/src/administrator/components/com_weblinks/views/weblink/view.html.php similarity index 100% rename from src/com_weblinks/admin/views/weblink/view.html.php rename to src/administrator/components/com_weblinks/views/weblink/view.html.php diff --git a/src/com_weblinks/admin/views/weblinks/tmpl/default.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php similarity index 100% rename from src/com_weblinks/admin/views/weblinks/tmpl/default.php rename to src/administrator/components/com_weblinks/views/weblinks/tmpl/default.php diff --git a/src/com_weblinks/admin/views/weblinks/tmpl/default_batch.php b/src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php similarity index 100% rename from src/com_weblinks/admin/views/weblinks/tmpl/default_batch.php rename to src/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php diff --git a/src/com_weblinks/admin/views/weblinks/view.html.php b/src/administrator/components/com_weblinks/views/weblinks/view.html.php similarity index 100% rename from src/com_weblinks/admin/views/weblinks/view.html.php rename to src/administrator/components/com_weblinks/views/weblinks/view.html.php diff --git a/src/com_weblinks/admin/weblinks.php b/src/administrator/components/com_weblinks/weblinks.php similarity index 100% rename from src/com_weblinks/admin/weblinks.php rename to src/administrator/components/com_weblinks/weblinks.php diff --git a/src/com_weblinks/weblinks.xml b/src/administrator/components/com_weblinks/weblinks.xml similarity index 68% rename from src/com_weblinks/weblinks.xml rename to src/administrator/components/com_weblinks/weblinks.xml index 6197da9..07f3aa3 100644 --- a/src/com_weblinks/weblinks.xml +++ b/src/administrator/components/com_weblinks/weblinks.xml @@ -2,12 +2,12 @@ com_weblinks Joomla! Project - April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + ##DATE## + (C) 2005 - ##YEAR## Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - 3.4.1 + ##VERSION## COM_WEBLINKS_XML_DESCRIPTION script.php @@ -33,17 +33,12 @@ - - weblinks.php - controller.php - router.php - metadata.xml - views - models - controllers - helpers - language + + ##FRONTEND_COMPONENT_FILES## + + ##FRONTEND_LANGUAGE_FILES## + com_weblinks @@ -56,19 +51,12 @@ com_weblinks_categories - - access.xml - config.xml - controller.php - weblinks.php - controllers - helpers - language - models - sql - tables - views + + ##BACKEND_COMPONENT_FILES## + + ##BACKEND_LANGUAGE_FILES## + diff --git a/src/com_weblinks/admin/language/en-GB/en-GB.com_weblinks.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.ini similarity index 100% rename from src/com_weblinks/admin/language/en-GB/en-GB.com_weblinks.ini rename to src/administrator/language/en-GB/en-GB.com_weblinks.ini diff --git a/src/com_weblinks/admin/language/en-GB/en-GB.com_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini similarity index 100% rename from src/com_weblinks/admin/language/en-GB/en-GB.com_weblinks.sys.ini rename to src/administrator/language/en-GB/en-GB.com_weblinks.sys.ini diff --git a/src/language/en-GB/en-GB.pkg_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.pkg_weblinks.sys.ini similarity index 100% rename from src/language/en-GB/en-GB.pkg_weblinks.sys.ini rename to src/administrator/language/en-GB/en-GB.pkg_weblinks.sys.ini diff --git a/src/plg_search_weblinks/language/en-GB/en-GB.plg_search_weblinks.ini b/src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini similarity index 100% rename from src/plg_search_weblinks/language/en-GB/en-GB.plg_search_weblinks.ini rename to src/administrator/language/en-GB/en-GB.plg_search_weblinks.ini diff --git a/src/plg_search_weblinks/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini similarity index 100% rename from src/plg_search_weblinks/language/en-GB/en-GB.plg_search_weblinks.sys.ini rename to src/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini diff --git a/src/com_weblinks/site/controller.php b/src/components/com_weblinks/controller.php similarity index 100% rename from src/com_weblinks/site/controller.php rename to src/components/com_weblinks/controller.php diff --git a/src/com_weblinks/site/controllers/weblink.php b/src/components/com_weblinks/controllers/weblink.php similarity index 100% rename from src/com_weblinks/site/controllers/weblink.php rename to src/components/com_weblinks/controllers/weblink.php diff --git a/src/com_weblinks/site/helpers/association.php b/src/components/com_weblinks/helpers/association.php similarity index 100% rename from src/com_weblinks/site/helpers/association.php rename to src/components/com_weblinks/helpers/association.php diff --git a/src/com_weblinks/site/helpers/category.php b/src/components/com_weblinks/helpers/category.php similarity index 100% rename from src/com_weblinks/site/helpers/category.php rename to src/components/com_weblinks/helpers/category.php diff --git a/src/com_weblinks/site/helpers/icon.php b/src/components/com_weblinks/helpers/icon.php similarity index 100% rename from src/com_weblinks/site/helpers/icon.php rename to src/components/com_weblinks/helpers/icon.php diff --git a/src/com_weblinks/site/helpers/route.php b/src/components/com_weblinks/helpers/route.php similarity index 100% rename from src/com_weblinks/site/helpers/route.php rename to src/components/com_weblinks/helpers/route.php diff --git a/src/com_weblinks/site/metadata.xml b/src/components/com_weblinks/metadata.xml similarity index 100% rename from src/com_weblinks/site/metadata.xml rename to src/components/com_weblinks/metadata.xml diff --git a/src/com_weblinks/site/models/categories.php b/src/components/com_weblinks/models/categories.php similarity index 100% rename from src/com_weblinks/site/models/categories.php rename to src/components/com_weblinks/models/categories.php diff --git a/src/com_weblinks/site/models/category.php b/src/components/com_weblinks/models/category.php similarity index 100% rename from src/com_weblinks/site/models/category.php rename to src/components/com_weblinks/models/category.php diff --git a/src/com_weblinks/site/models/form.php b/src/components/com_weblinks/models/form.php similarity index 100% rename from src/com_weblinks/site/models/form.php rename to src/components/com_weblinks/models/form.php diff --git a/src/com_weblinks/site/models/forms/weblink.xml b/src/components/com_weblinks/models/forms/weblink.xml similarity index 100% rename from src/com_weblinks/site/models/forms/weblink.xml rename to src/components/com_weblinks/models/forms/weblink.xml diff --git a/src/com_weblinks/site/models/weblink.php b/src/components/com_weblinks/models/weblink.php similarity index 100% rename from src/com_weblinks/site/models/weblink.php rename to src/components/com_weblinks/models/weblink.php diff --git a/src/com_weblinks/site/router.php b/src/components/com_weblinks/router.php similarity index 100% rename from src/com_weblinks/site/router.php rename to src/components/com_weblinks/router.php diff --git a/src/com_weblinks/site/views/categories/tmpl/default.php b/src/components/com_weblinks/views/categories/tmpl/default.php similarity index 100% rename from src/com_weblinks/site/views/categories/tmpl/default.php rename to src/components/com_weblinks/views/categories/tmpl/default.php diff --git a/src/com_weblinks/site/views/categories/tmpl/default.xml b/src/components/com_weblinks/views/categories/tmpl/default.xml similarity index 100% rename from src/com_weblinks/site/views/categories/tmpl/default.xml rename to src/components/com_weblinks/views/categories/tmpl/default.xml diff --git a/src/com_weblinks/site/views/categories/tmpl/default_items.php b/src/components/com_weblinks/views/categories/tmpl/default_items.php similarity index 100% rename from src/com_weblinks/site/views/categories/tmpl/default_items.php rename to src/components/com_weblinks/views/categories/tmpl/default_items.php diff --git a/src/com_weblinks/site/views/categories/view.html.php b/src/components/com_weblinks/views/categories/view.html.php similarity index 100% rename from src/com_weblinks/site/views/categories/view.html.php rename to src/components/com_weblinks/views/categories/view.html.php diff --git a/src/com_weblinks/site/views/category/metadata.xml b/src/components/com_weblinks/views/category/metadata.xml similarity index 100% rename from src/com_weblinks/site/views/category/metadata.xml rename to src/components/com_weblinks/views/category/metadata.xml diff --git a/src/com_weblinks/site/views/category/tmpl/default.php b/src/components/com_weblinks/views/category/tmpl/default.php similarity index 100% rename from src/com_weblinks/site/views/category/tmpl/default.php rename to src/components/com_weblinks/views/category/tmpl/default.php diff --git a/src/com_weblinks/site/views/category/tmpl/default.xml b/src/components/com_weblinks/views/category/tmpl/default.xml similarity index 100% rename from src/com_weblinks/site/views/category/tmpl/default.xml rename to src/components/com_weblinks/views/category/tmpl/default.xml diff --git a/src/com_weblinks/site/views/category/tmpl/default_children.php b/src/components/com_weblinks/views/category/tmpl/default_children.php similarity index 100% rename from src/com_weblinks/site/views/category/tmpl/default_children.php rename to src/components/com_weblinks/views/category/tmpl/default_children.php diff --git a/src/com_weblinks/site/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php similarity index 100% rename from src/com_weblinks/site/views/category/tmpl/default_items.php rename to src/components/com_weblinks/views/category/tmpl/default_items.php diff --git a/src/com_weblinks/site/views/category/view.feed.php b/src/components/com_weblinks/views/category/view.feed.php similarity index 100% rename from src/com_weblinks/site/views/category/view.feed.php rename to src/components/com_weblinks/views/category/view.feed.php diff --git a/src/com_weblinks/site/views/category/view.html.php b/src/components/com_weblinks/views/category/view.html.php similarity index 100% rename from src/com_weblinks/site/views/category/view.html.php rename to src/components/com_weblinks/views/category/view.html.php diff --git a/src/com_weblinks/site/views/form/metadata.xml b/src/components/com_weblinks/views/form/metadata.xml similarity index 100% rename from src/com_weblinks/site/views/form/metadata.xml rename to src/components/com_weblinks/views/form/metadata.xml diff --git a/src/com_weblinks/site/views/form/tmpl/edit.php b/src/components/com_weblinks/views/form/tmpl/edit.php similarity index 100% rename from src/com_weblinks/site/views/form/tmpl/edit.php rename to src/components/com_weblinks/views/form/tmpl/edit.php diff --git a/src/com_weblinks/site/views/form/tmpl/edit.xml b/src/components/com_weblinks/views/form/tmpl/edit.xml similarity index 100% rename from src/com_weblinks/site/views/form/tmpl/edit.xml rename to src/components/com_weblinks/views/form/tmpl/edit.xml diff --git a/src/com_weblinks/site/views/form/view.html.php b/src/components/com_weblinks/views/form/view.html.php similarity index 100% rename from src/com_weblinks/site/views/form/view.html.php rename to src/components/com_weblinks/views/form/view.html.php diff --git a/src/com_weblinks/site/views/weblink/view.html.php b/src/components/com_weblinks/views/weblink/view.html.php similarity index 100% rename from src/com_weblinks/site/views/weblink/view.html.php rename to src/components/com_weblinks/views/weblink/view.html.php diff --git a/src/com_weblinks/site/weblinks.php b/src/components/com_weblinks/weblinks.php similarity index 100% rename from src/com_weblinks/site/weblinks.php rename to src/components/com_weblinks/weblinks.php diff --git a/src/com_weblinks/site/language/en-GB/en-GB.com_weblinks.ini b/src/language/en-GB/en-GB.com_weblinks.ini similarity index 100% rename from src/com_weblinks/site/language/en-GB/en-GB.com_weblinks.ini rename to src/language/en-GB/en-GB.com_weblinks.ini diff --git a/src/mod_weblinks/language/en-GB/en-GB.mod_weblinks.ini b/src/language/en-GB/en-GB.mod_weblinks.ini similarity index 100% rename from src/mod_weblinks/language/en-GB/en-GB.mod_weblinks.ini rename to src/language/en-GB/en-GB.mod_weblinks.ini diff --git a/src/mod_weblinks/language/en-GB/en-GB.mod_weblinks.sys.ini b/src/language/en-GB/en-GB.mod_weblinks.sys.ini similarity index 100% rename from src/mod_weblinks/language/en-GB/en-GB.mod_weblinks.sys.ini rename to src/language/en-GB/en-GB.mod_weblinks.sys.ini diff --git a/src/mod_weblinks/mod_weblinks.xml b/src/mod_weblinks/mod_weblinks.xml deleted file mode 100644 index abcaa38..0000000 --- a/src/mod_weblinks/mod_weblinks.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - mod_weblinks - Joomla! Project - July 2009 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. - GNU General Public License version 2 or later; see LICENSE.txt - admin@joomla.org - www.joomla.org - 3.4.1 - MOD_WEBLINKS_XML_DESCRIPTION - - language - tmpl - mod_weblinks.php - helper.php - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - -
- - - diff --git a/src/mod_weblinks/helper.php b/src/modules/mod_weblinks/helper.php similarity index 100% rename from src/mod_weblinks/helper.php rename to src/modules/mod_weblinks/helper.php diff --git a/src/mod_weblinks/mod_weblinks.php b/src/modules/mod_weblinks/mod_weblinks.php similarity index 100% rename from src/mod_weblinks/mod_weblinks.php rename to src/modules/mod_weblinks/mod_weblinks.php diff --git a/src/modules/mod_weblinks/mod_weblinks.xml b/src/modules/mod_weblinks/mod_weblinks.xml new file mode 100644 index 0000000..1fa8a84 --- /dev/null +++ b/src/modules/mod_weblinks/mod_weblinks.xml @@ -0,0 +1,162 @@ + + + mod_weblinks + Joomla! Project + ##DATE## + Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + admin@joomla.org + www.joomla.org + ##VERSION## + MOD_WEBLINKS_XML_DESCRIPTION + + ##MODULE_FILES## + + + ##LANGUAGE_FILES## + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+ + + diff --git a/src/mod_weblinks/tmpl/default.php b/src/modules/mod_weblinks/tmpl/default.php similarity index 100% rename from src/mod_weblinks/tmpl/default.php rename to src/modules/mod_weblinks/tmpl/default.php diff --git a/src/plg_finder_weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini b/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini similarity index 100% rename from src/plg_finder_weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini rename to src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.ini diff --git a/src/plg_finder_weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini b/src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini similarity index 100% rename from src/plg_finder_weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini rename to src/plugins/finder/weblinks/language/en-GB/en-GB.plg_finder_weblinks.sys.ini diff --git a/src/plg_finder_weblinks/weblinks.php b/src/plugins/finder/weblinks/weblinks.php similarity index 100% rename from src/plg_finder_weblinks/weblinks.php rename to src/plugins/finder/weblinks/weblinks.php diff --git a/src/plg_finder_weblinks/weblinks.xml b/src/plugins/finder/weblinks/weblinks.xml similarity index 63% rename from src/plg_finder_weblinks/weblinks.xml rename to src/plugins/finder/weblinks/weblinks.xml index 7b5c5d5..37899fe 100644 --- a/src/plg_finder_weblinks/weblinks.xml +++ b/src/plugins/finder/weblinks/weblinks.xml @@ -2,15 +2,17 @@ plg_finder_weblinks Joomla! Project - August 2011 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + ##DATE## + (C) 2005 - ##YEAR## Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - 3.4.1 + ##VERSION## PLG_FINDER_WEBLINKS_XML_DESCRIPTION - weblinks.php - language + ##FILES## + + ##LANGUAGE_FILES## + diff --git a/src/plg_search_weblinks/weblinks.php b/src/plugins/search/weblinks/weblinks.php similarity index 100% rename from src/plg_search_weblinks/weblinks.php rename to src/plugins/search/weblinks/weblinks.php diff --git a/src/plg_search_weblinks/weblinks.xml b/src/plugins/search/weblinks/weblinks.xml similarity index 83% rename from src/plg_search_weblinks/weblinks.xml rename to src/plugins/search/weblinks/weblinks.xml index 1e11c8c..e7b0dc9 100644 --- a/src/plg_search_weblinks/weblinks.xml +++ b/src/plugins/search/weblinks/weblinks.xml @@ -2,17 +2,19 @@ plg_search_weblinks Joomla! Project - November 2005 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + ##DATE## + Copyright (C) 2005 - ##YEAR## Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org - 3.4.1 + ##VERSION## PLG_SEARCH_WEBLINKS_XML_DESCRIPTION - weblinks.php - language + ##FILES## + + ##LANGUAGE_FILES## + diff --git a/tests/acceptance.suite.dist.yml b/tests/acceptance.suite.dist.yml index fb7b6a3..567140d 100644 --- a/tests/acceptance.suite.dist.yml +++ b/tests/acceptance.suite.dist.yml @@ -38,4 +38,5 @@ modules: AcceptanceHelper: repo_folder: '/home/travis/build/joomla-extensions/weblinks/' # Path to the Extension repository. To be used by tests to install via Install from folder counter_test_url: 'http://localhost/tests/joomla-cms3' # the url for the weblink item used to test hits counter + url: 'http://localhost:8080/tests/joomla-cms3' # the url that points to the joomla installation at /tests/system/joomla-cms - we need it twice here error_level: "E_ALL & ~E_STRICT & ~E_DEPRECATED" \ No newline at end of file diff --git a/tests/acceptance/install/InstallWeblinksCest.php b/tests/acceptance/install/InstallWeblinksCest.php index 63bd809..6579832 100644 --- a/tests/acceptance/install/InstallWeblinksCest.php +++ b/tests/acceptance/install/InstallWeblinksCest.php @@ -26,8 +26,11 @@ class InstallWeblinksCest { $I->doAdministratorLogin(); $I->comment('get Weblinks repository folder from acceptance.suite.yml (see _support/AcceptanceHelper.php)'); - $path = $I->getConfiguration('repo_folder'); - $I->installExtensionFromFolder(rtrim($path, "/") . '/src/com_weblinks/'); + + // URL where the package file to install is located (mostly the same as joomla-cms) + $url = $I->getConfiguration('url'); + $I->installExtensionFromUrl($url . "/pkg-weblinks-current.zip"); + $I->doAdministratorLogout(); } } \ No newline at end of file