From ae7393db3d99a7ac223ae917129cccd9f49888e3 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Sun, 27 Jan 2013 04:15:53 +0100
Subject: merged the angularjs branch

---
 appinfo/app.php | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'appinfo/app.php')

diff --git a/appinfo/app.php b/appinfo/app.php
index 7825f4fc5..2f7c3d868 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -10,34 +10,22 @@
 *
 */
 
-OC::$CLASSPATH['OCA\News\StatusFlag'] = 'apps/news/lib/item.php';
-OC::$CLASSPATH['OCA\News\Item'] = 'apps/news/lib/item.php';
-OC::$CLASSPATH['OCA\News\Collection'] = 'apps/news/lib/collection.php';
-OC::$CLASSPATH['OCA\News\Feed'] = 'apps/news/lib/feed.php';
-OC::$CLASSPATH['OCA\News\Folder'] = 'apps/news/lib/folder.php';
-OC::$CLASSPATH['OCA\News\FeedType'] = 'apps/news/lib/feedtypes.php';
+namespace OCA\News;
 
-OC::$CLASSPATH['OCA\News\FeedMapper'] = 'apps/news/lib/feedmapper.php';
-OC::$CLASSPATH['OCA\News\ItemMapper'] = 'apps/news/lib/itemmapper.php';
-OC::$CLASSPATH['OCA\News\FolderMapper'] = 'apps/news/lib/foldermapper.php';
+require_once \OC_App::getAppPath('news') . '/appinfo/bootstrap.php';
 
-OC::$CLASSPATH['OCA\News\Utils'] = 'apps/news/lib/utils.php';
 
-OC::$CLASSPATH['OC_Search_Provider_News'] = 'apps/news/lib/search.php';
-
-OC::$CLASSPATH['OCA\News\Backgroundjob'] = 'apps/news/lib/backgroundjob.php';
-OCP\Backgroundjob::addRegularTask( 'OCA\News\Backgroundjob', 'run' );
-
-OC::$CLASSPATH['OCA\News\Share_Backend_News_Item'] = 'apps/news/lib/share/item.php';
-
-OCP\App::addNavigationEntry( array(
+\OCP\App::addNavigationEntry( array(
   'id' => 'news',
   'order' => 74,
-  'href' => OC_Helper::linkTo( 'news', 'index.php' ),
-  'icon' => OC_Helper::imagePath( 'news', 'icon.svg' ),
-  'name' => OC_L10N::get('news')->t('News')
+  'href' => \OC_Helper::linkToRoute('news_index'),
+  'icon' => \OC_Helper::imagePath( 'news', 'icon.svg' ),
+  'name' => \OC_L10N::get('news')->t('News')
 ));
 
-OC_Search::registerProvider('OC_Search_Provider_News');
+\OC_Search::registerProvider('OC_Search_Provider_News');
+
+\OCP\Backgroundjob::addRegularTask( 'OCA\News\Backgroundjob', 'run' );
+\OCP\Share::registerBackend('news_item', 'OCA\News\Share_Backend_News_Item');
+
 
-OCP\Share::registerBackend('news_item', 'OCA\News\Share_Backend_News_Item');
-- 
cgit v1.2.3