[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: InsertLink: using extension.json

2016-08-19 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: InsertLink: using extension.json
..


InsertLink: using extension.json

Patch Set 2: whitespace, authors, license

Change-Id: Ib26572d7dc4f75b95d68456b9c3d8ce554f0ec2a
---
M InsertLink/InsertLink.class.php
M InsertLink/InsertLink.setup.php
A InsertLink/extension.json
3 files changed, 67 insertions(+), 69 deletions(-)

Approvals:
  Mglaser: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/InsertLink/InsertLink.class.php b/InsertLink/InsertLink.class.php
index c6ee1a9..1e45df8 100644
--- a/InsertLink/InsertLink.class.php
+++ b/InsertLink/InsertLink.class.php
@@ -41,29 +41,6 @@
  * @subpackage InsertLink
  */
 class InsertLink extends BsExtensionMW {
-
-   /**
-* Constructor of InsertLink
-*/
-   public function __construct() {
-   wfProfileIn('BS::' . __METHOD__);
-   // Base settings
-   $this->mExtensionFile = __FILE__;
-   $this->mExtensionType = EXTTYPE::VARIABLE;
-   $this->mInfo = array(
-   EXTINFO::NAME => 'InsertLink',
-   EXTINFO::DESCRIPTION => 'bs-insertlink-desc',
-   EXTINFO::AUTHOR => 'Markus Glaser, Sebastian Ulbricht, 
Patric Wirth',
-   EXTINFO::VERSION => 'default',
-   EXTINFO::STATUS  => 'default',
-   EXTINFO::PACKAGE => 'default',
-   EXTINFO::URL => 
'https://help.bluespice.com/index.php/InsertLink',
-   EXTINFO::DEPS => array('bluespice' => '2.22.0')
-   );
-   $this->mExtensionKey = 'MW::InsertLink';
-   wfProfileOut('BS::' . __METHOD__);
-   }
-
/**
 * Initialise the InsertLink extension
 */
diff --git a/InsertLink/InsertLink.setup.php b/InsertLink/InsertLink.setup.php
index 8d013d7..63c1144 100644
--- a/InsertLink/InsertLink.setup.php
+++ b/InsertLink/InsertLink.setup.php
@@ -1,47 +1,2 @@
  __DIR__.'/resources',
-   'remoteExtPath' => 'BlueSpiceExtensions/InsertLink/resources'
-);
-
-$wgResourceModules['ext.bluespice.insertlink'] = array(
-   'scripts' => 'bluespice.insertLink.js',
-   'messages' => array(
-   'bs-insertlink-button-title',
-   'bs-insertlink-dialog-title',
-   'bs-insertlink-tab-wiki-page',
-   'bs-insertlink-tab-ext-link',
-   'bs-insertlink-tab-email',
-   'bs-insertlink-tab-ext-file',
-   'bs-insertlink-label-page',
-   'bs-insertlink-label-link',
-   'bs-insertlink-label-mail',
-   'bs-insertlink-label-description',
-   'bs-insertlink-label-file',
-   'bs-insertlink-label-searchfile',
-   'bs-insertlink-select-a-page',
-   'bs-insertlink-select-a-namespace',
-   'bs-insertlink-empty-field-text',
-   'bs-insertlink-applet-title',
-   'bs-insertlink-no-applet'
-   ),
-   'dependencies' => array(
-   'ext.bluespice.extjs'
-   )
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.insertlink.styles'] = array(
-   'styles' => 'bluespice.insertLink.css',
-   'position' => 'top'
-) + $aResourceModuleTemplate;
-
-unset( $aResourceModuleTemplate );
-
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'InsertLink::onLoadExtensionSchemaUpdates';
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/InsertLink' );
\ No newline at end of file
diff --git a/InsertLink/extension.json b/InsertLink/extension.json
new file mode 100644
index 000..c4710cb
--- /dev/null
+++ b/InsertLink/extension.json
@@ -0,0 +1,66 @@
+{
+   "name": "InsertLink",
+   "version": "2.27.0",
+   "url": "https://help.bluespice.com/index.php/InsertLink";,
+   "author": [
+   "Markus Glaser",
+   "Sebastian Ulbricht",
+   "Patric Wirth"
+   ],
+   "descriptionmsg": "bs-insertlink-desc",
+   "type": "bluespice",
+   "license-name": "GPL-2.0+",
+   "bsgExtensions": {
+   "InsertLink": {
+   "className": "InsertLink",
+   "extPath": "/BlueSpiceExtensions/InsertLink"
+   }
+   },
+   "MessagesDirs": {
+   "InsertLink": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "InsertLink": "InsertLink.class.php"
+   },
+   "ResourceModules": {
+   "ext.bluespice.insertlink": {
+   "scripts": "bluespice.insertLink.js",
+   "messages": [
+   "bs-insertlink-button-title",
+   "bs-insertlink-dialog-title",
+   "bs-insertlink-tab-wi

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: InsertLink: using extension.json

2016-08-17 Thread Gerharddiller85 (Code Review) 
Gerharddiller85 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/305223

Change subject: InsertLink: using extension.json
..

InsertLink: using extension.json

Change-Id: Ib26572d7dc4f75b95d68456b9c3d8ce554f0ec2a
---
M InsertLink/InsertLink.class.php
M InsertLink/InsertLink.setup.php
A InsertLink/extension.json
3 files changed, 61 insertions(+), 69 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/23/305223/1

diff --git a/InsertLink/InsertLink.class.php b/InsertLink/InsertLink.class.php
index c6ee1a9..1e45df8 100644
--- a/InsertLink/InsertLink.class.php
+++ b/InsertLink/InsertLink.class.php
@@ -41,29 +41,6 @@
  * @subpackage InsertLink
  */
 class InsertLink extends BsExtensionMW {
-
-   /**
-* Constructor of InsertLink
-*/
-   public function __construct() {
-   wfProfileIn('BS::' . __METHOD__);
-   // Base settings
-   $this->mExtensionFile = __FILE__;
-   $this->mExtensionType = EXTTYPE::VARIABLE;
-   $this->mInfo = array(
-   EXTINFO::NAME => 'InsertLink',
-   EXTINFO::DESCRIPTION => 'bs-insertlink-desc',
-   EXTINFO::AUTHOR => 'Markus Glaser, Sebastian Ulbricht, 
Patric Wirth',
-   EXTINFO::VERSION => 'default',
-   EXTINFO::STATUS  => 'default',
-   EXTINFO::PACKAGE => 'default',
-   EXTINFO::URL => 
'https://help.bluespice.com/index.php/InsertLink',
-   EXTINFO::DEPS => array('bluespice' => '2.22.0')
-   );
-   $this->mExtensionKey = 'MW::InsertLink';
-   wfProfileOut('BS::' . __METHOD__);
-   }
-
/**
 * Initialise the InsertLink extension
 */
diff --git a/InsertLink/InsertLink.setup.php b/InsertLink/InsertLink.setup.php
index 8d013d7..63c1144 100644
--- a/InsertLink/InsertLink.setup.php
+++ b/InsertLink/InsertLink.setup.php
@@ -1,47 +1,2 @@
  __DIR__.'/resources',
-   'remoteExtPath' => 'BlueSpiceExtensions/InsertLink/resources'
-);
-
-$wgResourceModules['ext.bluespice.insertlink'] = array(
-   'scripts' => 'bluespice.insertLink.js',
-   'messages' => array(
-   'bs-insertlink-button-title',
-   'bs-insertlink-dialog-title',
-   'bs-insertlink-tab-wiki-page',
-   'bs-insertlink-tab-ext-link',
-   'bs-insertlink-tab-email',
-   'bs-insertlink-tab-ext-file',
-   'bs-insertlink-label-page',
-   'bs-insertlink-label-link',
-   'bs-insertlink-label-mail',
-   'bs-insertlink-label-description',
-   'bs-insertlink-label-file',
-   'bs-insertlink-label-searchfile',
-   'bs-insertlink-select-a-page',
-   'bs-insertlink-select-a-namespace',
-   'bs-insertlink-empty-field-text',
-   'bs-insertlink-applet-title',
-   'bs-insertlink-no-applet'
-   ),
-   'dependencies' => array(
-   'ext.bluespice.extjs'
-   )
-) + $aResourceModuleTemplate;
-
-$wgResourceModules['ext.bluespice.insertlink.styles'] = array(
-   'styles' => 'bluespice.insertLink.css',
-   'position' => 'top'
-) + $aResourceModuleTemplate;
-
-unset( $aResourceModuleTemplate );
-
-$wgHooks['LoadExtensionSchemaUpdates'][] = 
'InsertLink::onLoadExtensionSchemaUpdates';
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/InsertLink' );
\ No newline at end of file
diff --git a/InsertLink/extension.json b/InsertLink/extension.json
new file mode 100644
index 000..39fe5cc
--- /dev/null
+++ b/InsertLink/extension.json
@@ -0,0 +1,60 @@
+{  "name": "InsertLink",
+   "version": "2.27.0",
+   "url": "https://help.bluespice.com/index.php/InsertLink";,
+   "author": "Markus Glaser, Sebastian Ulbricht, Patric Wirth",
+   "descriptionmsg": "bs-insertlink-desc",
+   "type": "bluespice",
+   "bsgExtensions": {
+   "InsertLink": {
+   "className": "InsertLink",
+   "extPath": "/BlueSpiceExtensions/InsertLink"
+   }
+   },
+   "MessagesDirs": {
+   "InsertLink": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "InsertLink": "InsertLink.class.php"
+   },
+   "ResourceModules": {
+   "ext.bluespice.insertlink": {
+   "scripts": "bluespice.insertLink.js",
+   "messages": [
+   "bs-insertlink-button-title",
+   "bs-insertlink-dialog-title",
+   "bs-insertlink-tab-wiki-page",
+   "bs-insertlink-tab-ext-link",