From 14c5d1bbb7a2cb4716ad2c6c7ac56a8f3055020f Mon Sep 17 00:00:00 2001
From: Liran Tal <liran.tal@gmail.com>
Date: Fri, 24 Oct 2014 12:01:46 +0300
Subject: [PATCH] replacing deprecated require.extensions nodejs call with
 explicit full paths for require()

---
 app/controllers/articles.server.controller.js             | 2 +-
 app/controllers/users.server.controller.js                | 8 ++++----
 .../users/users.authentication.server.controller.js       | 2 +-
 app/controllers/users/users.password.server.controller.js | 2 +-
 app/controllers/users/users.profile.server.controller.js  | 2 +-
 app/routes/articles.server.routes.js                      | 4 ++--
 app/routes/core.server.routes.js                          | 2 +-
 app/routes/users.server.routes.js                         | 2 +-
 config/init.js                                            | 8 +-------
 config/strategies/facebook.js                             | 2 +-
 config/strategies/github.js                               | 2 +-
 config/strategies/google.js                               | 2 +-
 config/strategies/linkedin.js                             | 2 +-
 config/strategies/twitter.js                              | 2 +-
 14 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/app/controllers/articles.server.controller.js b/app/controllers/articles.server.controller.js
index 68b17bb8..f6984c8b 100644
--- a/app/controllers/articles.server.controller.js
+++ b/app/controllers/articles.server.controller.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 var mongoose = require('mongoose'),
-	errorHandler = require('./errors'),
+	errorHandler = require('./errors.server.controller.js'),
 	Article = mongoose.model('Article'),
 	_ = require('lodash');
 
diff --git a/app/controllers/users.server.controller.js b/app/controllers/users.server.controller.js
index 94859e72..4cc02aba 100755
--- a/app/controllers/users.server.controller.js
+++ b/app/controllers/users.server.controller.js
@@ -9,8 +9,8 @@ var _ = require('lodash');
  * Extend user's controller
  */
 module.exports = _.extend(
-	require('./users/users.authentication'),
-	require('./users/users.authorization'),
-	require('./users/users.password'),
-	require('./users/users.profile')
+	require('./users/users.authentication.server.controller.js'),
+	require('./users/users.authorization.server.controller.js'),
+	require('./users/users.password.server.controller.js'),
+	require('./users/users.profile.server.controller.js')
 );
\ No newline at end of file
diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js
index be6f6747..d10978f2 100644
--- a/app/controllers/users/users.authentication.server.controller.js
+++ b/app/controllers/users/users.authentication.server.controller.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 var _ = require('lodash'),
-	errorHandler = require('../errors'),
+	errorHandler = require('../errors.server.controller.js'),
 	mongoose = require('mongoose'),
 	passport = require('passport'),
 	User = mongoose.model('User');
diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js
index 7ffb04e8..6fbdecaf 100644
--- a/app/controllers/users/users.password.server.controller.js
+++ b/app/controllers/users/users.password.server.controller.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 var _ = require('lodash'),
-	errorHandler = require('../errors'),
+	errorHandler = require('../errors.server.controller.js'),
 	mongoose = require('mongoose'),
 	passport = require('passport'),
 	User = mongoose.model('User'),
diff --git a/app/controllers/users/users.profile.server.controller.js b/app/controllers/users/users.profile.server.controller.js
index 415c596c..dd38936f 100644
--- a/app/controllers/users/users.profile.server.controller.js
+++ b/app/controllers/users/users.profile.server.controller.js
@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 var _ = require('lodash'),
-	errorHandler = require('../errors'),
+	errorHandler = require('../errors.server.controller.js'),
 	mongoose = require('mongoose'),
 	passport = require('passport'),
 	User = mongoose.model('User');
diff --git a/app/routes/articles.server.routes.js b/app/routes/articles.server.routes.js
index 9dfcb038..0907a107 100644
--- a/app/routes/articles.server.routes.js
+++ b/app/routes/articles.server.routes.js
@@ -3,8 +3,8 @@
 /**
  * Module dependencies.
  */
-var users = require('../../app/controllers/users'),
-	articles = require('../../app/controllers/articles');
+var users = require('../../app/controllers/users.server.controller.js'),
+	articles = require('../../app/controllers/articles.server.controller.js');
 
 module.exports = function(app) {
 	// Article Routes
diff --git a/app/routes/core.server.routes.js b/app/routes/core.server.routes.js
index 4cd9616a..401e5d68 100644
--- a/app/routes/core.server.routes.js
+++ b/app/routes/core.server.routes.js
@@ -2,6 +2,6 @@
 
 module.exports = function(app) {
 	// Root routing
-	var core = require('../../app/controllers/core');
+	var core = require('../../app/controllers/core.server.controller.js');
 	app.route('/').get(core.index);
 };
\ No newline at end of file
diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js
index 929a88a2..fcd2b02e 100644
--- a/app/routes/users.server.routes.js
+++ b/app/routes/users.server.routes.js
@@ -7,7 +7,7 @@ var passport = require('passport');
 
 module.exports = function(app) {
 	// User Routes
-	var users = require('../../app/controllers/users');
+	var users = require('../../app/controllers/users.server.controller.js');
 
 	// Setting up the users profile api
 	app.route('/users/me').get(users.me);
diff --git a/config/init.js b/config/init.js
index d5bd17cc..80ddcd81 100644
--- a/config/init.js
+++ b/config/init.js
@@ -30,11 +30,5 @@ module.exports = function() {
 		}
 		console.log('\x1b[0m');
 	});
-
-	/**
-	 * Add our server node extensions
-	 */
-	require.extensions['.server.controller.js'] = require.extensions['.js'];
-	require.extensions['.server.model.js'] = require.extensions['.js'];
-	require.extensions['.server.routes.js'] = require.extensions['.js'];
+	
 };
\ No newline at end of file
diff --git a/config/strategies/facebook.js b/config/strategies/facebook.js
index 66ea6ac1..4b2625a9 100644
--- a/config/strategies/facebook.js
+++ b/config/strategies/facebook.js
@@ -7,7 +7,7 @@ var passport = require('passport'),
 	url = require('url'),
 	FacebookStrategy = require('passport-facebook').Strategy,
 	config = require('../config'),
-	users = require('../../app/controllers/users');
+	users = require('../../app/controllers/users.server.controller.js');
 
 module.exports = function() {
 	// Use facebook strategy
diff --git a/config/strategies/github.js b/config/strategies/github.js
index eb1cfe76..4fe03303 100644
--- a/config/strategies/github.js
+++ b/config/strategies/github.js
@@ -7,7 +7,7 @@ var passport = require('passport'),
 	url = require('url'),
 	GithubStrategy = require('passport-github').Strategy,
 	config = require('../config'),
-	users = require('../../app/controllers/users');
+	users = require('../../app/controllers/users.server.controller.js');
 
 module.exports = function() {
 	// Use github strategy
diff --git a/config/strategies/google.js b/config/strategies/google.js
index c59293bc..37d2bb4c 100644
--- a/config/strategies/google.js
+++ b/config/strategies/google.js
@@ -7,7 +7,7 @@ var passport = require('passport'),
 	url = require('url'),
 	GoogleStrategy = require('passport-google-oauth').OAuth2Strategy,
 	config = require('../config'),
-	users = require('../../app/controllers/users');
+	users = require('../../app/controllers/users.server.controller.js');
 
 module.exports = function() {
 	// Use google strategy
diff --git a/config/strategies/linkedin.js b/config/strategies/linkedin.js
index 48b41ae0..3c1f1eab 100644
--- a/config/strategies/linkedin.js
+++ b/config/strategies/linkedin.js
@@ -7,7 +7,7 @@ var passport = require('passport'),
 	url = require('url'),
 	LinkedInStrategy = require('passport-linkedin').Strategy,
 	config = require('../config'),
-	users = require('../../app/controllers/users');
+	users = require('../../app/controllers/users.server.controller.js');
 
 module.exports = function() {
 	// Use linkedin strategy
diff --git a/config/strategies/twitter.js b/config/strategies/twitter.js
index 10ddc507..762aa913 100644
--- a/config/strategies/twitter.js
+++ b/config/strategies/twitter.js
@@ -7,7 +7,7 @@ var passport = require('passport'),
 	url = require('url'),
 	TwitterStrategy = require('passport-twitter').Strategy,
 	config = require('../config'),
-	users = require('../../app/controllers/users');
+	users = require('../../app/controllers/users.server.controller.js');
 
 module.exports = function() {
 	// Use twitter strategy