[kune-commits] r842 - in trunk: . src/main/java/org/ourproject/kune/app/server src/main/java/org/ourproject/kune/chat/client src/main/java/org/ourproject/kune/chat/client/cnt src/main/java/org/ourproject/kune/chat/client/ctx src/main/java/org/ourproject/kune/chat/client/ctx/rooms src/main/java/org/ourproject/kune/docs/client src/main/java/org/ourproject/kune/docs/client/cnt src/main/java/org/ourproject/kune/docs/client/ctx src/main/java/org/ourproject/kune/docs/client/ctx/admin src/main/java/org/ourproject/kune/docs/client/ctx/folder src/main/java/org/ourproject/kune/platf/client/dto src/main/java/org/ourproject/kune/platf/client/services src/main/java/org/ourproject/kune/platf/client/state src/main/java/org/ourproject/kune/platf/client/ui/gridmenu src/main/java/org/ourproject/kune/platf/client/ui/rate src/main/java/org/ourproject/kune/platf/server src/main/java/org/ourproject/kune/platf/server/mapper src/main/java/org/ourproject/kune/platf/server/rpc src/main/java/org/ourproject/kune/platf/server/users src/main/java/org/ourproject/kune/workspace/client/newgroup src/main/java/org/ourproject/kune/workspace/client/search src/main/java/org/ourproject/kune/workspace/client/sitebar src/main/java/org/ourproject/kune/workspace/client/socialnet src/main/java/org/ourproject/kune/workspace/client/tags src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteoptions src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteprogress src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesearch src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesign src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/title src/main/resources src/test/java/org/ourproject/kune/platf/server/manager src/test/java/org/ourproject/kune/platf/server/mapper src/test/java/org/ourproject/kune/rack/filters/rest src/test/java/org/ourproject/kune/workspace/client/sitebar/msg src/test/java/org/ourproject/kune/workspace/client/tags

vjrj vjrj at ourproject.org
Sat Aug 30 16:57:44 CEST 2008


Author: vjrj
Date: 2008-08-30 16:57:17 +0200 (Sat, 30 Aug 2008)
New Revision: 842

Removed:
   trunk/src/main/java/org/ourproject/kune/platf/client/dto/CustomPropertiesDTO.java
Modified:
   trunk/pom.xml
   trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java
   trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java
   trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
   trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java
   trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java
   trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java
   trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
   trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
   trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java
   trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java
   trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java
   trunk/src/main/java/org/ourproject/kune/docs/client/ctx/folder/FolderContextPresenter.java
   trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java
   trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java
   trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java
   trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java
   trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java
   trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java
   trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java
   trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java
   trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/Site.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteoptions/SiteOptionsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteprogress/SiteProgressPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesearch/SiteSearchPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesign/SiteSignOutLinkPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/title/EntityTitlePresenter.java
   trunk/src/main/resources/dozerBeanMapping.xml
   trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java
   trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java
   trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java
   trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java
   trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java
   trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java
Log:
suco 0.4.0. User's CustomProperties 1st approximation removed (Object in RPC calls is not recommended)

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/pom.xml	2008-08-30 14:57:17 UTC (rev 842)
@@ -271,12 +271,12 @@
      <dependency>
       <groupId>com.calclab.emite</groupId>
       <artifactId>emite</artifactId>
-      <version>0.3.2</version>
+      <version>0.3.3</version>
     </dependency>
     <dependency>
       <groupId>com.calclab</groupId>
       <artifactId>suco</artifactId>
-      <version>0.3.2</version>
+      <version>0.4.0</version>
     </dependency>
   </dependencies>
   <!-- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/index.html -->

Modified: trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/app/server/AbstractExtendedModule.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -19,6 +19,8 @@
  */
 package org.ourproject.kune.app.server;
 
+import static com.google.inject.name.Names.named;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.HashSet;
@@ -32,8 +34,6 @@
 import com.google.inject.Injector;
 import com.google.inject.matcher.Matcher;
 
-import static com.google.inject.name.Names.named;
-
 /**
  * An extension of AbstractModule that provides support for member injection of
  * instances constructed at bind-time; in particular, itself and

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -27,9 +27,9 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
 
 import com.calclab.emiteuimodule.client.EmiteUIDialog;
-import com.calclab.suco.client.modules.AbstractModule;
+import com.calclab.suco.client.module.AbstractModule;
 import com.calclab.suco.client.provider.Factory;
-import com.calclab.suco.client.scopes.SingletonScope;
+import com.calclab.suco.client.scope.SingletonScope;
 
 public class ChatClientModule extends AbstractModule {
 

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -40,7 +40,7 @@
 import com.allen_sauer.gwt.log.client.Log;
 import com.calclab.emite.client.xmpp.stanzas.XmppURI;
 import com.calclab.emiteuimodule.client.EmiteUIDialog;
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot0;
 

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatContentPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -30,7 +30,7 @@
 import com.allen_sauer.gwt.log.client.Log;
 import com.calclab.emite.client.xmpp.stanzas.XmppURI;
 import com.calclab.emiteuimodule.client.EmiteUIDialog;
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class ChatContentPresenter implements ChatContent {
 

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -25,7 +25,7 @@
 import org.ourproject.kune.platf.client.dto.StateDTO;
 import org.ourproject.kune.workspace.client.component.WorkspaceDeckView;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class ChatContextPresenter implements ChatContext {
 

Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/rooms/RoomsAdminPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -35,7 +35,7 @@
 import org.ourproject.kune.workspace.client.ui.ctx.items.ContextItems;
 import org.ourproject.kune.workspace.client.ui.ctx.items.ContextItemsImages;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 
 public class RoomsAdminPresenter implements RoomsAdmin {

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -41,9 +41,9 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.title.EntitySubTitlePresenter;
 import org.ourproject.kune.workspace.client.ui.newtmp.title.EntityTitlePresenter;
 
-import com.calclab.suco.client.modules.AbstractModule;
+import com.calclab.suco.client.module.AbstractModule;
 import com.calclab.suco.client.provider.Factory;
-import com.calclab.suco.client.scopes.SingletonScope;
+import com.calclab.suco.client.scope.SingletonScope;
 
 public class DocumentClientModule extends AbstractModule {
 

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -29,7 +29,7 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class DocumentClientTool extends AbstractClientTool {
     public static final String TYPE_ROOT = "docs.root";

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentContentPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -39,7 +39,7 @@
 import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Signal0;
 import com.calclab.suco.client.signal.Slot0;
 import com.google.gwt.user.client.rpc.AsyncCallback;

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -27,7 +27,7 @@
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.workspace.client.component.WorkspaceDeckView;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class DocumentContextPresenter implements DocumentContext {
     private final WorkspaceDeckView view;

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/admin/AdminContextPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -38,7 +38,7 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.title.EntitySubTitlePresenter;
 import org.ourproject.kune.workspace.client.ui.newtmp.title.EntityTitlePresenter;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class AdminContextPresenter implements AdminContext {
 

Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/folder/FolderContextPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/folder/FolderContextPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/folder/FolderContextPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -35,7 +35,7 @@
 import org.ourproject.kune.workspace.client.ui.ctx.items.ContextItems;
 import org.ourproject.kune.workspace.client.ui.ctx.items.ContextItemsImages;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 
 public class FolderContextPresenter implements FolderContext {

Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/dto/CustomPropertiesDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/CustomPropertiesDTO.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/CustomPropertiesDTO.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -1,37 +0,0 @@
-package org.ourproject.kune.platf.client.dto;
-
-import java.util.HashMap;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class CustomPropertiesDTO implements IsSerializable {
-
-    private HashMap<Class<?>, Object> data;
-
-    public CustomPropertiesDTO() {
-	data = new HashMap<Class<?>, Object>();
-    }
-
-    public HashMap<Class<?>, Object> getData() {
-	return data;
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T getData(final Class<T> type) {
-	return (T) data.get(type);
-    }
-
-    public <T> boolean hasPropertie(final Class<T> type) {
-	return data.containsKey(type);
-    }
-
-    @SuppressWarnings("unchecked")
-    public <T> T setData(final Class<T> type, final T value) {
-	return (T) data.put(type, value);
-    }
-
-    public void setData(final HashMap<Class<?>, Object> data) {
-	this.data = data;
-    }
-
-}

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -23,7 +23,6 @@
 import java.util.Date;
 import java.util.List;
 
-
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 public class StateDTO implements IsSerializable {

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -34,7 +34,6 @@
     private I18nCountryDTO country;
     private List<GroupDTO> groupsIsAdmin;
     private List<GroupDTO> groupsIsCollab;
-    private CustomPropertiesDTO customProperties;
 
     public String getChatName() {
 	return chatName;
@@ -48,10 +47,6 @@
 	return country;
     }
 
-    public CustomPropertiesDTO getCustomProperties() {
-	return customProperties;
-    }
-
     public List<GroupDTO> getGroupsIsAdmin() {
 	return groupsIsAdmin;
     }
@@ -93,10 +88,6 @@
 	this.country = country;
     }
 
-    public void setCustomProperties(final CustomPropertiesDTO customProperties) {
-	this.customProperties = customProperties;
-    }
-
     public void setGroupsIsAdmin(final List<GroupDTO> groupsIsAdmin) {
 	this.groupsIsAdmin = groupsIsAdmin;
     }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/Kune.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -23,8 +23,8 @@
 import com.calclab.suco.client.Suco;
 import com.calclab.suco.client.container.Container;
 import com.calclab.suco.client.container.DelegatedContainer;
-import com.calclab.suco.client.modules.Module;
-import com.calclab.suco.client.modules.ModuleManager.ProviderRegisterStrategy;
+import com.calclab.suco.client.module.Module;
+import com.calclab.suco.client.module.ModuleManager.ProviderRegisterStrategy;
 
 public class Kune extends DelegatedContainer {
 

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -33,7 +33,7 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
 
 import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Signal0;
 import com.calclab.suco.client.signal.Slot0;
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -130,10 +130,10 @@
 
 import com.calclab.emiteuimodule.client.EmiteUIModule;
 import com.calclab.suco.client.container.Container;
-import com.calclab.suco.client.modules.AbstractModule;
-import com.calclab.suco.client.modules.ModuleManager.ProviderRegisterStrategy;
+import com.calclab.suco.client.module.AbstractModule;
+import com.calclab.suco.client.module.ModuleManager.ProviderRegisterStrategy;
 import com.calclab.suco.client.provider.Factory;
-import com.calclab.suco.client.scopes.SingletonScope;
+import com.calclab.suco.client.scope.SingletonScope;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot0;
 import com.google.gwt.core.client.GWT;
@@ -579,7 +579,7 @@
 	    public ContextItems create() {
 		final ContextItemsPresenter presenter = new ContextItemsPresenter(i18n, $(StateManager.class),
 			$(Session.class), $$(ContentServiceAsync.class));
-		final ContextItemsPanel panel = new ContextItemsPanel(presenter, i18n, $(StateManager.class));
+		final ContextItemsPanel panel = new ContextItemsPanel(presenter, i18n, $(StateManager.class), ws);
 		presenter.init(panel);
 		return presenter;
 	    }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -34,7 +34,7 @@
 import org.ourproject.kune.workspace.client.sitebar.rpc.UserServiceAsync;
 
 import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Signal;
 import com.calclab.suco.client.signal.Signal0;
 import com.calclab.suco.client.signal.Slot;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -26,7 +26,6 @@
 import org.ourproject.kune.platf.client.ui.MenuItem;
 import org.ourproject.kune.platf.client.ui.MenuItemCollection;
 
-
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
 import com.gwtext.client.core.EventObject;

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-
 import com.allen_sauer.gwt.log.client.Log;
 import com.calclab.suco.client.signal.Signal;
 import com.calclab.suco.client.signal.Slot;
 import com.gwtext.client.core.EventObject;
+import com.gwtext.client.core.Ext;
 import com.gwtext.client.core.SortDir;
 import com.gwtext.client.data.ArrayReader;
 import com.gwtext.client.data.FieldDef;
@@ -306,6 +306,7 @@
     private void createGrid(final String emptyText, final GridDragConfiguration gridDragConfiguration,
 	    final GridDropConfiguration gridDropConfiguration) {
 	grid = new GridPanel();
+	grid.setId(Ext.generateId());
 	final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(GROUP),
 		new StringFieldDef(GROUP_TOOLTIP_TITLE), new StringFieldDef(GROUP_TOOLTIP),
 		new StringFieldDef(GROUP_ENDICON_HTML), new StringFieldDef(ID), new StringFieldDef(ICON_HTML),

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -27,7 +27,7 @@
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 
 public class RateItPresenter implements RateIt {

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/LoggerMethodInterceptor.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -20,10 +20,10 @@
 
 package org.ourproject.kune.platf.server;
 
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class LoggerMethodInterceptor implements MethodInterceptor {
 

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -21,15 +21,12 @@
 package org.ourproject.kune.platf.server.mapper;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import net.sf.dozer.util.mapping.DozerBeanMapperSingletonWrapper;
 import net.sf.dozer.util.mapping.MapperIF;
 
-import org.ourproject.kune.platf.client.dto.CustomPropertiesDTO;
 import org.ourproject.kune.platf.client.dto.SearchResultDTO;
-import org.ourproject.kune.platf.server.domain.CustomProperties;
 import org.ourproject.kune.platf.server.manager.impl.SearchResult;
 
 import com.google.inject.Singleton;
@@ -56,20 +53,6 @@
 	return dest;
     }
 
-    public CustomPropertiesDTO mapProperties(final CustomProperties customProperties) throws ClassNotFoundException {
-	final CustomPropertiesDTO customPropertiesDTO = new CustomPropertiesDTO();
-	final HashMap<Class<?>, Object> dataMapped = new HashMap<Class<?>, Object>();
-	for (final Class<?> c : customProperties.getData().keySet()) {
-	    final Object object = customProperties.getData(c);
-	    final Class<?> destClassName = Class.forName("org.ourproject.kune.platf.client.dto." + c.getSimpleName()
-		    + "DTO");
-	    final Object objectMapped = map(object, destClassName);
-	    dataMapped.put(destClassName, objectMapped);
-	}
-	customPropertiesDTO.setData(dataMapped);
-	return customPropertiesDTO;
-    }
-
     @SuppressWarnings("unchecked")
     public <K, T> SearchResultDTO<T> mapSearchResult(final SearchResult<K> result, final Class<T> type) {
 	final SearchResultDTO<T> resultDTO = new SearchResultDTO<T>();

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -22,17 +22,15 @@
 
 import java.util.List;
 
-import org.ourproject.kune.platf.client.dto.CustomPropertiesDTO;
 import org.ourproject.kune.platf.client.dto.SearchResultDTO;
-import org.ourproject.kune.platf.server.domain.CustomProperties;
 import org.ourproject.kune.platf.server.manager.impl.SearchResult;
 
 public interface Mapper {
+
     <T> T map(Object source, Class<T> type);
 
     <T> List<T> mapList(List<?> list, Class<T> type);
 
-    CustomPropertiesDTO mapProperties(CustomProperties customProperties) throws ClassNotFoundException;
-
     <K, T> SearchResultDTO<T> mapSearchResult(SearchResult<K> result, Class<T> type);
+
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -112,12 +112,6 @@
     private UserInfoDTO loadUserInfo(final User user) throws DefaultException {
 	final UserInfo userInfo = userInfoService.buildInfo(user, getUserSession().getHash());
 	final UserInfoDTO map = mapper.map(userInfo, UserInfoDTO.class);
-	try {
-	    map.setCustomProperties(mapper.mapProperties(userInfo.getCustomProperties()));
-	} catch (final ClassNotFoundException e) {
-	    e.printStackTrace();
-	    throw new DefaultException("Class not found during mapping userInfo");
-	}
 	return map;
     }
 

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -21,7 +21,6 @@
 
 import java.util.List;
 
-import org.ourproject.kune.platf.server.domain.CustomProperties;
 import org.ourproject.kune.platf.server.domain.Group;
 import org.ourproject.kune.platf.server.domain.I18nCountry;
 import org.ourproject.kune.platf.server.domain.I18nLanguage;
@@ -37,7 +36,6 @@
     private String userHash;
     private I18nLanguage language;
     private I18nCountry country;
-    private CustomProperties customProperties;
 
     public String getChatName() {
 	return chatName;
@@ -51,10 +49,6 @@
 	return country;
     }
 
-    public CustomProperties getCustomProperties() {
-	return customProperties;
-    }
-
     public List<Group> getGroupsIsAdmin() {
 	return groupsIsAdmin;
     }
@@ -95,10 +89,6 @@
 	this.country = country;
     }
 
-    public void setCustomProperties(final CustomProperties customProperties) {
-	this.customProperties = customProperties;
-    }
-
     public void setGroupsIsAdmin(final List<Group> groupsIsAdmin) {
 	this.groupsIsAdmin = groupsIsAdmin;
     }

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -53,7 +53,6 @@
 	    info.setLanguage(language);
 	    info.setCountry(user.getCountry());
 	    info.setUserHash(userHash);
-	    info.setCustomProperties(user.getCustomProperties());
 
 	    final Group userGroup = user.getUserGroup();
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -30,7 +30,7 @@
 import org.ourproject.kune.workspace.client.licensechoose.LicenseChoosePanel;
 import org.ourproject.kune.workspace.client.sitebar.msg.SiteMessagePanel;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 import com.google.gwt.user.client.ui.DeckPanel;
 import com.google.gwt.user.client.ui.HTML;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -33,7 +33,7 @@
 import org.ourproject.kune.workspace.client.sitebar.Site;
 import org.ourproject.kune.workspace.client.sitebar.SiteToken;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -26,7 +26,7 @@
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class SiteSearcherPresenter implements SiteSearcher {
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/Site.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/Site.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/Site.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -25,7 +25,7 @@
 import org.ourproject.kune.workspace.client.sitebar.msg.SiteMessage;
 import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.siteprogress.SiteProgress;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class Site {
     public static final String USERHASH = "userHash";

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -24,7 +24,7 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsTheme;
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot2;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -34,7 +34,7 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsTheme;
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot2;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -20,7 +20,7 @@
 import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 
 public class SocialNetworkPresenter {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -32,7 +32,7 @@
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsTheme;
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot2;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPanel.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPanel.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -26,6 +26,7 @@
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.platf.client.ui.HorizontalLine;
 import org.ourproject.kune.platf.client.ui.IconLabel;
+import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
 
 import com.calclab.suco.client.signal.Slot;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
@@ -43,7 +44,7 @@
     private final I18nTranslationService i18n;
 
     public ContextItemsPanel(final ContextItemsPresenter presenter, final I18nTranslationService i18n,
-	    final StateManager stateManager) {
+	    final StateManager stateManager, final WorkspaceSkeleton ws) {
 	this.i18n = i18n;
 	topBar = new ContextTopBar(presenter, i18n, stateManager);
 	addTopBar(topBar);

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextItemsPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -35,7 +35,7 @@
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.google.gwt.user.client.ui.AbstractImagePrototype;
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteoptions/SiteOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteoptions/SiteOptionsPanel.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteoptions/SiteOptionsPanel.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -4,7 +4,7 @@
 import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.PushButton;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteprogress/SiteProgressPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteprogress/SiteProgressPanel.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/siteprogress/SiteProgressPanel.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -2,7 +2,7 @@
 
 import org.ourproject.kune.workspace.client.ui.newtmp.sitebar.sitepublic.SitePublicSpaceLink;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.RootPanel;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesearch/SiteSearchPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesearch/SiteSearchPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesearch/SiteSearchPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -3,7 +3,7 @@
 import org.ourproject.kune.platf.client.View;
 import org.ourproject.kune.workspace.client.search.SiteSearcher;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class SiteSearchPresenter implements SiteSearch {
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesign/SiteSignOutLinkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesign/SiteSignOutLinkPresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/sitebar/sitesign/SiteSignOutLinkPresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -11,7 +11,7 @@
 import org.ourproject.kune.workspace.client.sitebar.Site;
 import org.ourproject.kune.workspace.client.sitebar.rpc.UserServiceAsync;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot0;
 import com.google.gwt.core.client.GWT;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/themes/WsThemePresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -8,7 +8,7 @@
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Signal2;
 import com.calclab.suco.client.signal.Slot;
 import com.calclab.suco.client.signal.Slot2;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/title/EntityTitlePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/title/EntityTitlePresenter.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/newtmp/title/EntityTitlePresenter.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -31,7 +31,7 @@
 import org.ourproject.kune.platf.client.state.StateManager;
 import org.ourproject.kune.workspace.client.sitebar.Site;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 import com.calclab.suco.client.signal.Slot;
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.user.client.rpc.AsyncCallback;

Modified: trunk/src/main/resources/dozerBeanMapping.xml
===================================================================
--- trunk/src/main/resources/dozerBeanMapping.xml	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/main/resources/dozerBeanMapping.xml	2008-08-30 14:57:17 UTC (rev 842)
@@ -292,14 +292,5 @@
     <class-a>org.ourproject.kune.platf.client.dto.ChatUserParamsDTO</class-a>
     <class-b>org.ourproject.kune.platf.server.domain.ChatUserParams</class-b>
   </mapping>
-
-  <mapping>
-    <class-a>org.ourproject.kune.platf.client.dto.CustomPropertiesDTO</class-a>
-    <class-b>org.ourproject.kune.platf.server.domain.CustomProperties</class-b>
-	<field>
-      <a>data</a>
-      <b>data</b>
-    </field>
-  </mapping>
     
 </mappings>
\ No newline at end of file

Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -15,15 +15,12 @@
 import org.junit.Test;
 import org.ourproject.kune.platf.client.errors.I18nNotFoundException;
 import org.ourproject.kune.platf.server.PersistenceTest;
-import org.ourproject.kune.platf.server.domain.ChatUserParams;
-import org.ourproject.kune.platf.server.domain.CustomProperties;
 import org.ourproject.kune.platf.server.domain.Group;
 import org.ourproject.kune.platf.server.domain.I18nCountry;
 import org.ourproject.kune.platf.server.domain.I18nLanguage;
 import org.ourproject.kune.platf.server.domain.User;
 import org.ourproject.kune.platf.server.manager.impl.SearchResult;
 
-import com.calclab.emite.client.im.roster.RosterManager.SubscriptionMode;
 import com.google.inject.Inject;
 
 public class UserManagerTest extends PersistenceTest {
@@ -126,23 +123,6 @@
     }
 
     @Test
-    public void userSaveAndGetCustomProperties() {
-	final User user1 = userManager.createUser("test", "test 1 name", "test1 at example.com", "some password", "en",
-		"GB", "GMT");
-	final ChatUserParams userChatParams = new ChatUserParams("avatar", true, SubscriptionMode.autoAcceptAll,
-		"color");
-	user1.getCustomProperties().setData(ChatUserParams.class, userChatParams);
-	persist(user1);
-	final User find = userManager.find(user1.getId());
-	final CustomProperties customProperties = find.getCustomProperties();
-	assertEquals("avatar", customProperties.getData(ChatUserParams.class).getAvatar());
-	assertEquals("color", customProperties.getData(ChatUserParams.class).getChatColor());
-	assertEquals(SubscriptionMode.autoAcceptAll, customProperties.getData(ChatUserParams.class)
-		.getSubscriptionMode());
-	assertEquals(true, customProperties.getData(ChatUserParams.class).isPublishRoster());
-    }
-
-    @Test
     public void userSearch() throws Exception, ParseException {
 	userManager.reIndex();
 	final SearchResult<User> result = userManager.search(USER_SHORT_NAME);

Modified: trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -10,26 +10,21 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.ourproject.kune.platf.client.dto.ChatUserParamsDTO;
 import org.ourproject.kune.platf.client.dto.CommentDTO;
 import org.ourproject.kune.platf.client.dto.ContainerDTO;
 import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO;
 import org.ourproject.kune.platf.client.dto.ContentDTO;
-import org.ourproject.kune.platf.client.dto.CustomPropertiesDTO;
 import org.ourproject.kune.platf.client.dto.GroupDTO;
 import org.ourproject.kune.platf.client.dto.GroupListDTO;
 import org.ourproject.kune.platf.client.dto.LicenseDTO;
 import org.ourproject.kune.platf.client.dto.LinkDTO;
 import org.ourproject.kune.platf.client.dto.StateDTO;
-import org.ourproject.kune.platf.client.dto.UserInfoDTO;
 import org.ourproject.kune.platf.server.TestDomainHelper;
 import org.ourproject.kune.platf.server.TestHelper;
 import org.ourproject.kune.platf.server.access.AccessRights;
-import org.ourproject.kune.platf.server.domain.ChatUserParams;
 import org.ourproject.kune.platf.server.domain.Comment;
 import org.ourproject.kune.platf.server.domain.Container;
 import org.ourproject.kune.platf.server.domain.Content;
-import org.ourproject.kune.platf.server.domain.CustomProperties;
 import org.ourproject.kune.platf.server.domain.Group;
 import org.ourproject.kune.platf.server.domain.GroupList;
 import org.ourproject.kune.platf.server.domain.GroupListMode;
@@ -38,9 +33,7 @@
 import org.ourproject.kune.platf.server.domain.User;
 import org.ourproject.kune.platf.server.manager.GroupManager;
 import org.ourproject.kune.platf.server.state.State;
-import org.ourproject.kune.platf.server.users.UserInfo;
 
-import com.calclab.emite.client.im.roster.RosterManager.SubscriptionMode;
 import com.google.inject.Inject;
 
 public class MapperTest {
@@ -49,33 +42,6 @@
     @Inject
     GroupManager groupManager;
 
-    @Test
-    public void customPropertiesInUserInfoMappping() {
-	// Make a custom converter instead of mapper.mapProperties
-	// http://dozer.sourceforge.net/documentation/customconverter.html
-	final UserInfo userInfo = new UserInfo();
-	final ChatUserParams userChatParams = new ChatUserParams("avatar", true, SubscriptionMode.autoAcceptAll,
-		"color");
-	final CustomProperties customProperties = new CustomProperties();
-	customProperties.setData(ChatUserParams.class, userChatParams);
-	userInfo.setCustomProperties(customProperties);
-	final UserInfoDTO map = mapper.map(userInfo, UserInfoDTO.class);
-	final ChatUserParamsDTO data = map.getCustomProperties().getData(ChatUserParamsDTO.class);
-	assertEquals("avatar", data.getAvatar());
-    }
-
-    @Test
-    public void customPropertiesMappping() throws ClassNotFoundException {
-	// Make a custom converter instead of mapper.mapProperties
-	final ChatUserParams userChatParams = new ChatUserParams("avatar", true, SubscriptionMode.autoAcceptAll,
-		"color");
-	final CustomProperties customProperties = new CustomProperties();
-	customProperties.setData(ChatUserParams.class, userChatParams);
-	final CustomPropertiesDTO map = mapper.mapProperties(customProperties);
-	final ChatUserParamsDTO data = map.getData(ChatUserParamsDTO.class);
-	assertEquals("avatar", data.getAvatar());
-    }
-
     @Before
     public void inject() {
 	TestHelper.inject(this);

Modified: trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTMethodFinder.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -9,11 +9,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.ourproject.kune.rack.filters.rest.DefaultRESTMethodFinder;
-import org.ourproject.kune.rack.filters.rest.Parameters;
-import org.ourproject.kune.rack.filters.rest.REST;
-import org.ourproject.kune.rack.filters.rest.RESTMethod;
-import org.ourproject.kune.rack.filters.rest.RESTMethodFinder;
 
 public class TestRESTMethodFinder {
     private RESTMethodFinder finder;

Modified: trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/test/java/org/ourproject/kune/rack/filters/rest/TestRESTServiceDefinition.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -4,8 +4,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.ourproject.kune.rack.filters.rest.REST;
-import org.ourproject.kune.rack.filters.rest.RESTServiceDefinition;
 
 public class TestRESTServiceDefinition {
 

Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/SiteMessagePresenterTest.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -4,8 +4,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.ourproject.kune.workspace.client.newgroup.SiteErrorType;
-import org.ourproject.kune.workspace.client.sitebar.msg.SiteMessagePresenter;
-import org.ourproject.kune.workspace.client.sitebar.msg.SiteMessageView;
 
 public class SiteMessagePresenterTest {
 

Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java	2008-08-11 01:20:37 UTC (rev 841)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java	2008-08-30 14:57:17 UTC (rev 842)
@@ -9,7 +9,7 @@
 import org.ourproject.kune.workspace.client.search.SiteSearcher;
 import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
 
-import com.calclab.suco.client.container.Provider;
+import com.calclab.suco.client.provider.Provider;
 
 public class TagsSummaryPresenterTest {
 




More information about the kune-commits mailing list