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

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

Change subject: WantedArticle: using extension.json
..


WantedArticle: using extension.json

Patch Set 2: whitespace, license, resource path

Change-Id: I91ba3e399401a0978fb40f58a25d85c3d8105fd6
---
M WantedArticle/WantedArticle.class.php
M WantedArticle/WantedArticle.setup.php
A WantedArticle/extension.json
3 files changed, 45 insertions(+), 46 deletions(-)

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



diff --git a/WantedArticle/WantedArticle.class.php 
b/WantedArticle/WantedArticle.class.php
index 0dda368..8ee40b4 100644
--- a/WantedArticle/WantedArticle.class.php
+++ b/WantedArticle/WantedArticle.class.php
@@ -41,29 +41,6 @@
 class WantedArticle extends BsExtensionMW {
 
/**
-* Contructor of the WantedArticle class
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::' . __METHOD__ );
-
-   // Base settings
-   $this->mExtensionFile = __FILE__;
-   $this->mExtensionType = EXTTYPE::OTHER;
-   $this->mInfo = array(
-   EXTINFO::NAME=> 'WantedArticle',
-   EXTINFO::DESCRIPTION => 'bs-wantedarticle-desc',
-   EXTINFO::AUTHOR  => 'Markus Glaser',
-   EXTINFO::VERSION => 'default',
-   EXTINFO::STATUS  => 'default',
-   EXTINFO::PACKAGE => 'default',
-   EXTINFO::URL => 
'https://help.bluespice.com/index.php/WantedArticle',
-   EXTINFO::DEPS=> array('bluespice' => '2.22.0')
-   );
-   $this->mExtensionKey = 'MW::WantedArticle';
-   wfProfileOut( 'BS::' . __METHOD__ );
-   }
-
-   /**
 * Initialization of WantedArticle extension
 */
protected function initExt() {
diff --git a/WantedArticle/WantedArticle.setup.php 
b/WantedArticle/WantedArticle.setup.php
index fbb8a9a..e074533 100644
--- a/WantedArticle/WantedArticle.setup.php
+++ b/WantedArticle/WantedArticle.setup.php
@@ -1,24 +1,2 @@
  'bluespice.wantedArticle.js',
-   'messages' => array(
-   'bs-wantedarticle-info-nothing-entered',
-   'bs-wantedarticle-title-invalid-chars'
-   ),
-   'position' => 'top',
-   'localBasePath' => $IP . 
'/extensions/BlueSpiceExtensions/WantedArticle/resources',
-   'remoteExtPath' => 'BlueSpiceExtensions/WantedArticle/resources'
-);
-
-$wgAPIModules['bs-wantedarticle'] = 'BSApiTasksWantedArticle';
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/WantedArticle' );
\ No newline at end of file
diff --git a/WantedArticle/extension.json b/WantedArticle/extension.json
new file mode 100644
index 000..5e9a074
--- /dev/null
+++ b/WantedArticle/extension.json
@@ -0,0 +1,44 @@
+{
+   "name": "WantedArticle",
+   "version": "2.27.0",
+   "url": "https://help.bluespice.com/index.php/WantedArticle";,
+   "author": "Markus Glaser",
+   "descriptionmsg": "bs-wantedarticle-desc",
+   "type": "bluespice",
+   "license-name": "GPL-2.0+",
+   "bsgExtensions": {
+   "WantedArticle": {
+   "className": "WantedArticle",
+   "extPath": "/BlueSpiceExtensions/WantedArticle"
+   }
+   },
+   "APIModules": {
+   "bs-wantedarticle": "BSApiTasksWantedArticle"
+   },
+   "MessagesDirs": {
+   "WantedArticle": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "WantedArticle": "WantedArticle.class.php",
+   "ViewWantedArticleForm": "includes/ViewWantedArticleForm.php",
+   "ViewWantedArticleTag": "includes/ViewWantedArticleTag.php",
+   "BSApiTasksWantedArticle": 
"includes/api/BSApiTasksWantedArticle.php"
+   },
+   "ResourceModules": {
+   "ext.bluespice.wantedarticle": {
+   "scripts": "bluespice.wantedArticle.js",
+   "messages": [
+   "bs-wantedarticle-info-nothing-entered",
+   "bs-wantedarticle-title-invalid-chars"
+   ],
+   "position": "top"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": "resources",
+   "remoteExtPath": "BlueSpiceExtensions/WantedArticle/resources"
+   },
+   "manifest_version": 1
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/305461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I91ba3e399401a0978fb40f58a25d85c3d8105fd6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gerhard

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

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

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

Change subject: WantedArticle: using extension.json
..

WantedArticle: using extension.json

Change-Id: I91ba3e399401a0978fb40f58a25d85c3d8105fd6
---
M WantedArticle/WantedArticle.class.php
M WantedArticle/WantedArticle.setup.php
A WantedArticle/extension.json
3 files changed, 44 insertions(+), 46 deletions(-)


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

diff --git a/WantedArticle/WantedArticle.class.php 
b/WantedArticle/WantedArticle.class.php
index 0dda368..8ee40b4 100644
--- a/WantedArticle/WantedArticle.class.php
+++ b/WantedArticle/WantedArticle.class.php
@@ -41,29 +41,6 @@
 class WantedArticle extends BsExtensionMW {
 
/**
-* Contructor of the WantedArticle class
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::' . __METHOD__ );
-
-   // Base settings
-   $this->mExtensionFile = __FILE__;
-   $this->mExtensionType = EXTTYPE::OTHER;
-   $this->mInfo = array(
-   EXTINFO::NAME=> 'WantedArticle',
-   EXTINFO::DESCRIPTION => 'bs-wantedarticle-desc',
-   EXTINFO::AUTHOR  => 'Markus Glaser',
-   EXTINFO::VERSION => 'default',
-   EXTINFO::STATUS  => 'default',
-   EXTINFO::PACKAGE => 'default',
-   EXTINFO::URL => 
'https://help.bluespice.com/index.php/WantedArticle',
-   EXTINFO::DEPS=> array('bluespice' => '2.22.0')
-   );
-   $this->mExtensionKey = 'MW::WantedArticle';
-   wfProfileOut( 'BS::' . __METHOD__ );
-   }
-
-   /**
 * Initialization of WantedArticle extension
 */
protected function initExt() {
diff --git a/WantedArticle/WantedArticle.setup.php 
b/WantedArticle/WantedArticle.setup.php
index fbb8a9a..e074533 100644
--- a/WantedArticle/WantedArticle.setup.php
+++ b/WantedArticle/WantedArticle.setup.php
@@ -1,24 +1,2 @@
  'bluespice.wantedArticle.js',
-   'messages' => array(
-   'bs-wantedarticle-info-nothing-entered',
-   'bs-wantedarticle-title-invalid-chars'
-   ),
-   'position' => 'top',
-   'localBasePath' => $IP . 
'/extensions/BlueSpiceExtensions/WantedArticle/resources',
-   'remoteExtPath' => 'BlueSpiceExtensions/WantedArticle/resources'
-);
-
-$wgAPIModules['bs-wantedarticle'] = 'BSApiTasksWantedArticle';
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/WantedArticle' );
\ No newline at end of file
diff --git a/WantedArticle/extension.json b/WantedArticle/extension.json
new file mode 100644
index 000..bd6734a
--- /dev/null
+++ b/WantedArticle/extension.json
@@ -0,0 +1,43 @@
+{
+"name": "WantedArticle",
+   "version": "2.27.0",
+   "url": "https://help.bluespice.com/index.php/WantedArticle";,
+   "author": "Markus Glaser",
+   "descriptionmsg": "bs-wantedarticle-desc",
+   "type": "bluespice",
+   "bsgExtensions": {
+   "WantedArticle": {
+   "className": "WantedArticle",
+   "extPath": "/BlueSpiceExtensions/WantedArticle"
+   }
+   },
+   "APIModules": {
+   "bs-wantedarticle": "BSApiTasksWantedArticle"
+   },
+   "MessagesDirs": {
+   "WantedArticle": [
+   "i18n"
+   ]
+   },
+   "AutoloadClasses": {
+   "WantedArticle": "WantedArticle.class.php",
+   "ViewWantedArticleForm": "includes/ViewWantedArticleForm.php",
+   "ViewWantedArticleTag": "includes/ViewWantedArticleTag.php",
+   "BSApiTasksWantedArticle": 
"includes/api/BSApiTasksWantedArticle.php"
+   },
+   "ResourceModules": {
+   "ext.bluespice.wantedarticle": {
+   "scripts": "bluespice.wantedArticle.js",
+   "messages": [
+   "bs-wantedarticle-info-nothing-entered",
+   "bs-wantedarticle-title-invalid-chars"
+   ],
+   "position": "top"
+   }
+   },
+   "ResourceFileModulePaths": {
+   "localBasePath": 
"/extensions/BlueSpiceExtensions/WantedArticle/resources",
+   "remoteExtPath": "BlueSpiceExtensions/WantedArticle/resources"
+   },
+   "manifest_version": 1
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/305461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91ba3e399401a0978fb40f58a25d85c3d8105fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Ge