Background jobs from info.xml (#24582)

* Move background job registration of Federation to info.xml

* Move background registration of Files app to info.xml

* Move background job registration of files_sharing to info.xml

* Move background job registration of files_trashbin to info.xml

* Move background job registration of files_versions to info.xml

* Move background job registration from user_ldap to info.xml

apps/federation/appinfo/application.php

@@ -169,11 +169,6 @@ class Application extends \OCP\AppFramework\App {
 		});
 	}
 
-	public function setupCron() {
-		$jl = $this->getContainer()->getServer()->getJobList();
-		$jl->add(new SyncJob());
-	}
-
 	/**
 	 * @return SyncFederationAddressBooks
 	 */

apps/federation/appinfo/info.xml

@@ -15,4 +15,8 @@
 	<types>
 		<authentication/>
 	</types>
+
+	<background-jobs>
+		<job>OCA\Federation\SyncJob</job>
+	</background-jobs>
 </info>

apps/federation/appinfo/install.php

@@ -1,23 +0,0 @@
-<?php
-/**
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-$app = new \OCA\Federation\AppInfo\Application();
-$app->setupCron();

apps/federation/appinfo/update.php

@@ -1,23 +0,0 @@
-<?php
-/**
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-$app = new \OCA\Federation\AppInfo\Application();
-$app->setupCron();

apps/files/appinfo/info.xml

@@ -16,4 +16,10 @@
 	<documentation>
 		<user>user-files</user>
 	</documentation>
+
+	<background-jobs>
+		<job>OCA\Files\BackgroundJob\ScanFiles</job>
+		<job>OCA\Files\BackgroundJob\DeleteOrphanedItems</job>
+		<job>OCA\Files\BackgroundJob\CleanupFileLocks</job>
+	</background-jobs>
 </info>

apps/files/appinfo/install.php

@@ -1,27 +0,0 @@
-<?php
-/**
- * @author Arthur Schiwon <blizzz@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Vincent Petry <pvince81@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-// Cron job for scanning user storages
-\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\ScanFiles');
-\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\DeleteOrphanedItems');
-\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\CleanupFileLocks');

apps/files/appinfo/update.php

@@ -98,8 +98,3 @@ if ($installedVersion === '1.1.9' && (
 		}
 	}
 }
-
-// Add cron job for scanning user storages
-\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\ScanFiles');
-\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\DeleteOrphanedItems');
-\OC::$server->getJobList()->add('OCA\Files\BackgroundJob\CleanupFileLocks');

apps/files_sharing/appinfo/info.xml

@@ -20,4 +20,9 @@ Turning the feature off removes shared files and folders on the server for all s
 	<public>
 		<files>public.php</files>
 	</public>
+
+	<background-jobs>
+		<job>OCA\Files_sharing\Lib\DeleteOrphanedSharesJob</job>
+		<job>OCA\Files_sharing\ExpireSharesJob</job>
+	</background-jobs>
 </info>

apps/files_sharing/appinfo/install.php

@@ -1,24 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
-\OC::$server->getJobList()->add('OCA\Files_sharing\ExpireSharesJob');

apps/files_sharing/appinfo/update.php

@@ -31,6 +31,3 @@ if (version_compare($installedVersion, '0.9.1', '<')) {
 	$m->removeReShares();
 	$m->updateInitiatorInfo();
 }
-
-\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
-\OC::$server->getJobList()->add('OCA\Files_sharing\ExpireSharesJob');

apps/files_trashbin/appinfo/info.xml

@@ -21,4 +21,8 @@ To prevent a user from running out of disk space, the ownCloud Deleted files app
 	<documentation>
 		<user>user-trashbin</user>
 	</documentation>
+
+	<background-jobs>
+		<job>OCA\Files_Trashbin\BackgroundJob\ExpireTrash</job>
+	</background-jobs>
 </info>

apps/files_trashbin/appinfo/install.php

@@ -1,23 +0,0 @@
-<?php
-/**
- * @author Victor Dubiniuk <dubiniuk@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
- // Cron job for deleting expired trash items
-\OC::$server->getJobList()->add('OCA\Files_Trashbin\BackgroundJob\ExpireTrash');

apps/files_trashbin/appinfo/update.php

@@ -39,6 +39,3 @@ if (version_compare($installedVersion, '0.6.4', '<')) {
 	$config->setSystemValue('trashbin_retention_obligation', $newObligation);
 	$config->deleteSystemValue('trashbin_auto_expire');
 }
-
-// Cron job for deleting expired trash items
-\OC::$server->getJobList()->add('OCA\Files_Trashbin\BackgroundJob\ExpireTrash');

apps/files_versions/appinfo/info.xml

@@ -21,4 +21,8 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n
 		<user>user-versions</user>
 	</documentation>
 	<default_enable/>
+
+	<background-jobs>
+		<job>OCA\Files_Versions\BackgroundJob\ExpireVersions</job>
+	</background-jobs>
 </info>

apps/files_versions/appinfo/install.php

@@ -1,23 +0,0 @@
-<?php
-/**
- * @author Victor Dubiniuk <dubiniuk@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
- 
-// Cron job for deleting expired trash items
-\OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions');

apps/files_versions/appinfo/update.php

@@ -1,23 +0,0 @@
-<?php
-/**
- * @author Victor Dubiniuk <dubiniuk@owncloud.com>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-// Cron job for deleting expired trash items
-\OC::$server->getJobList()->add('OCA\Files_Versions\BackgroundJob\ExpireVersions');

apps/user_ldap/appinfo/info.xml

@@ -20,4 +20,9 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 		<lib>ldap</lib>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>
+
+	<background-jobs>
+		<job>OCA\user_ldap\lib\Jobs</job>
+		<job>\OCA\User_LDAP\Jobs\CleanUp</job>
+	</background-jobs>
 </info>

apps/user_ldap/appinfo/install.php

@@ -24,6 +24,3 @@ $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
 if($state === 'doSet') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
-
-OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
-OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');

apps/user_ldap/appinfo/update.php

@@ -1,24 +0,0 @@
-<?php
-/**
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
-OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');