rename ServiceFactory::getServiceInstance() to get() - much easier to write

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@396 b3834d28-1941-0410-a4f8-b48e95affb8f

44 files changed, 74 insertions, 74 deletions

diff --git a/www/admin.php b/www/admin.php
index 37ebe4b..42fa0c8 100644
--- a/www/admin.php
+++ b/www/admin.php
@@ -20,13 +20,13 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmark2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tagservice');
-$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
-$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
-$tagcacheservice = SemanticScuttle_Service_Factory :: getServiceInstance('TagCache');
-$commondescriptionservice = SemanticScuttle_Service_Factory :: getServiceInstance('CommonDescription');
-$searchhistoryservice = SemanticScuttle_Service_Factory :: getServiceInstance('SearchHistory');
-$tagstatservice = SemanticScuttle_Service_Factory :: getServiceInstance('TagStat');
+$bookmark2tagservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tagservice');
+$bookmarkservice = SemanticScuttle_Service_Factory :: get('Bookmark');
+$tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag');
+$tagcacheservice = SemanticScuttle_Service_Factory :: get('TagCache');
+$commondescriptionservice = SemanticScuttle_Service_Factory :: get('CommonDescription');
+$searchhistoryservice = SemanticScuttle_Service_Factory :: get('SearchHistory');
+$tagstatservice = SemanticScuttle_Service_Factory :: get('TagStat');
 
 // Header variables
 $tplVars['subtitle'] = T_('Manage users');
diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php
index 89dd1e6..0a5d813 100644
--- a/www/ajax/getadminlinkedtags.php
+++ b/www/ajax/getadminlinkedtags.php
@@ -24,9 +24,9 @@
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
-$tagstatservice =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag');
+$tagstatservice =SemanticScuttle_Service_Factory::get('TagStat');
 
 /* Managing all possible inputs */
 isset($_GET['tag']) ? define('GET_TAG', $_GET['tag']): define('GET_TAG', '');
@@ -36,7 +36,7 @@ isset($_GET['uId']) ? define('GET_UID', $_GET['uId']): define('GET_UID', '');
 function displayTag($tag, $uId) {
 	$uId = ($uId==0)?NULL:$uId;  // if user is nobody, NULL allows to look for every public tags
 	
-	$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+	$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
 	$output =  '{ id:'.rand().', name:\''.$tag.'\'';
 
 	$linkedTags = $tag2tagservice->getAdminLinkedTags($tag, '>');
diff --git a/www/ajax/getadmintags.php b/www/ajax/getadmintags.php
index 8345516..00e8906 100644
--- a/www/ajax/getadmintags.php
+++ b/www/ajax/getadmintags.php
@@ -24,8 +24,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag');
 
 ?>
 
diff --git a/www/ajax/getcontacttags.php b/www/ajax/getcontacttags.php
index e508655..4ddc493 100644
--- a/www/ajax/getcontacttags.php
+++ b/www/ajax/getcontacttags.php
@@ -24,8 +24,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag');
 
 ?>
 
diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php
index 2a93a3d..9415f87 100644
--- a/www/ajax/getlinkedtags.php
+++ b/www/ajax/getlinkedtags.php
@@ -24,9 +24,9 @@
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
-$tagstatservice =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag');
+$tagstatservice =SemanticScuttle_Service_Factory::get('TagStat');
 
 /* Managing all possible inputs */
 isset($_GET['tag']) ? define('GET_TAG', $_GET['tag']): define('GET_TAG', '');
@@ -36,7 +36,7 @@ isset($_GET['uId']) ? define('GET_UID', $_GET['uId']): define('GET_UID', '');
 function displayTag($tag, $uId) {
 	$uId = ($uId==0)?NULL:$uId;  // if user is nobody, NULL allows to look for every public tags
 	
-	$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+	$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
 	$output =  '{ id:'.rand().', name:\''.$tag.'\'';
 
 	$linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $uId);
diff --git a/www/ajax/gettags.php b/www/ajax/gettags.php
index b6b12c7..3a4a393 100644
--- a/www/ajax/gettags.php
+++ b/www/ajax/gettags.php
@@ -24,8 +24,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag');
 
 ?>
 
diff --git a/www/ajaxDelete.php b/www/ajaxDelete.php
index f605b3a..be9ed51 100644
--- a/www/ajaxDelete.php
+++ b/www/ajaxDelete.php
@@ -25,7 +25,7 @@ header('Cache-Control: no-cache, must-revalidate');
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
+$bookmarkservice = SemanticScuttle_Service_Factory :: get('Bookmark');
 
 /* Managing all possible inputs */
 isset($_GET['id']) ? define('GET_ID', $_GET['id']): define('GET_ID', '');
diff --git a/www/alltags.php b/www/alltags.php
index 0a88288..52a42b0 100644
--- a/www/alltags.php
+++ b/www/alltags.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 
 
diff --git a/www/api/export_csv.php b/www/api/export_csv.php
index c696001..04000ef 100644
--- a/www/api/export_csv.php
+++ b/www/api/export_csv.php
@@ -6,7 +6,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
diff --git a/www/api/export_gcs.php b/www/api/export_gcs.php
index 1eed961..fab7fe2 100644
--- a/www/api/export_gcs.php
+++ b/www/api/export_gcs.php
@@ -13,7 +13,7 @@ if($GLOBALS['enableGoogleCustomSearch'] == false) {
 }
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 /*
diff --git a/www/api/export_html.php b/www/api/export_html.php
index 922901a..0f36c07 100644
--- a/www/api/export_html.php
+++ b/www/api/export_html.php
@@ -9,7 +9,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 // Check to see if a tag was specified.
 if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php
index 90713e7..4b0898e 100644
--- a/www/api/export_sioc.php
+++ b/www/api/export_sioc.php
@@ -5,8 +5,8 @@ require_once '../../src/SemanticScuttle/header.php';
 header('Content-Type: text/xml; charset=utf-8'); //we change headers html defined in headers.inc.php
 
 /* Service creation: only useful services are created */
-$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User');
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$userservice =SemanticScuttle_Service_Factory::get('User');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 ?>
 <?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"\n?>"; ?>
diff --git a/www/api/posts_add.php b/www/api/posts_add.php
index f396b5e..aff8771 100644
--- a/www/api/posts_add.php
+++ b/www/api/posts_add.php
@@ -14,7 +14,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 // Get all the bookmark's passed-in information
 if (isset($_REQUEST['url']) && (trim($_REQUEST['url']) != ''))
diff --git a/www/api/posts_all.php b/www/api/posts_all.php
index 4c280c7..286d3b3 100644
--- a/www/api/posts_all.php
+++ b/www/api/posts_all.php
@@ -9,7 +9,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Check to see if a tag was specified.
diff --git a/www/api/posts_dates.php b/www/api/posts_dates.php
index 5f002d1..5c53a35 100644
--- a/www/api/posts_dates.php
+++ b/www/api/posts_dates.php
@@ -7,7 +7,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Check to see if a tag was specified.
diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php
index 7ad332f..9e2781a 100644
--- a/www/api/posts_delete.php
+++ b/www/api/posts_delete.php
@@ -11,7 +11,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Note that del.icio.us only errors out if no URL was passed in; there's no error on attempting
diff --git a/www/api/posts_get.php b/www/api/posts_get.php
index a6a6102..2e43a99 100644
--- a/www/api/posts_get.php
+++ b/www/api/posts_get.php
@@ -14,7 +14,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Check to see if a tag was specified.
diff --git a/www/api/posts_public.php b/www/api/posts_public.php
index 2ade45e..ca63f44 100644
--- a/www/api/posts_public.php
+++ b/www/api/posts_public.php
@@ -9,7 +9,7 @@
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Check to see if a tag was specified.
diff --git a/www/api/posts_recent.php b/www/api/posts_recent.php
index e8bc644..7d2e8dc 100644
--- a/www/api/posts_recent.php
+++ b/www/api/posts_recent.php
@@ -11,7 +11,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Check to see if a tag was specified.
diff --git a/www/api/posts_update.php b/www/api/posts_update.php
index 18e5676..9eb5dbd 100644
--- a/www/api/posts_update.php
+++ b/www/api/posts_update.php
@@ -9,7 +9,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 // Get the posts relevant to the passed-in variables.
diff --git a/www/api/tags_get.php b/www/api/tags_get.php
index 043b629..23dfd2a 100644
--- a/www/api/tags_get.php
+++ b/www/api/tags_get.php
@@ -9,7 +9,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
 
 
 // Get the tags relevant to the passed-in variables.
diff --git a/www/api/tags_rename.php b/www/api/tags_rename.php
index bf78b39..a8e281c 100644
--- a/www/api/tags_rename.php
+++ b/www/api/tags_rename.php
@@ -9,7 +9,7 @@ require_once('httpauth.inc.php');
 require_once '../../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
 
 // Get the tag info.
 if (isset($_REQUEST['old']) && (trim($_REQUEST['old']) != ''))
diff --git a/www/bookmarkcommondescriptionedit.php b/www/bookmarkcommondescriptionedit.php
index 8a46313..0cd46d9 100644
--- a/www/bookmarkcommondescriptionedit.php
+++ b/www/bookmarkcommondescriptionedit.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice  = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
-$cdservice        = SemanticScuttle_Service_Factory :: getServiceInstance('CommonDescription');
+$bookmarkservice  = SemanticScuttle_Service_Factory :: get('Bookmark');
+$cdservice        = SemanticScuttle_Service_Factory :: get('CommonDescription');
 
 /* Managing all possible inputs */
 isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 32bdba0..4a36a39 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 /* Managing all possible inputs */
 isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
diff --git a/www/edit.php b/www/edit.php
index 6f30d3c..ba4ae89 100644
--- a/www/edit.php
+++ b/www/edit.php
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
+$bookmarkservice = SemanticScuttle_Service_Factory :: get('Bookmark');
 
 /* Managing all possible inputs */
 isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
diff --git a/www/history.php b/www/history.php
index a7c2024..fa1c535 100644
--- a/www/history.php
+++ b/www/history.php
@@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 /* Managing all possible inputs */
 isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
diff --git a/www/import.php b/www/import.php
index 8f6e386..87f0a9a 100644
--- a/www/import.php
+++ b/www/import.php
@@ -67,7 +67,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
 function startElement($parser, $name, $attrs) {
 	global $depth, $status, $tplVars, $userservice;
 
-	$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+	$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 	if ($name == 'POST') {
 		while(list($attrTitle, $attrVal) = each($attrs)) {
diff --git a/www/importNetscape.php b/www/importNetscape.php
index ad5b414..a941145 100644
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -22,7 +22,7 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
 
 
 /* Managing all possible inputs */
diff --git a/www/importStructure.php b/www/importStructure.php
index c5f5fa0..0611fee 100644
--- a/www/importStructure.php
+++ b/www/importStructure.php
@@ -22,7 +22,7 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
+$tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag');
 
 /* Managing current logged user */
 $currentUser = $userservice->getCurrentObjectUser();
diff --git a/www/index.php b/www/index.php
index 28bf678..bc1b354 100644
--- a/www/index.php
+++ b/www/index.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 /* Managing all possible inputs */
 isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
diff --git a/www/populartags.php b/www/populartags.php
index 2f501da..06813e9 100644
--- a/www/populartags.php
+++ b/www/populartags.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 @list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
 
diff --git a/www/rss.php b/www/rss.php
index 672f4cd..8c08015 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 
 header('Content-Type: application/xml');
diff --git a/www/search.php b/www/search.php
index 4a15053..2b65b2f 100644
--- a/www/search.php
+++ b/www/search.php
@@ -36,8 +36,8 @@ if (POST_TERMS != '') {
 	// GET
 } else {
 	/* Service creation: only useful services are created */
-	$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-	$searchhistoryservice =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
+	$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+	$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory');
 
 	/* Managing current logged user */
 	$currentUserId = $userservice->getCurrentUserId();
diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php
index cc1ecb4..166a0d3 100644
--- a/www/tag2tagadd.php
+++ b/www/tag2tagadd.php
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
+$tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag');
 
 /* Managing all possible inputs */
 isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php
index dd71a87..af639b3 100644
--- a/www/tag2tagdelete.php
+++ b/www/tag2tagdelete.php
@@ -22,7 +22,7 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
+$tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag');
 
 /* Managing all possible inputs */
 isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tag2tagedit.php b/www/tag2tagedit.php
index 750e550..9ee7b96 100644
--- a/www/tag2tagedit.php
+++ b/www/tag2tagedit.php
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
+$tag2tagservice = SemanticScuttle_Service_Factory :: get('Tag2Tag');
 
 
 /* Managing all possible inputs */
diff --git a/www/tagcommondescriptionedit.php b/www/tagcommondescriptionedit.php
index 84ca5e3..0d9e978 100644
--- a/www/tagcommondescriptionedit.php
+++ b/www/tagcommondescriptionedit.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice       = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
-$cdservice        = SemanticScuttle_Service_Factory :: getServiceInstance('CommonDescription');
+$b2tservice       = SemanticScuttle_Service_Factory :: get('Bookmark2Tag');
+$cdservice        = SemanticScuttle_Service_Factory :: get('CommonDescription');
 
 /* Managing all possible inputs */
 isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tagdelete.php b/www/tagdelete.php
index 9ba18fd..1d2ce5e 100644
--- a/www/tagdelete.php
+++ b/www/tagdelete.php
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
+$b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag');
 
 
 /* Managing all possible inputs */
diff --git a/www/tagedit.php b/www/tagedit.php
index 5a3fbb4..8b27b7d 100644
--- a/www/tagedit.php
+++ b/www/tagedit.php
@@ -22,7 +22,7 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$tagservice       = SemanticScuttle_Service_Factory :: getServiceInstance('Tag');
+$tagservice       = SemanticScuttle_Service_Factory :: get('Tag');
 
 /* Managing all possible inputs */
 isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tagrename.php b/www/tagrename.php
index 735e2e8..7222acf 100644
--- a/www/tagrename.php
+++ b/www/tagrename.php
@@ -22,9 +22,9 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$b2tservice       = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
-$tagservice   = SemanticScuttle_Service_Factory :: getServiceInstance('Tag');
-$tag2tagservice   = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
+$b2tservice       = SemanticScuttle_Service_Factory :: get('Bookmark2Tag');
+$tagservice   = SemanticScuttle_Service_Factory :: get('Tag');
+$tag2tagservice   = SemanticScuttle_Service_Factory :: get('Tag2Tag');
 
 /* Managing all possible inputs */
 isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tags.php b/www/tags.php
index 52bf289..e3fd6d2 100644
--- a/www/tags.php
+++ b/www/tags.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 /* Managing all possible inputs */
 isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
diff --git a/www/upgrade.php b/www/upgrade.php
index 39b82db..10a63ff 100644
--- a/www/upgrade.php
+++ b/www/upgrade.php
@@ -35,7 +35,7 @@ exit();
 // This part below will be executed once you comment the two lines above
 /////////////////
 require_once '../src/SemanticScuttle/header.php';
-$tagstatservice   = SemanticScuttle_Service_Factory :: getServiceInstance('TagStat');
+$tagstatservice   = SemanticScuttle_Service_Factory :: get('TagStat');
 ?>
 
 <h1>Upgrade</h1>
diff --git a/www/users.php b/www/users.php
index 111e512..72f5a3d 100644
--- a/www/users.php
+++ b/www/users.php
@@ -22,8 +22,8 @@
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 /* Managing current logged user */
 $currentUser = $userservice->getCurrentObjectUser();
diff --git a/www/watchlist.php b/www/watchlist.php
index 289a478..6198781 100644
--- a/www/watchlist.php
+++ b/www/watchlist.php
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 require_once '../src/SemanticScuttle/header.php';
 
 /* Service creation: only useful services are created */
-$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
-$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
+$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::get('Cache');
 
 /* Managing all possible inputs */
 isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);