make the application work again

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

6 files changed, 34 insertions, 34 deletions

diff --git a/tests/bookmarksTest.php b/tests/bookmarksTest.php
index e229d5e..3bff35d 100644
--- a/tests/bookmarksTest.php
+++ b/tests/bookmarksTest.php
@@ -19,14 +19,14 @@ class BookmarksTest extends PHPUnit_Framework_TestCase
 		global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix, $TEMPLATES_DIR, $filetypes, $debugMode;
 		require_once('./header.inc.php');
 
-		$this->us =& ServiceFactory::getServiceInstance('UserService');
-		$this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+		$this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+		$this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 		$this->bs->deleteAll();
-		$this->b2ts=& ServiceFactory::getServiceInstance('Bookmark2TagService');
+		$this->b2ts=SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 		$this->b2ts->deleteAll();
-		$this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$this->tts->deleteAll();
-		$this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 		$this->tsts->deleteAll();
 	}
 
diff --git a/tests/commonDescriptionTest.php b/tests/commonDescriptionTest.php
index c8666c2..f73b646 100644
--- a/tests/commonDescriptionTest.php
+++ b/tests/commonDescriptionTest.php
@@ -21,16 +21,16 @@ class CommonDescriptionTest extends PHPUnit_Framework_TestCase
         global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
 	require_once('./header.inc.php');
 
-	$this->us =& ServiceFactory::getServiceInstance('UserService');
-	$this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+	$this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+	$this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 	$this->bs->deleteAll();
-	$this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+	$this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 	$this->b2ts->deleteAll();
-	$this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+	$this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 	$this->tts->deleteAll(); 
-	$this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+	$this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 	$this->tsts->deleteAll();
-	$this->cds =& ServiceFactory::getServiceInstance('CommonDescriptionService');
+	$this->cds =SemanticScuttle_Service_Factory::getServiceInstance('CommonDescription');
 	$this->cds->deleteAll();
     }
  
diff --git a/tests/searchTest.php b/tests/searchTest.php
index 2e51717..1dce7dc 100644
--- a/tests/searchTest.php
+++ b/tests/searchTest.php
@@ -20,16 +20,16 @@ class SearchTest extends PHPUnit_Framework_TestCase
         global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
 	require_once('./header.inc.php');
 
-	$this->us =& ServiceFactory::getServiceInstance('UserService');
-	$this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+	$this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+	$this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 	$this->bs->deleteAll();
-	$this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+	$this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 	$this->b2ts->deleteAll();
-	$this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+	$this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 	$this->tts->deleteAll(); 
-	$this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+	$this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 	$this->tsts->deleteAll();
-	$this->shs =& ServiceFactory::getServiceInstance('SearchHistoryService');
+	$this->shs =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
 	$this->shs->deleteAll();
     }
 
diff --git a/tests/tag2TagTest.php b/tests/tag2TagTest.php
index 8bb9ef3..ab3114c 100644
--- a/tests/tag2TagTest.php
+++ b/tests/tag2TagTest.php
@@ -19,14 +19,14 @@ class Tag2TagTest extends PHPUnit_Framework_TestCase
 		global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
 		require_once('./header.inc.php');
 
-		$this->us =& ServiceFactory::getServiceInstance('UserService');
-		$this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+		$this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+		$this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 		$this->bs->deleteAll();
-		$this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+		$this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 		$this->b2ts->deleteAll();
-		$this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$this->tts->deleteAll();
-		$this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 		$this->tsts->deleteAll();
 	}
 
diff --git a/tests/tagsCacheTest.php b/tests/tagsCacheTest.php
index 595afb9..7673565 100644
--- a/tests/tagsCacheTest.php
+++ b/tests/tagsCacheTest.php
@@ -19,16 +19,16 @@ class TagsCacheTest extends PHPUnit_Framework_TestCase
 		global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix, $TEMPLATES_DIR, $debugMode;
 		require_once('./header.inc.php');
 
-		$this->us =& ServiceFactory::getServiceInstance('UserService');
-		$this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+		$this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+		$this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 		$this->bs->deleteAll();
-		$this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+		$this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 		$this->b2ts->deleteAll();
-		$this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$this->tts->deleteAll();
-		$this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 		$this->tsts->deleteAll();
-		$this->tcs =& ServiceFactory::getServiceInstance('TagCacheService');
+		$this->tcs =SemanticScuttle_Service_Factory::getServiceInstance('TagCache');
 		$this->tcs->deleteAll();
 	}
 
diff --git a/tests/tagsTest.php b/tests/tagsTest.php
index 49fec6f..d4957c9 100644
--- a/tests/tagsTest.php
+++ b/tests/tagsTest.php
@@ -16,16 +16,16 @@ class TagsTest extends PHPUnit_Framework_TestCase
 		global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
 		require_once('./header.inc.php');
 
-		$this->ts =& ServiceFactory::getServiceInstance('TagService');
+		$this->ts =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
 		$this->ts->deleteAll();
-		$this->us =& ServiceFactory::getServiceInstance('UserService');
-		$this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+		$this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+		$this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
 		$this->bs->deleteAll();
-		$this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+		$this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
 		$this->b2ts->deleteAll();
-		$this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+		$this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
 		$this->tts->deleteAll();
-		$this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+		$this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
 		$this->tsts->deleteAll();
 	}