Merge pull request #10 from snehal0904/master

Creating package structure, jenkin job for the release
techjoomla · Feb 13, 2020 · 7f091e5 · 7f091e5
2 parents 413eaf6 + d04569e
commit 7f091e5
Show file tree

Hide file tree

Showing 79 changed files with 37 additions and 62 deletions.
diff --git a/scripts/ansible-deploy/deploy.yml b/scripts/ansible-deploy/deploy.yml
diff --git a/scripts/ansible-deploy/inventories/dev b/scripts/ansible-deploy/inventories/dev
diff --git a/scripts/ansible-deploy/inventories/live b/scripts/ansible-deploy/inventories/live
diff --git a/scripts/ansible-deploy/inventories/local b/scripts/ansible-deploy/inventories/local
diff --git a/src/administrator/access.xml → ...omponents/com_tc/administrator/access.xml b/src/administrator/access.xml → ...omponents/com_tc/administrator/access.xml
diff --git a/src/administrator/assets/css/index.html → ...om_tc/administrator/assets/css/index.html b/src/administrator/assets/css/index.html → ...om_tc/administrator/assets/css/index.html
diff --git a/src/administrator/assets/images/index.html → ...tc/administrator/assets/images/index.html b/src/administrator/assets/images/index.html → ...tc/administrator/assets/images/index.html
diff --git a/...dministrator/assets/images/s_contents.png → ...dministrator/assets/images/s_contents.png b/...dministrator/assets/images/s_contents.png → ...dministrator/assets/images/s_contents.png
diff --git a/src/administrator/assets/index.html → ...ts/com_tc/administrator/assets/index.html b/src/administrator/assets/index.html → ...ts/com_tc/administrator/assets/index.html
diff --git a/src/administrator/config.xml → ...omponents/com_tc/administrator/config.xml b/src/administrator/config.xml → ...omponents/com_tc/administrator/config.xml
diff --git a/src/administrator/controller.php → ...nents/com_tc/administrator/controller.php b/src/administrator/controller.php → ...nents/com_tc/administrator/controller.php
diff --git a/src/administrator/controllers/content.php → ..._tc/administrator/controllers/content.php b/src/administrator/controllers/content.php → ..._tc/administrator/controllers/content.php
diff --git a/src/administrator/controllers/contents.php → ...tc/administrator/controllers/contents.php b/src/administrator/controllers/contents.php → ...tc/administrator/controllers/contents.php
diff --git a/src/administrator/controllers/index.html → ...m_tc/administrator/controllers/index.html b/src/administrator/controllers/index.html → ...m_tc/administrator/controllers/index.html
diff --git a/src/administrator/controllers/usertcs.php → ..._tc/administrator/controllers/usertcs.php b/src/administrator/controllers/usertcs.php → ..._tc/administrator/controllers/usertcs.php
diff --git a/src/administrator/helpers/index.html → ...s/com_tc/administrator/helpers/index.html b/src/administrator/helpers/index.html → ...s/com_tc/administrator/helpers/index.html
diff --git a/src/administrator/helpers/tc.php → ...nents/com_tc/administrator/helpers/tc.php b/src/administrator/helpers/tc.php → ...nents/com_tc/administrator/helpers/tc.php
diff --git a/src/administrator/index.html → ...omponents/com_tc/administrator/index.html b/src/administrator/index.html → ...omponents/com_tc/administrator/index.html
diff --git a/src/administrator/models/content.php → ...s/com_tc/administrator/models/content.php b/src/administrator/models/content.php → ...s/com_tc/administrator/models/content.php
diff --git a/src/administrator/models/contents.php → .../com_tc/administrator/models/contents.php b/src/administrator/models/contents.php → .../com_tc/administrator/models/contents.php
diff --git a/src/administrator/models/fields/index.html → ...tc/administrator/models/fields/index.html b/src/administrator/models/fields/index.html → ...tc/administrator/models/fields/index.html
diff --git a/src/administrator/models/forms/content.xml → ...tc/administrator/models/forms/content.xml b/src/administrator/models/forms/content.xml → ...tc/administrator/models/forms/content.xml
diff --git a/...istrator/models/forms/filter_contents.xml → ...istrator/models/forms/filter_contents.xml b/...istrator/models/forms/filter_contents.xml → ...istrator/models/forms/filter_contents.xml
diff --git a/...nistrator/models/forms/filter_usertcs.xml → ...nistrator/models/forms/filter_usertcs.xml b/...nistrator/models/forms/filter_usertcs.xml → ...nistrator/models/forms/filter_usertcs.xml
diff --git a/src/administrator/models/forms/index.html → ..._tc/administrator/models/forms/index.html b/src/administrator/models/forms/index.html → ..._tc/administrator/models/forms/index.html
diff --git a/...dministrator/models/forms/url_pattern.xml → ...dministrator/models/forms/url_pattern.xml b/...dministrator/models/forms/url_pattern.xml → ...dministrator/models/forms/url_pattern.xml
diff --git a/src/administrator/models/index.html → ...ts/com_tc/administrator/models/index.html b/src/administrator/models/index.html → ...ts/com_tc/administrator/models/index.html
diff --git a/src/administrator/models/urlpattern.php → ...om_tc/administrator/models/urlpattern.php b/src/administrator/models/urlpattern.php → ...om_tc/administrator/models/urlpattern.php
diff --git a/src/administrator/models/urlpatterns.php → ...m_tc/administrator/models/urlpatterns.php b/src/administrator/models/urlpatterns.php → ...m_tc/administrator/models/urlpatterns.php
diff --git a/src/administrator/models/usertcs.php → ...s/com_tc/administrator/models/usertcs.php b/src/administrator/models/usertcs.php → ...s/com_tc/administrator/models/usertcs.php
diff --git a/src/administrator/script.tc.php → ...onents/com_tc/administrator/script.tc.php b/src/administrator/script.tc.php → ...onents/com_tc/administrator/script.tc.php
diff --git a/src/administrator/sql/index.html → ...nents/com_tc/administrator/sql/index.html b/src/administrator/sql/index.html → ...nents/com_tc/administrator/sql/index.html
diff --git a/src/administrator/sql/install.mysql.utf8.sql → .../administrator/sql/install.mysql.utf8.sql b/src/administrator/sql/install.mysql.utf8.sql → .../administrator/sql/install.mysql.utf8.sql
diff --git a/...dministrator/sql/uninstall.mysql.utf8.sql → ...dministrator/sql/uninstall.mysql.utf8.sql b/...dministrator/sql/uninstall.mysql.utf8.sql → ...dministrator/sql/uninstall.mysql.utf8.sql
diff --git a/src/administrator/sql/update.mysql.utf8.sql → ...c/administrator/sql/update.mysql.utf8.sql b/src/administrator/sql/update.mysql.utf8.sql → ...c/administrator/sql/update.mysql.utf8.sql
diff --git a/src/administrator/tables/content.php → ...s/com_tc/administrator/tables/content.php b/src/administrator/tables/content.php → ...s/com_tc/administrator/tables/content.php
diff --git a/src/administrator/tables/index.html → ...ts/com_tc/administrator/tables/index.html b/src/administrator/tables/index.html → ...ts/com_tc/administrator/tables/index.html
diff --git a/src/administrator/tables/urlpattern.php → ...om_tc/administrator/tables/urlpattern.php b/src/administrator/tables/urlpattern.php → ...om_tc/administrator/tables/urlpattern.php
diff --git a/src/administrator/tables/usertcs.php → ...s/com_tc/administrator/tables/usertcs.php b/src/administrator/tables/usertcs.php → ...s/com_tc/administrator/tables/usertcs.php
diff --git a/src/administrator/tc.php → src/components/com_tc/administrator/tc.php b/src/administrator/tc.php → src/components/com_tc/administrator/tc.php
diff --git a/src/administrator/tc.xml → src/components/com_tc/administrator/tc.xml b/src/administrator/tc.xml → src/components/com_tc/administrator/tc.xml
diff --git a/src/administrator/views/content/index.html → ...tc/administrator/views/content/index.html b/src/administrator/views/content/index.html → ...tc/administrator/views/content/index.html
diff --git a/...administrator/views/content/tmpl/edit.php → ...administrator/views/content/tmpl/edit.php b/...administrator/views/content/tmpl/edit.php → ...administrator/views/content/tmpl/edit.php
diff --git a/...ministrator/views/content/tmpl/index.html → ...ministrator/views/content/tmpl/index.html b/...ministrator/views/content/tmpl/index.html → ...ministrator/views/content/tmpl/index.html
diff --git a/...administrator/views/content/view.html.php → ...administrator/views/content/view.html.php b/...administrator/views/content/view.html.php → ...administrator/views/content/view.html.php
diff --git a/src/administrator/views/contents/index.html → ...c/administrator/views/contents/index.html b/src/administrator/views/contents/index.html → ...c/administrator/views/contents/index.html
diff --git a/...nistrator/views/contents/tmpl/default.php → ...nistrator/views/contents/tmpl/default.php b/...nistrator/views/contents/tmpl/default.php → ...nistrator/views/contents/tmpl/default.php
diff --git a/...inistrator/views/contents/tmpl/index.html → ...inistrator/views/contents/tmpl/index.html b/...inistrator/views/contents/tmpl/index.html → ...inistrator/views/contents/tmpl/index.html
diff --git a/...dministrator/views/contents/view.html.php → ...dministrator/views/contents/view.html.php b/...dministrator/views/contents/view.html.php → ...dministrator/views/contents/view.html.php
diff --git a/src/administrator/views/index.html → ...nts/com_tc/administrator/views/index.html b/src/administrator/views/index.html → ...nts/com_tc/administrator/views/index.html
diff --git a/src/administrator/views/usertcs/index.html → ...tc/administrator/views/usertcs/index.html b/src/administrator/views/usertcs/index.html → ...tc/administrator/views/usertcs/index.html
diff --git a/...inistrator/views/usertcs/tmpl/default.php → ...inistrator/views/usertcs/tmpl/default.php b/...inistrator/views/usertcs/tmpl/default.php → ...inistrator/views/usertcs/tmpl/default.php
diff --git a/...ministrator/views/usertcs/tmpl/index.html → ...ministrator/views/usertcs/tmpl/index.html b/...ministrator/views/usertcs/tmpl/index.html → ...ministrator/views/usertcs/tmpl/index.html
diff --git a/...administrator/views/usertcs/view.html.php → ...administrator/views/usertcs/view.html.php b/...administrator/views/usertcs/view.html.php → ...administrator/views/usertcs/view.html.php
diff --git a/src/installer/index.html → src/components/com_tc/installer/index.html b/src/installer/index.html → src/components/com_tc/installer/index.html
diff --git a/...ages/administrator/en-GB/en-GB.com_tc.ini → ...ages/administrator/en-GB/en-GB.com_tc.ini b/...ages/administrator/en-GB/en-GB.com_tc.ini → ...ages/administrator/en-GB/en-GB.com_tc.ini
diff --git a/.../administrator/en-GB/en-GB.com_tc.sys.ini → .../administrator/en-GB/en-GB.com_tc.sys.ini b/.../administrator/en-GB/en-GB.com_tc.sys.ini → .../administrator/en-GB/en-GB.com_tc.sys.ini
diff --git a/src/languages/site/en-GB/en-GB.com_tc.ini → ..._tc/languages/site/en-GB/en-GB.com_tc.ini b/src/languages/site/en-GB/en-GB.com_tc.ini → ..._tc/languages/site/en-GB/en-GB.com_tc.ini
diff --git a/src/media/css/tc.css → src/components/com_tc/media/css/tc.css b/src/media/css/tc.css → src/components/com_tc/media/css/tc.css
diff --git a/src/media/images/index.html → ...components/com_tc/media/images/index.html b/src/media/images/index.html → ...components/com_tc/media/images/index.html
diff --git a/src/media/images/s_contents.png → ...onents/com_tc/media/images/s_contents.png b/src/media/images/s_contents.png → ...onents/com_tc/media/images/s_contents.png
diff --git a/src/media/js/tc.js → src/components/com_tc/media/js/tc.js b/src/media/js/tc.js → src/components/com_tc/media/js/tc.js
diff --git a/src/site/controller.php → src/components/com_tc/site/controller.php b/src/site/controller.php → src/components/com_tc/site/controller.php
diff --git a/src/site/controllers/content.php → ...nents/com_tc/site/controllers/content.php b/src/site/controllers/content.php → ...nents/com_tc/site/controllers/content.php
diff --git a/src/site/controllers/index.html → ...onents/com_tc/site/controllers/index.html b/src/site/controllers/index.html → ...onents/com_tc/site/controllers/index.html
diff --git a/src/site/helpers/index.html → ...components/com_tc/site/helpers/index.html b/src/site/helpers/index.html → ...components/com_tc/site/helpers/index.html
diff --git a/src/site/index.html → src/components/com_tc/site/index.html b/src/site/index.html → src/components/com_tc/site/index.html
diff --git a/src/site/models/fields/index.html → ...ents/com_tc/site/models/fields/index.html b/src/site/models/fields/index.html → ...ents/com_tc/site/models/fields/index.html
diff --git a/src/site/models/forms/index.html → ...nents/com_tc/site/models/forms/index.html b/src/site/models/forms/index.html → ...nents/com_tc/site/models/forms/index.html
diff --git a/src/site/models/index.html → src/components/com_tc/site/models/index.html b/src/site/models/index.html → src/components/com_tc/site/models/index.html
diff --git a/src/site/tc.php → src/components/com_tc/site/tc.php b/src/site/tc.php → src/components/com_tc/site/tc.php
diff --git a/src/site/views/content/index.html → ...ents/com_tc/site/views/content/index.html b/src/site/views/content/index.html → ...ents/com_tc/site/views/content/index.html
diff --git a/src/site/views/content/tmpl/default.php → ...om_tc/site/views/content/tmpl/default.php b/src/site/views/content/tmpl/default.php → ...om_tc/site/views/content/tmpl/default.php
diff --git a/src/site/views/content/view.html.php → ...s/com_tc/site/views/content/view.html.php b/src/site/views/content/view.html.php → ...s/com_tc/site/views/content/view.html.php
diff --git a/src/site/views/index.html → src/components/com_tc/site/views/index.html b/src/site/views/index.html → src/components/com_tc/site/views/index.html
diff --git a/src/tc.xml → src/components/com_tc/tc.xml b/src/tc.xml → src/components/com_tc/tc.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.0" method="upgrade">
     <name>com_tc</name>
-    <creationDate>10th Feb 2020</creationDate>
+	<creationDate>10th Feb 2020</creationDate>
     <copyright>Copyright (C) 2016 - 2020 Techjoomla. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
     <author>Techjoomla</author>
     <authorEmail>[email protected]</authorEmail>
-    <authorUrl>https://techjoomla.com/</authorUrl>
+    <authorUrl>https://techjoomla.com</authorUrl>
     <version>1.0.1</version>
     <description>This TC manager is used to assign TC's for any pages of site.</description>
-
-	<!-- The description is optional and defaults to the name -->
-	<description>COM_TC</description>
 	<scriptfile>script.tc.php</scriptfile>
 
     <install> <!-- Runs on install -->
@@ -74,8 +71,4 @@
     <config>
 
     </config>
-    <plugins>
-        <plugin group="search" plugin="tc"/>
-    </plugins>
-
 </extension>
diff --git a/src/pkg_tc.xml b/src/pkg_tc.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="package" version="3.0" method="upgrade">
+  <name>Terms and Condition manager</name>
+  <packagename>tc</packagename>
+  <packager>Techjoomla</packager>
+  <packagerurl>https://techjoomla.com</packagerurl>
+  <creationDate>10th Feb 2020</creationDate>
+  <copyright>Copyright (C) 2016 - 2020 Techjoomla. All rights reserved.</copyright>
+  <license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+  <author>Techjoomla</author>
+  <authorEmail>[email protected]</authorEmail>
+  <authorUrl>https://techjoomla.com/</authorUrl>
+  <version>1.0.1</version>
+  <description>This TC manager is used to assign TC's for any pages of site.</description>
+  <!-- The description is optional and defaults to the name -->
+  <description>COM_TC</description>
+  <scriptfile>script.pkg_tc.php</scriptfile>
+  <blockChildUninstall>true</blockChildUninstall>
+  <files>
+    <!-- Component -->
+    <file type="component" id="com_tc">components/com_tc.zip</file>
+    <!-- Plugins -->
+    <file type="plugin" id="plug_system_tc" group="system">plugins/system/plug_system_tc.zip</file>
+  </files>
+  <updateservers>
+    <server type="collection" priority="1" name="tc"><![CDATA[https://techjoomla.com/updates/stream/tc.xml?format=xml]]></server>
+  </updateservers>
+</extension>
diff --git a/src/plugins/system/plug_system_tc/plug_system_tc.zip b/src/plugins/system/plug_system_tc/plug_system_tc.zip
diff --git a/src/script.tc.php → src/script.pkg_tc.php b/src/script.tc.php → src/script.pkg_tc.php
@@ -9,6 +9,8 @@
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Filesystem\File;
 
 $tjInstallerPath = JPATH_ROOT . '/administrator/manifests/packages/tc/tjinstaller.php';
 
@@ -26,18 +28,20 @@
  *
  * @since  0.0.1
  */
-class Com_TcInstallerScript extends TJInstaller
+class Pkg_TcInstallerScript extends TJInstaller
 {
-	protected $extensionName = 'com_tc';
+	protected $extensionName = 'tc';
 
 	/** @var array The list of extra modules and plugins to install */
 	private $installationQueue = array(
+		'postflight' => array(
 		// Plugins => { (folder) => { (element) => (published) }* }*
 		'plugins' => array(
 			'system' => array(
-				'tc' => 1
+				'plug_system_tc' => 1
 			)
 		)
+		)
 	);
 
 	protected $extensionsToEnable = array (