Update of 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
In directory 
james.mmbase.org:/tmp/cvs-serv32001/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community

Modified Files:
      Tag: b1_4
        CommunityService.java Community.java 
        DummyCommunityService.java 
Log Message:
CMSC-617 Personal Pages module
Backport to 1.4


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community
See also: http://www.mmbase.org/jira/browse/CMSC-617


Index: CommunityService.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community/CommunityService.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- CommunityService.java       30 Jan 2008 14:06:47 -0000      1.9
+++ CommunityService.java       25 Feb 2008 16:25:45 -0000      1.9.2.1
@@ -3,9 +3,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
 import com.finalist.cmsc.services.Service;
 
 /**
@@ -17,9 +14,19 @@
  */
 public abstract class CommunityService extends Service {
        
-   public abstract boolean loginUser(ActionRequest request, ActionResponse 
response);
+   public abstract void login(String userName, String password);
+
+   public abstract void logout();
+
+   public abstract boolean isAuthenticated();
+
+   public abstract String getAuthenticatedUser();
 
-   public abstract boolean logoutUser(ActionRequest request, ActionResponse 
response);
+   public abstract List<String> getAuthorities();
+
+   public abstract boolean hasAuthority(String authority);
+
+   public abstract List<String> getPreferenceValues(String module, String 
userId, String key);
 
    public abstract Map<String, Map<String,List<String>>> getPreferences(String 
module, String userId, String key, String value);
    
@@ -28,4 +35,5 @@
    public abstract void removePreferences(String module, String userId, String 
key);
    
    public abstract Map<String, Map<String, String>> getUserProperty(String 
userName);
+
 }


Index: Community.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community/Community.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- Community.java      30 Jan 2008 14:06:47 -0000      1.8
+++ Community.java      25 Feb 2008 16:25:45 -0000      1.8.2.1
@@ -3,11 +3,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
 import com.finalist.cmsc.services.ServiceManager;
-import com.finalist.cmsc.services.community.CommunityService;
 
 /**
  * Community, this is a CMSc service class.
@@ -19,34 +15,52 @@
  * @author menno menninga
  */
 public class Community {
-   private final static CommunityService cService = (CommunityService) 
ServiceManager
-         .getService(CommunityService.class);
 
+       private final static CommunityService communityService =
+          (CommunityService) ServiceManager.getService(CommunityService.class);
+
+   public static void login(String userName, String password) {
+      communityService.login(userName, password);
+   }
+
+   public static void logout() {
+      communityService.logout();
+   }
 
-   public static boolean loginUser(ActionRequest request, ActionResponse 
response) {
-      return cService.loginUser(request, response);
+   public static boolean isAuthenticated() {
+      return communityService.isAuthenticated();
    }
 
+   public static String getAuthenticatedUser() {
+      return communityService.getAuthenticatedUser();
+   }
 
-   public static boolean logoutUser(/** HttpServletRequest HttpRequest, * */
-   ActionRequest request, ActionResponse response) {
-      return cService.logoutUser(/** HttpRequest, * */
-      request, response);
+   public static List<String> getAuthorities() {
+      return communityService.getAuthorities();
+   }
+
+   public static boolean hasAuthority(String authority) {
+      return communityService.hasAuthority(authority);
+   }
+
+   public static List<String> getPreferenceValues(String module, String 
userId, String key) {
+      return communityService.getPreferenceValues(module, userId, key);
    }
    
    public Map<String, Map<String,List<String>>> getPreferences(String module, 
String userId, String key, String value){
-      return cService.getPreferences(module, userId, key, value);
+      return communityService.getPreferences(module, userId, key, value);
    }
    
    public void createPreference(String module, String userId, String key, 
List<String> values){
-      cService.createPreference(module, userId, key, values);
+      communityService.createPreference(module, userId, key, values);
    }
    
    public void removePreferences(String module, String userId, String key){
-      cService.removePreferences(module, userId, key);
+      communityService.removePreferences(module, userId, key);
    }
    
    public Map<String, Map<String, String>> getUserProperty(String userName){
-      return cService.getUserProperty(userName);
+      return communityService.getUserProperty(userName);
    }
+
 }


Index: DummyCommunityService.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/servicemanagement/src/java/com/finalist/cmsc/services/community/DummyCommunityService.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -b -r1.8 -r1.8.2.1
--- DummyCommunityService.java  30 Jan 2008 14:06:47 -0000      1.8
+++ DummyCommunityService.java  25 Feb 2008 16:25:45 -0000      1.8.2.1
@@ -3,38 +3,24 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
 /**
  * DummyCommunityService, this is a CMSc service class.
  * This class contains dummy methods that stand in the real uses service class.
  * 
- * @author menno menninga
+ * @author menno menninga / Remco Bos
  */
 public class DummyCommunityService extends CommunityService {
 
-   public boolean loginUser(ActionRequest request, ActionResponse response) {
-      return false;
-   }
-
-   public boolean logoutUser(ActionRequest request, ActionResponse response) {
-      return false;
-   }
-   
-   public Map<String, Map<String,List<String>>> getPreferences(String module, 
String userId, String key, String value){
-      return (null);
-   }
-   
-   public void createPreference(String module, String userId, String key, 
List<String> values){
-      
-   }
-   
-   public void removePreferences(String module, String userId, String key){
-      
-   }
-   
-   public Map<String, Map<String, String>> getUserProperty(String userName){
-      return (null);
-   }
+       @Override public void login(String userName, String password) {}
+       @Override public void logout() {}
+       @Override public boolean isAuthenticated() { return false; }
+       @Override public String getAuthenticatedUser() { return null; }
+       @Override public List<String> getAuthorities() { return null; }
+       @Override public boolean hasAuthority(String authority) { return false; 
}
+       @Override public List<String> getPreferenceValues(String module, String 
userId, String key) { return null; }
+
+       @Override public Map<String, Map<String,List<String>>> 
getPreferences(String module, String userId, String key, String value) { return 
null; }
+       @Override public void createPreference(String module, String userId, 
String key, List<String> values) {}
+       @Override public void removePreferences(String module, String userId, 
String key) {}
+       @Override public Map<String, Map<String, String>> 
getUserProperty(String userName) { return null; }
 }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to