You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2011/07/10 00:24:10 UTC
svn commit: r1144765 - in
/incubator/photark/branches/photark-rest/photark-social/src:
main/java/org/apache/photark/social/
main/java/org/apache/photark/social/activity/
main/java/org/apache/photark/social/appdata/
main/java/org/apache/photark/social/e...
Author: lresende
Date: Sun Jul 10 00:24:09 2011
New Revision: 1144765
URL: http://svn.apache.org/viewvc?rev=1144765&view=rev
Log:
Refactoring social project to follow naming and project structure similar to other modules
Added:
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/Activity.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppData.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Group.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/Message.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageCollection.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Person.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/exception/PhotArkSocialException.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java (contents, props changed)
- copied, changed from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManagerImpl.java
Removed:
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/Activity.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppData.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/exception/PhotArkSocialException.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/Message.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageCollection.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Group.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Person.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManagerImpl.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManager.java
incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManagerImpl.java
Modified:
incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/activity/test/ActivityManagerTestCase.java
incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/appdata/test/AppDataManagerTestCase.java
incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/message/test/MessageManagerTestCase.java
incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/PersonManagerTestCase.java
incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/RelationshipManagerTestCase.java
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/Activity.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/Activity.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/Activity.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.activity;
+package org.apache.photark.social;
import java.util.Date;
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Activity.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppData.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppData.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppData.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.appdata;
+package org.apache.photark.social;
public class AppData {
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/AppData.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Group.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Group.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Group.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.person;
+package org.apache.photark.social;
public class Group {
private String id; // ID representing this group
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Group.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/Message.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/Message.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/Message.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.message;
+package org.apache.photark.social;
import java.util.Date;
import java.util.List;
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Message.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageCollection.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageCollection.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageCollection.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.message;
+package org.apache.photark.social;
import java.util.Date;
import java.util.List;
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/MessageCollection.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Person.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Person.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/Person.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.person;
+package org.apache.photark.social;
import java.util.Date;
import java.util.List;
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/Person.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/exception/PhotArkSocialException.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/exception/PhotArkSocialException.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/exception/PhotArkSocialException.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.exception;
+package org.apache.photark.social;
public class PhotArkSocialException extends Throwable {
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/PhotArkSocialException.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManager.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManager.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManager.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java Sun Jul 10 00:24:09 2011
@@ -17,14 +17,15 @@
* under the License.
*/
-package org.apache.photark.social.activity;
+package org.apache.photark.social.services;
import java.util.Set;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.Activity;
+import org.apache.photark.social.PhotArkSocialException;
import org.apache.photark.social.util.FilterOptions;
-public interface ActivityManager {
+public interface ActivityService {
/**
* creates an Activity data object with the given fields
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/ActivityService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManager.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManager.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManager.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java Sun Jul 10 00:24:09 2011
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.photark.social.appdata;
+package org.apache.photark.social.services;
import java.util.Map;
import java.util.Set;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
-public interface AppDataManager {
+public interface AppDataService {
/**
* Retrieve person data
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/AppDataService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManager.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManager.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManager.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java Sun Jul 10 00:24:09 2011
@@ -17,15 +17,17 @@
* under the License.
*/
-package org.apache.photark.social.message;
+package org.apache.photark.social.services;
import java.util.List;
import java.util.Set;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.Message;
+import org.apache.photark.social.MessageCollection;
+import org.apache.photark.social.PhotArkSocialException;
import org.apache.photark.social.util.FilterOptions;
-public interface MessageManager {
+public interface MessageService {
/**
* Posts a message to the user's specified message collection, to be sent to
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/MessageService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManager.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManager.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManager.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java Sun Jul 10 00:24:09 2011
@@ -17,11 +17,12 @@
* under the License.
*/
-package org.apache.photark.social.person;
+package org.apache.photark.social.services;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.Person;
+import org.apache.photark.social.PhotArkSocialException;
-public interface PersonManager {
+public interface PersonService {
/**
* Persists the Person data object
*
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/PersonService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManager.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManager.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManager.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java Sun Jul 10 00:24:09 2011
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.photark.social.person.relationship;
+package org.apache.photark.social.services;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
-public interface RelationshipManager {
+public interface RelationshipService {
public static final String RELATIONSHIP_FRIEND = "friend";
public static final String RELATIONHIP_FRIEND_REQUEST_PENDING = "friend request pending";
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/RelationshipService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManagerImpl.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/activity/ActivityManagerImpl.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.activity;
+package org.apache.photark.social.services.impl;
import java.io.IOException;
import java.util.ArrayList;
@@ -35,22 +35,24 @@ import javax.jcr.Session;
import org.apache.photark.services.PhotarkRuntimeException;
import org.apache.photark.services.jcr.JCRRepositoryManager;
+import org.apache.photark.social.Activity;
import org.apache.photark.social.PhotArkSocialConstants;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.ActivityService;
import org.apache.photark.social.util.FilterOptions;
import org.apache.photark.social.util.PhotArkSocialUtil;
-public class ActivityManagerImpl implements ActivityManager {
+public class JCRActivityServiceImpl implements ActivityService {
private JCRRepositoryManager repositoryManager;
- private static final Logger logger = Logger.getLogger(ActivityManagerImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(JCRActivityServiceImpl.class.getName());
private static final String JCR_ACTIVITY_ROOT_NODE = "activity";
private static final String NEXT_ACTIVITY_ID = "nextActivityId";
- public ActivityManagerImpl() throws IOException {
+ public JCRActivityServiceImpl() throws IOException {
repositoryManager = new JCRRepositoryManager();
}
- public ActivityManagerImpl(JCRRepositoryManager repositoryManager) {
+ public JCRActivityServiceImpl(JCRRepositoryManager repositoryManager) {
this.repositoryManager = repositoryManager;
}
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRActivityServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManagerImpl.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/appdata/AppDataManagerImpl.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.appdata;
+package org.apache.photark.social.services.impl;
import java.util.HashMap;
import java.util.Map;
@@ -34,19 +34,20 @@ import javax.jcr.Session;
import org.apache.photark.services.PhotarkRuntimeException;
import org.apache.photark.services.jcr.JCRRepositoryManager;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.AppDataService;
import org.apache.photark.social.util.PhotArkSocialUtil;
-public class AppDataManagerImpl implements AppDataManager {
+public class JCRAppDataServiceImpl implements AppDataService {
private JCRRepositoryManager repositoryManager;
- private static final Logger logger = Logger.getLogger(AppDataManagerImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(JCRAppDataServiceImpl.class.getName());
private static final String JCR_APPDATA_ROOT_NODE = "appdata";
- public AppDataManagerImpl(JCRRepositoryManager repositoryManager) {
+ public JCRAppDataServiceImpl(JCRRepositoryManager repositoryManager) {
this.repositoryManager = repositoryManager;
}
- public AppDataManagerImpl() {
+ public JCRAppDataServiceImpl() {
}
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRAppDataServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManagerImpl.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/message/MessageManagerImpl.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.message;
+package org.apache.photark.social.services.impl;
import java.util.ArrayList;
import java.util.Date;
@@ -36,23 +36,26 @@ import javax.jcr.Value;
import org.apache.photark.services.PhotarkRuntimeException;
import org.apache.photark.services.jcr.JCRRepositoryManager;
+import org.apache.photark.social.Message;
+import org.apache.photark.social.MessageCollection;
import org.apache.photark.social.PhotArkSocialConstants;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.MessageService;
import org.apache.photark.social.util.FilterOptions;
import org.apache.photark.social.util.PhotArkSocialUtil;
-public class MessageManagerImpl implements MessageManager {
+public class JCRMessageServiceImpl implements MessageService {
private JCRRepositoryManager repositoryManager;
- private static final Logger logger = Logger.getLogger(MessageManagerImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(JCRMessageServiceImpl.class.getName());
private static final String JCR_MESSAGE_ROOT_NODE = "message";
private static final String NEXT_MESSAGE_ID = "nextMessageId";
private boolean updateColl = false;
- public MessageManagerImpl() {
+ public JCRMessageServiceImpl() {
}
- public MessageManagerImpl(JCRRepositoryManager repositoryManager) {
+ public JCRMessageServiceImpl(JCRRepositoryManager repositoryManager) {
this.repositoryManager = repositoryManager;
}
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRMessageServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManagerImpl.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/PersonManagerImpl.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.person;
+package org.apache.photark.social.services.impl;
import java.io.IOException;
import java.util.ArrayList;
@@ -32,20 +32,22 @@ import javax.jcr.Value;
import org.apache.photark.services.PhotarkRuntimeException;
import org.apache.photark.services.jcr.JCRRepositoryManager;
+import org.apache.photark.social.Person;
import org.apache.photark.social.PhotArkSocialConstants;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.PersonService;
import org.apache.photark.social.util.PhotArkSocialUtil;
-public class PersonManagerImpl implements PersonManager {
+public class JCRPersonServiceImpl implements PersonService {
private JCRRepositoryManager repositoryManager;
- private static final Logger logger = Logger.getLogger(PersonManagerImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(JCRPersonServiceImpl.class.getName());
- public PersonManagerImpl() throws IOException {
+ public JCRPersonServiceImpl() throws IOException {
repositoryManager = new JCRRepositoryManager();
}
- public PersonManagerImpl(JCRRepositoryManager repositoryManager) {
+ public JCRPersonServiceImpl(JCRRepositoryManager repositoryManager) {
this.repositoryManager = repositoryManager;
}
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRPersonServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java (from r1142870, incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java?p2=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java&p1=incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManagerImpl.java&r1=1142870&r2=1144765&rev=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/person/relationship/RelationshipManagerImpl.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java Sun Jul 10 00:24:09 2011
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.photark.social.person.relationship;
+package org.apache.photark.social.services.impl;
import java.io.IOException;
import java.util.Arrays;
@@ -32,16 +32,17 @@ import javax.jcr.Value;
import org.apache.photark.services.jcr.JCRRepositoryManager;
import org.apache.photark.social.PhotArkSocialConstants;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.RelationshipService;
import org.apache.photark.social.util.PhotArkSocialUtil;
-public class RelationshipManagerImpl implements RelationshipManager {
+public class JCRRelationshipServiceImpl implements RelationshipService {
private JCRRepositoryManager repositoryManager;
- private static final Logger logger = Logger.getLogger(RelationshipManagerImpl.class.getName());
+ private static final Logger logger = Logger.getLogger(JCRRelationshipServiceImpl.class.getName());
- public RelationshipManagerImpl() throws IOException {
+ public JCRRelationshipServiceImpl() throws IOException {
repositoryManager = new JCRRepositoryManager();
}
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-social/src/main/java/org/apache/photark/social/services/impl/JCRRelationshipServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/activity/test/ActivityManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/activity/test/ActivityManagerTestCase.java?rev=1144765&r1=1144764&r2=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/activity/test/ActivityManagerTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/activity/test/ActivityManagerTestCase.java Sun Jul 10 00:24:09 2011
@@ -29,10 +29,10 @@ import javax.jcr.RepositoryException;
import junit.framework.Assert;
import org.apache.photark.services.jcr.JCRRepositoryManager;
-import org.apache.photark.social.activity.Activity;
-import org.apache.photark.social.activity.ActivityManager;
-import org.apache.photark.social.activity.ActivityManagerImpl;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.Activity;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.ActivityService;
+import org.apache.photark.social.services.impl.JCRActivityServiceImpl;
import org.junit.Test;
public class ActivityManagerTestCase {
@@ -46,7 +46,7 @@ public class ActivityManagerTestCase {
homeDir.delete();
homeDir.mkdir();
repositoryManager.setRepositoryHome(dir);
- ActivityManager activityManager = new ActivityManagerImpl(repositoryManager);
+ ActivityService activityManager = new JCRActivityServiceImpl(repositoryManager);
// Test save activity & get activity methods
Activity activity1 = new Activity();
activity1.setId("1");
Modified: incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/appdata/test/AppDataManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/appdata/test/AppDataManagerTestCase.java?rev=1144765&r1=1144764&r2=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/appdata/test/AppDataManagerTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/appdata/test/AppDataManagerTestCase.java Sun Jul 10 00:24:09 2011
@@ -32,9 +32,9 @@ import javax.jcr.RepositoryException;
import junit.framework.Assert;
import org.apache.photark.services.jcr.JCRRepositoryManager;
-import org.apache.photark.social.appdata.AppDataManager;
-import org.apache.photark.social.appdata.AppDataManagerImpl;
-import org.apache.photark.social.exception.PhotArkSocialException;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.AppDataService;
+import org.apache.photark.social.services.impl.JCRAppDataServiceImpl;
import org.junit.Test;
public class AppDataManagerTestCase {
@@ -47,7 +47,7 @@ public class AppDataManagerTestCase {
homeDir.delete();
homeDir.mkdir();
repositoryManager.setRepositoryHome(dir);
- AppDataManager appDataManager = new AppDataManagerImpl(repositoryManager);
+ AppDataService appDataManager = new JCRAppDataServiceImpl(repositoryManager);
Map<String, String> data1 = new HashMap<String, String>();
data1.put("albumName", "USTrip");
data1.put("a", "1");
Modified: incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/message/test/MessageManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/message/test/MessageManagerTestCase.java?rev=1144765&r1=1144764&r2=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/message/test/MessageManagerTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/message/test/MessageManagerTestCase.java Sun Jul 10 00:24:09 2011
@@ -31,11 +31,11 @@ import javax.jcr.RepositoryException;
import junit.framework.Assert;
import org.apache.photark.services.jcr.JCRRepositoryManager;
-import org.apache.photark.social.exception.PhotArkSocialException;
-import org.apache.photark.social.message.Message;
-import org.apache.photark.social.message.MessageCollection;
-import org.apache.photark.social.message.MessageManager;
-import org.apache.photark.social.message.MessageManagerImpl;
+import org.apache.photark.social.Message;
+import org.apache.photark.social.MessageCollection;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.MessageService;
+import org.apache.photark.social.services.impl.JCRMessageServiceImpl;
import org.junit.Test;
public class MessageManagerTestCase {
@@ -50,7 +50,7 @@ public class MessageManagerTestCase {
}
homeDir.mkdir();
repositoryManager.setRepositoryHome(dir);
- MessageManager msgManager = new MessageManagerImpl(repositoryManager);
+ MessageService msgManager = new JCRMessageServiceImpl(repositoryManager);
// Test creating message collection
MessageCollection msgColl1 = new MessageCollection();
msgColl1.setId("INBOX");
Modified: incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/PersonManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/PersonManagerTestCase.java?rev=1144765&r1=1144764&r2=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/PersonManagerTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/PersonManagerTestCase.java Sun Jul 10 00:24:09 2011
@@ -30,10 +30,10 @@ import javax.jcr.LoginException;
import javax.jcr.RepositoryException;
import org.apache.photark.services.jcr.JCRRepositoryManager;
-import org.apache.photark.social.exception.PhotArkSocialException;
-import org.apache.photark.social.person.Person;
-import org.apache.photark.social.person.PersonManager;
-import org.apache.photark.social.person.PersonManagerImpl;
+import org.apache.photark.social.Person;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.PersonService;
+import org.apache.photark.social.services.impl.JCRPersonServiceImpl;
import org.junit.Assert;
import org.junit.Test;
@@ -46,7 +46,7 @@ public class PersonManagerTestCase {
homeDir.delete();
homeDir.mkdir();
repositoryManager.setRepositoryHome(dir);
- PersonManager pm = new PersonManagerImpl(repositoryManager);
+ PersonService pm = new JCRPersonServiceImpl(repositoryManager);
Person person = new Person();
person.setId("testuser1");
person.setDisplayName("TestUser1");
Modified: incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/RelationshipManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/RelationshipManagerTestCase.java?rev=1144765&r1=1144764&r2=1144765&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/RelationshipManagerTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-social/src/test/java/org/apache/photark/social/person/test/RelationshipManagerTestCase.java Sun Jul 10 00:24:09 2011
@@ -25,13 +25,13 @@ import java.io.IOException;
import junit.framework.Assert;
import org.apache.photark.services.jcr.JCRRepositoryManager;
+import org.apache.photark.social.Person;
import org.apache.photark.social.PhotArkSocialConstants;
-import org.apache.photark.social.exception.PhotArkSocialException;
-import org.apache.photark.social.person.Person;
-import org.apache.photark.social.person.PersonManager;
-import org.apache.photark.social.person.PersonManagerImpl;
-import org.apache.photark.social.person.relationship.RelationshipManager;
-import org.apache.photark.social.person.relationship.RelationshipManagerImpl;
+import org.apache.photark.social.PhotArkSocialException;
+import org.apache.photark.social.services.PersonService;
+import org.apache.photark.social.services.RelationshipService;
+import org.apache.photark.social.services.impl.JCRPersonServiceImpl;
+import org.apache.photark.social.services.impl.JCRRelationshipServiceImpl;
import org.junit.Test;
public class RelationshipManagerTestCase {
@@ -45,8 +45,8 @@ public class RelationshipManagerTestCase
}
homeDir.mkdir();
repositoryManager.setRepositoryHome(dir);
- RelationshipManager relationshipManager = new RelationshipManagerImpl();
- PersonManager pm = new PersonManagerImpl(repositoryManager);
+ RelationshipService relationshipManager = new JCRRelationshipServiceImpl();
+ PersonService pm = new JCRPersonServiceImpl(repositoryManager);
Person person = new Person();
person.setId("user1");
person.setDisplayName("TestUser1");