[kune-commits] r1169 - in trunk: . dev-utils src/main/java/cc/kune/core src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/errors src/main/java/cc/kune/core/client/i18n src/main/java/cc/kune/core/client/notify src/main/java/cc/kune/core/client/rpcservices src/main/java/cc/kune/core/client/state src/main/java/cc/kune/core/client/ws src/main/java/cc/kune/core/shared/domain src/main/java/cc/kune/core/shared/domain/utils src/main/java/cc/kune/core/shared/dto src/main/java/cc/kune/domain src/main/java/cc/kune/domain/utils src/main/java/org/ourproject/kune/blogs/client/cnt src/main/java/org/ourproject/kune/chat/client src/main/java/org/ourproject/kune/chat/client/cnt src/main/java/org/ourproject/kune/docs/client/cnt src/main/java/org/ourproject/kune/gallery/client/cnt src/main/java/org/ourproject/kune/platf/client/actions src/main/java/org/ourproject/kune/platf/client/ui/download src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia src/main/java/org/ourproject/kune/platf/server/access src/main/java/org/ourproject/kune/platf/server/auth src/main/java/org/ourproject/kune/platf/server/manager src/main/java/org/ourproject/kune/platf/server/manager/file src/main/java/org/ourproject/kune/platf/server/manager/impl src/main/java/org/ourproject/kune/platf/server/rpc src/main/java/org/ourproject/kune/platf/server/state src/main/java/org/ourproject/kune/wiki/client/cnt src/main/java/org/ourproject/kune/workspace/client src/main/java/org/ourproject/kune/workspace/client/cnt src/main/java/org/ourproject/kune/workspace/client/ctxnav src/main/java/org/ourproject/kune/workspace/client/cxt src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia src/main/java/org/ourproject/kune/workspace/client/entityheader src/main/java/org/ourproject/kune/workspace/client/licensewizard src/main/java/org/ourproject/kune/workspace/client/newgroup src/main/java/org/ourproject/kune/workspace/client/options/license src/main/java/org/ourproject/kune/workspace/client/options/pscape src/main/java/org/ourproject/kune/workspace/client/options/tools src/main/java/org/ourproject/kune/workspace/client/search src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic src/main/java/org/ourproject/kune/workspace/client/socialnet src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar src/main/java/org/ourproject/kune/workspace/client/themes src/main/java/org/ourproject/kune/workspace/client/title src/main/java/org/ourproject/kune/workspace/client/tool src/main/java/org/ourproject/kune/workspace/client/upload src/main/java/org/ourproject/kune/workspace/client/wave src/main/resources src/test/java/cc/kune/core/client/state src/test/java/org/ourproject/kune/platf/client/actions src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload src/test/java/org/ourproject/kune/platf/integration/content src/test/java/org/ourproject/kune/platf/integration/socialnet src/test/java/org/ourproject/kune/platf/server/access src/test/java/org/ourproject/kune/platf/server/auth src/test/java/org/ourproject/kune/platf/server/manager/file src/test/java/org/ourproject/kune/platf/server/mapper src/test/java/org/ourproject/kune/workspace/client/entityheader src/test/java/org/ourproject/kune/workspace/client/socialnet
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Sat Dec 18 18:00:56 CET 2010
Author: vjrj_
Date: 2010-12-18 18:00:55 +0100 (Sat, 18 Dec 2010)
New Revision: 1169
Added:
trunk/src/main/java/cc/kune/core/client/notify/Alert.java
trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java
trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java
trunk/src/main/java/cc/kune/core/shared/domain/utils/
trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java
trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java
Removed:
trunk/src/main/java/cc/kune/core/client/CoreEventBus.java
trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java
Modified:
trunk/
trunk/dev-utils/kune.cleanup.eclipse.preferences.xml
trunk/pom.xml
trunk/src/main/java/cc/kune/core/Core.gwt.xml
trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
trunk/src/main/java/cc/kune/core/client/CoreGinjector.java
trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java
trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java
trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java
trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java
trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java
trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java
trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java
trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java
trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java
trunk/src/main/java/cc/kune/core/client/state/Session.java
trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java
trunk/src/main/java/cc/kune/core/client/state/StateManager.java
trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java
trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java
trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java
trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java
trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java
trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java
trunk/src/main/java/cc/kune/domain/AccessLists.java
trunk/src/main/java/cc/kune/domain/Container.java
trunk/src/main/java/cc/kune/domain/Content.java
trunk/src/main/java/cc/kune/domain/Group.java
trunk/src/main/java/cc/kune/domain/GroupList.java
trunk/src/main/java/cc/kune/domain/User.java
trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java
trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java
trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java
trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java
trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java
trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java
trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java
trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java
trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java
trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java
trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java
trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java
trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java
trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java
trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java
trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java
trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java
trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java
trunk/src/main/resources/dozerBeanMapping.xml
trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java
trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java
trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java
trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java
trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java
trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java
Log:
Some more MVC patterns
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- pmd-eclipse.log
.pmd
www-test
screenlog.0
bin
client
public
target
Main-compile
bin
.settings
.gwt-cache
repository
derby.log
star-yellow-grey.png
run.sh
tomcat
.classpath
gwt-out
synccss.sh
.externalToolBuilders
.project
.wtpmodules
www
testRepository
kune-OLD-jcr
KuneApp.launch
KuneApp NOSERVER.launch
old_src
org.ourproject.kune.app.Kune
org.ourproject.kune.iml
org.ourproject.kune.ipr
org.ourproject.kune.iws
nbproject
hibernate.reveng.xml
.gwt-tmp
target-eclipse
.checkstyle
.classpath-bien
+ pmd-eclipse.log
.pmd
www-test
screenlog.0
bin
client
public
target
Main-compile
bin
.settings
.gwt-cache
repository
derby.log
star-yellow-grey.png
run.sh
tomcat
.classpath
gwt-out
synccss.sh
.externalToolBuilders
.project
.wtpmodules
www
testRepository
kune-OLD-jcr
KuneApp.launch
KuneApp NOSERVER.launch
old_src
org.ourproject.kune.app.Kune
org.ourproject.kune.iml
org.ourproject.kune.ipr
org.ourproject.kune.iws
nbproject
hibernate.reveng.xml
.gwt-tmp
target-eclipse
.checkstyle
.classpath-bien
pom.xml.*
Modified: trunk/dev-utils/kune.cleanup.eclipse.preferences.xml
===================================================================
--- trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2010-12-18 17:00:55 UTC (rev 1169)
@@ -5,7 +5,7 @@
<setting id="cleanup.always_use_parentheses_in_expressions" value="true"/>
<setting id="cleanup.never_use_blocks" value="false"/>
<setting id="cleanup.remove_unused_private_methods" value="true"/>
-<setting id="cleanup.add_missing_deprecated_annotations" value="false"/>
+<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
<setting id="cleanup.sort_members" value="true"/>
@@ -28,11 +28,12 @@
<setting id="cleanup.add_missing_nls_tags" value="false"/>
<setting id="cleanup.format_source_code" value="true"/>
<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
-<setting id="cleanup.add_missing_override_annotations" value="false"/>
+<setting id="cleanup.add_missing_override_annotations" value="true"/>
<setting id="cleanup.remove_unused_private_types" value="true"/>
<setting id="cleanup.add_missing_methods" value="false"/>
<setting id="cleanup.make_local_variable_final" value="true"/>
<setting id="cleanup.correct_indentation" value="false"/>
+<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
<setting id="cleanup.remove_unused_imports" value="true"/>
<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
<setting id="cleanup.make_private_fields_final" value="true"/>
@@ -41,7 +42,7 @@
<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
<setting id="cleanup.sort_members_all" value="true"/>
<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
-<setting id="cleanup.add_missing_annotations" value="false"/>
+<setting id="cleanup.add_missing_annotations" value="true"/>
<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/pom.xml 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,891 +1,910 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>cc.kune</groupId>
- <artifactId>kune</artifactId>
- <packaging>war</packaging>
- <version>0.0.7</version>
- <name>kune</name>
- <description> kune free/open/libre collaboration platform </description>
- <url>http://kune.ourproject.org</url>
- <properties>
- <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ -->
- <gwtVersion>2.1.0</gwtVersion>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <slf4j.version>1.6.1</slf4j.version>
- <openjpa.version>2.0.1</openjpa.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwtVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>${gwtVersion}</version>
- <scope>provided</scope>
- </dependency>
- <!-- guice -->
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.gwt.inject</groupId>
- <artifactId>gin</artifactId>
- <version>r137</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-servlet</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.ourproject.common</groupId>
- <artifactId>gwt-common</artifactId>
- <version>0.0.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.extjs</groupId>
- <artifactId>gxt</artifactId>
- <version>2.2.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.cobogw.gwt</groupId>
- <artifactId>cobogw</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>cc.kune.core.ws.armor</groupId>
- <artifactId>ws-armor</artifactId>
- <version>0.0.5</version>
- </dependency>
- <dependency>
- <groupId>com.gwtplatform</groupId>
- <artifactId>gwtp</artifactId>
- <version>0.4</version>
- </dependency>
- <!-- cc -->
- <dependency>
- <groupId>com.gwtext</groupId>
- <artifactId>gwtext</artifactId>
- <version>2.0.5</version>
- </dependency>
- <dependency>
- <groupId>com.gwtextux</groupId>
- <artifactId>gwtextux</artifactId>
- <version>0.4.0.924</version>
- </dependency>
- <dependency>
- <groupId>com.allen_sauer.gwt.log.gwt-log</groupId>
- <artifactId>gwt-log</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId>
- <artifactId>gwt-voices</artifactId>
- <version>1.6.0</version>
- </dependency>
- <!-- utilities -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>com.calclab</groupId>
- <artifactId>suco</artifactId>
- <version>0.6.5</version>
- </dependency>
- <dependency>
- <groupId>jmagick</groupId>
- <artifactId>jmagick</artifactId>
- <version>6.2.6-0</version>
- </dependency>
- <dependency>
- <groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-dom</artifactId>
- <version>2.3-rc-1</version>
- <!-- <version>2.0-SNAPSHOT-g164</version> -->
- <!-- <version>2.0-SNAPSHOT</version> -->
- <!-- <version>2.0-SNAPSHOT-g20s</version> -->
- </dependency>
- <!-- xmpp -->
- <dependency>
- <groupId>com.calclab.emite</groupId>
- <artifactId>emite</artifactId>
- <version>0.4.7</version>
- </dependency>
- <dependency>
- <groupId>org.jivesoftware.smack</groupId>
- <artifactId>smack</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.jivesoftware.smackx</groupId>
- <artifactId>smackx</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.jivesoftware.smackx.debugger</groupId>
- <artifactId>smackx-debugger</artifactId>
- <version>3.0.4</version>
- </dependency>
- <!-- mysql -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.1.13</version>
- </dependency>
- <!-- hibernate JPA -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>3.3.1.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.0.2.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>3.3.0.ga</version>
- </dependency>
- <!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId>
- <version>3.3.1.GA</version> </dependency> -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>3.1.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.4.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-tools</artifactId>
- <version>3.2.3.GA</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>com.wideplay</groupId>
- <artifactId>warp-persist</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <!-- =roo -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <!-- =roo -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <!-- =roo -->
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- <!-- =roo -->
- </dependency>
- <!-- REST: xml and json (stax) -->
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
- </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.1</version>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <!-- File upload -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- </dependency>
- <!-- db upgrades -->
- <dependency>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-core</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-plugin</artifactId>
- <version>1.7.0.0</version>
- </dependency>
- <!-- jetty dependencies -->
- <!-- <dependency> -->
- <!-- <groupId>org.mortbay.jetty</groupId> -->
- <!-- <artifactId>jetty-util</artifactId> -->
- <!-- <version>6.1.11</version> -->
- <!-- <version>7.0.0.pre5</version> -->
- <!-- <scope>provided</scope> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.mortbay.jetty</groupId> -->
- <!-- <artifactId>jetty-maven-plugin</artifactId> -->
- <!-- <version>7.2.1.v20101111</version> -->
- <!-- <artifactId>maven-jetty-plugin</artifactId> <version>6.1.11</version> -->
- <!-- <scope>runtime</scope> -->
- <!-- </dependency> -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <!-- testing dependencies -->
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.0.20070617</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <!-- =roo -->
- <scope>test</scope>
- </dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.openqa.selenium.client-drivers</groupId> -->
- <!-- <artifactId>selenium-java-client-driver</artifactId> -->
- <!-- <version>1.0-beta-1</version> -->
- <!-- <scope>test</scope> -->
- <!-- </dependency> -->
- <!-- public side -->
- <dependency>
- <groupId>org.jruby.rack</groupId>
- <artifactId>jruby-rack</artifactId>
- <version>1.0.3</version>
- <!-- <version>0.9.4</version> -->
- </dependency>
- <!-- wave -->
- <dependency>
- <groupId>org.waveprotocol</groupId>
- <artifactId>kune-wave-server</artifactId>
- <version>0.0.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <type>jar</type>
- </dependency>
- <!-- <dependency> -->
- <!-- <groupId>dom4j</groupId> -->
- <!-- <artifactId>dom4j</artifactId> -->
- <!-- <version>1.6.1</version> -->
- <!-- <type>jar</type> -->
- <!-- </dependency> -->
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-assistedinject</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.gnu.inet</groupId>
- <artifactId>libidn</artifactId>
- <version>1.15</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>2.1.0</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_xpath</artifactId>
- <version>1.1.4c</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.wave-protocol</groupId>
- <artifactId>xmpp</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.wave-protocol</groupId>
- <artifactId>whack</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.common</groupId>
- <artifactId>collect</artifactId>
- <version>1.0-rc2</version>
- </dependency>
- </dependencies>
- <distributionManagement>
- <repository>
- <id>kune.ourproject.org</id>
- <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url>
- </repository>
- </distributionManagement>
- <pluginRepositories>
- <!-- cc -->
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </pluginRepository>
- <!-- cc -->
- <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url>
- </pluginRepository> -->
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below -->
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>gwt-plugin-repo</id>
- <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url>
- <name>Google Web Toolkit Plugin Repository</name>
- </pluginRepository>
- </pluginRepositories>
- <repositories>
- <repository>
- <id>guice-maven</id>
- <name>guice maven</name>
- <url>http://guice-maven.googlecode.com/svn/trunk</url>
- </repository>
- <repository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>mvp4g.googlecode.releases</id>
- <name>Releases Repository for Mvp4g</name>
- <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url>
- </repository>
- <repository>
- <id>ext-gxt</id>
- <name>ext-gxt at jahia</name>
- <url>http://maven.jahia.org/maven2/</url>
- </repository>
- <repository>
- <id>ext-gxt</id>
- <name>ext-gxt at jahia</name>
- <url>http://maven.jahia.org/maven2/</url>
- </repository>
- <repository>
- <id>cobogw</id>
- <name>Cobogw repository at googlecode</name>
- <url>http://cobogw.googlecode.com/svn/maven2</url>
- </repository>
- <repository>
- <id>gwtp</id>
- <name>gwtp repo</name>
- <url>http://maven.gwt-platform.googlecode.com/hg/</url>
- </repository>
- <!-- cc -->
- <repository>
- <id>dyndns-repo</id>
- <url>http://maven.dyndns.org/2</url>
- </repository>
- <repository>
- <id>gwt-maven</id>
- <url>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>cc.kune</groupId>
+ <artifactId>kune</artifactId>
+ <packaging>war</packaging>
+ <version>0.0.7</version>
+ <name>kune</name>
+ <description> kune free/open/libre collaboration platform </description>
+ <url>http://kune.ourproject.org</url>
+ <properties>
+ <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ -->
+ <gwtVersion>2.1.0</gwtVersion>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <slf4j.version>1.6.1</slf4j.version>
+ <openjpa.version>2.0.1</openjpa.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwtVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwtVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- guice -->
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.gwt.inject</groupId>
+ <artifactId>gin</artifactId>
+ <version>r137</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ourproject.common</groupId>
+ <artifactId>gwt-common</artifactId>
+ <version>0.0.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.extjs</groupId>
+ <artifactId>gxt</artifactId>
+ <version>2.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.cobogw.gwt</groupId>
+ <artifactId>cobogw</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cc.kune.core.ws.armor</groupId>
+ <artifactId>ws-armor</artifactId>
+ <version>0.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.gwtplatform</groupId>
+ <artifactId>gwtp</artifactId>
+ <version>0.4</version>
+ </dependency>
+ <!-- cc -->
+ <dependency>
+ <groupId>com.gwtext</groupId>
+ <artifactId>gwtext</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.gwtextux</groupId>
+ <artifactId>gwtextux</artifactId>
+ <version>0.4.0.924</version>
+ </dependency>
+ <dependency>
+ <groupId>com.allen_sauer.gwt.log.gwt-log</groupId>
+ <artifactId>gwt-log</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId>
+ <artifactId>gwt-voices</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <!-- utilities -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.calclab</groupId>
+ <artifactId>suco</artifactId>
+ <version>0.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jmagick</groupId>
+ <artifactId>jmagick</artifactId>
+ <version>6.2.6-0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xwiki.platform</groupId>
+ <artifactId>xwiki-web-gwt-dom</artifactId>
+ <version>2.3-rc-1</version>
+ <!-- <version>2.0-SNAPSHOT-g164</version> -->
+ <!-- <version>2.0-SNAPSHOT</version> -->
+ <!-- <version>2.0-SNAPSHOT-g20s</version> -->
+ </dependency>
+ <!-- xmpp -->
+ <dependency>
+ <groupId>com.calclab.emite</groupId>
+ <artifactId>emite</artifactId>
+ <version>0.4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jivesoftware.smack</groupId>
+ <artifactId>smack</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jivesoftware.smackx</groupId>
+ <artifactId>smackx</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jivesoftware.smackx.debugger</groupId>
+ <artifactId>smackx-debugger</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+ <!-- mysql -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.13</version>
+ </dependency>
+ <!-- hibernate JPA -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.0.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ </dependency>
+ <!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId>
+ <version>3.3.1.GA</version> </dependency> -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>3.1.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.4.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <version>3.2.3.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wideplay</groupId>
+ <artifactId>warp-persist</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <!-- =roo -->
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- =roo -->
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- =roo -->
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <!-- =roo -->
+ </dependency>
+ <!-- REST: xml and json (stax) -->
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.0-RC2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.1</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <!-- File upload -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <!-- db upgrades -->
+ <dependency>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-plugin</artifactId>
+ <version>1.7.0.0</version>
+ </dependency>
+ <!-- jetty dependencies -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.mortbay.jetty</groupId> -->
+ <!-- <artifactId>jetty-util</artifactId> -->
+ <!-- <version>6.1.11</version> -->
+ <!-- <version>7.0.0.pre5</version> -->
+ <!-- <scope>provided</scope> -->
+ <!-- </dependency> -->
+ <!-- <dependency> -->
+ <!-- <groupId>org.mortbay.jetty</groupId> -->
+ <!-- <artifactId>jetty-maven-plugin</artifactId> -->
+ <!-- <version>7.2.1.v20101111</version> -->
+ <!-- <artifactId>maven-jetty-plugin</artifactId> <version>6.1.11</version> -->
+ <!-- <scope>runtime</scope> -->
+ <!-- </dependency> -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <scope>test</scope>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.0.20070617</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <!-- =roo -->
+ <scope>test</scope>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>org.openqa.selenium.client-drivers</groupId> -->
+ <!-- <artifactId>selenium-java-client-driver</artifactId> -->
+ <!-- <version>1.0-beta-1</version> -->
+ <!-- <scope>test</scope> -->
+ <!-- </dependency> -->
+ <!-- public side -->
+ <dependency>
+ <groupId>org.jruby.rack</groupId>
+ <artifactId>jruby-rack</artifactId>
+ <version>1.0.3</version>
+ <!-- <version>0.9.4</version> -->
+ </dependency>
+ <!-- wave -->
+ <dependency>
+ <groupId>org.waveprotocol</groupId>
+ <artifactId>kune-wave-server</artifactId>
+ <version>0.0.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ <type>jar</type>
+ </dependency>
+ <!-- <dependency> -->
+ <!-- <groupId>dom4j</groupId> -->
+ <!-- <artifactId>dom4j</artifactId> -->
+ <!-- <version>1.6.1</version> -->
+ <!-- <type>jar</type> -->
+ <!-- </dependency> -->
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.gnu.inet</groupId>
+ <artifactId>libidn</artifactId>
+ <version>1.15</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.1.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.4c</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_xpath</artifactId>
+ <version>1.1.4c</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.wave-protocol</groupId>
+ <artifactId>xmpp</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wave-protocol</groupId>
+ <artifactId>whack</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.common</groupId>
+ <artifactId>collect</artifactId>
+ <version>1.0-rc2</version>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <repository>
+ <id>kune.ourproject.org</id>
+ <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url>
+ </repository>
+ </distributionManagement>
+ <pluginRepositories>
+ <!-- cc -->
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ <!-- cc -->
+ <!-- <pluginRepository> <id>gwt-maven</id> <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url>
+ </pluginRepository> -->
+ <pluginRepository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled> <!-- Workaround for MNG-2974, see note below -->
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>gwt-plugin-repo</id>
+ <url>http://google-web-toolkit.googlecode.com/svn/2.1.0.M3/gwt/maven</url>
+ <name>Google Web Toolkit Plugin Repository</name>
+ </pluginRepository>
+ <pluginRepository>
+ <id>maven2-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/2/</url>
+ <layout>default</layout>
+ </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>guice-maven</id>
+ <name>guice maven</name>
+ <url>http://guice-maven.googlecode.com/svn/trunk</url>
+ </repository>
+ <repository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>mvp4g.googlecode.releases</id>
+ <name>Releases Repository for Mvp4g</name>
+ <url>http://mvp4g.googlecode.com/svn/maven2/releases/</url>
+ </repository>
+ <repository>
+ <id>ext-gxt</id>
+ <name>ext-gxt at jahia</name>
+ <url>http://maven.jahia.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>ext-gxt</id>
+ <name>ext-gxt at jahia</name>
+ <url>http://maven.jahia.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>cobogw</id>
+ <name>Cobogw repository at googlecode</name>
+ <url>http://cobogw.googlecode.com/svn/maven2</url>
+ </repository>
+ <repository>
+ <id>gwtp</id>
+ <name>gwtp repo</name>
+ <url>http://maven.gwt-platform.googlecode.com/hg/</url>
+ </repository>
+ <!-- cc -->
+ <repository>
+ <id>dyndns-repo</id>
+ <url>http://maven.dyndns.org/2</url>
+ </repository>
+ <repository>
+ <id>gwt-maven</id>
+ <url>
http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
</url>
- </repository>
- <repository>
- <id>kune-maven</id>
- <url>http://kune.ourproject.org/mavenrepo/</url>
- </repository>
- <repository>
- <id>google-maven-snapshot-repository</id>
- <name>Google Maven Snapshot Repository</name>
- <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>openqa.org</id>
- <name>Openqa Release Repository</name>
- <url>http://archiva.openqa.org/repository/releases</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>openqa.org snapshots</id>
- <name>Openqa Snapshot Repository</name>
- <url>http://archiva.openqa.org/repository/snapshots</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>xwiki-releases</id>
- <name>XWiki Maven2 Remote Repository for Releases</name>
- <url>http://maven.xwiki.org/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>xwiki</id>
- <name>XWiki Repository</name>
- <url>http://maven.xwiki.org/snapshots</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>
- <issueManagement>
- <system>kune issues list at ourproject.org</system>
- <url>http://kune.ourproject.org/issues/</url>
- </issueManagement>
- <developers>
- <developer>
- <id>dani</id>
- <name>Daniel Gómez Blasco</name>
- <email>danigb at gmail.com</email>
- </developer>
- <developer>
- <name>Samer Hassan</name>
- <email>samer2004 at gmail.com</email>
- </developer>
- <developer>
- <name>Vicente J. Ruiz Jurado</name>
- <email>vjrj at ourproject.org</email>
- </developer>
- </developers>
- <scm>
- <url>svn://scm.ourproject.org/svnroot/kune/trunk</url>
- </scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <!-- Uncomment and run mvn with -X -e if we have same compile problems
- <compilerArgument>-verbose</compilerArgument> <fork>true</fork> <verbose>true</verbose> -->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>2.1.0-1</version>
- <executions>
- <execution>
- <configuration>
- <!-- <extraJvmArgs>-Xmx512M</extraJvmArgs> -->
- <soyc>false</soyc>
- <style>OBF</style>
- <inline>true</inline>
- </configuration>
- <goals>
- <!-- gwt:* goals to be executed during build -->
- <goal>compile</goal>
- <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html -->
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget>
- <gwt.module>org.ourproject.kune.app.Kune</gwt.module>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>false</downloadJavadocs>
- <wtpversion>2.0</wtpversion>
- </configuration>
- </plugin>
- <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
- <version>2.1</version> <executions> <execution> <phase>compile</phase> <goals>
- <goal>exploded</goal> </goals> </execution> </executions> <configuration>
- <webappDirectory>/war</webappDirectory> </configuration> </plugin> -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.2.1.v20101111</version>
- <!--<artifactId>maven-jetty-plugin</artifactId> <version>6.1.14</version> -->
- <configuration>
- <!-- <contextPath>/</contextPath> -->
- <!-- <webAppSourceDirectory>${basedir}/target/${project.artifactId}-${version}</webAppSourceDirectory> -->
- <!-- <webAppSourceDirectory>war</webAppSourceDirectory> -->
- <webAppSourceDirectory>war</webAppSourceDirectory>
- <reload>manual</reload>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- </configuration>
- </plugin>
- <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre
- collaboration platform</description> <maintainer>Kune Development Team <kune-devel at lists.ourproject.org></maintainer>
- <section>web</section> <priority>optional</priority> <architecture>all</architecture>
- </configuration> <executions> <execution> <goals> <goal>deb</goal> </goals>
- </execution> </executions> </plugin> -->
- <plugin>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-plugin</artifactId>
- <version>1.7.0.0</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <changeLogFile>
- src/main/resources/db/liquibase_changelog.xml </changeLogFile>
- <driver>com.mysql.jdbc.Driver</driver>
- <url>jdbc:mysql://localhost/kune_dev</url>
- <username>kune</username>
- <password>db4kune</password>
- <verbose>true</verbose>
- </configuration>
- <!-- <configuration> <verbose>true</verbose> <propertiesFile>
- src/main/resources/db/liquibase.properties </propertiesFile> </configuration> -->
- <goals>
- <goal>update</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>core</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>core</classifier>
- <includes>
- <include>**/KunePlatform.gwt.xml**</include>
- <include>**/i18n/I18nTranslationService.**</include>
- <include>**/i18n/I18nTranslationServiceMocked.** </include>
- <include>**/TextUtils.**</include>
- <include>**/IconLabelEditable.**</include>
- <include>**/QuickTipsHelper.**</include>
- <include>**/RichText.gwt.xml**</include>
- <include>**/BasicDialog.**</include>
- <include>**/HorizontalLine.**</include>
- <include>**/AbstractLabel.**</include>
- <include>**/IconLabel.**</include>
- <include> **/EditableIconLabel.**</include>
- <include> **/EditableClickListener.**</include>
- <include>**/KuneStringUtils.**</include>
- <include>**/IconHyperlink*.**</include>
- <include>**/LabelWrapper*.**</include>
- <include>**/KuneUiUtils.**</include>
- <include>**/View.**</include>
- <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include>
- <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include>
- <include>**/platf/client/dispatch/**</include> -->
- </includes>
- </configuration>
- </execution>
- <execution>
- <id>helloworldmodule</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>helloworldmodule</classifier>
- <includes>
- <include>**/HelloWorld*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- <plugin> -->
- <!-- <groupId>org.codehaus.mojo</groupId> -->
- <!-- <artifactId>selenium-maven-plugin</artifactId> -->
- <!-- <configuration> -->
- <!-- <port>4441</port> -->
- <!-- </configuration> -->
- <!-- <executions> -->
- <!-- <execution> -->
- <!-- <phase>pre-integration-test</phase> -->
- <!-- <goals> -->
- <!-- <goal>start-server</goal> -->
- <!-- </goals> -->
- <!-- <configuration> -->
- <!-- <background>true</background> -->
- <!-- </configuration> -->
- <!-- </execution> -->
- <!-- </executions> -->
- <!-- </plugin> -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <!-- Skip the normal tests, we'll run them in the integration-test
- phase -->
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.2</version>
- <configuration> <filesets> <fileset> <directory>src/main/webapp/gwt/</directory>
- <includes> <include>**/org.ourproject.kune.app.Kune*</include> <followSymlinks>false</followSymlinks>
- </includes> </fileset> </filesets> </configuration> </plugin> -->
- </plugins>
- <!-- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> -->
- <outputDirectory>war/WEB-INF/classes</outputDirectory>
- <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- </resources>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- <profiles>
- <profile>
- <!-- Activate only when within eclipse -->
- <id>m2eclipse</id>
- <activation>
- <property>
- <name>!m2e.version</name>
- </property>
- </activation>
- <!-- GWT SDK is provided by GWT SDK Classpath Container -->
- <dependencies>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwtVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>${gwtVersion}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
+ </repository>
+ <repository>
+ <id>kune-maven</id>
+ <url>http://kune.ourproject.org/mavenrepo/</url>
+ </repository>
+ <repository>
+ <id>google-maven-snapshot-repository</id>
+ <name>Google Maven Snapshot Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>openqa.org</id>
+ <name>Openqa Release Repository</name>
+ <url>http://archiva.openqa.org/repository/releases</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>openqa.org snapshots</id>
+ <name>Openqa Snapshot Repository</name>
+ <url>http://archiva.openqa.org/repository/snapshots</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>xwiki-releases</id>
+ <name>XWiki Maven2 Remote Repository for Releases</name>
+ <url>http://maven.xwiki.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>xwiki</id>
+ <name>XWiki Repository</name>
+ <url>http://maven.xwiki.org/snapshots</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <issueManagement>
+ <system>kune issues list at ourproject.org</system>
+ <url>http://kune.ourproject.org/issues/</url>
+ </issueManagement>
+ <developers>
+ <developer>
+ <id>dani</id>
+ <name>Daniel Gómez Blasco</name>
+ <email>danigb at gmail.com</email>
+ </developer>
+ <developer>
+ <name>Samer Hassan</name>
+ <email>samer2004 at gmail.com</email>
+ </developer>
+ <developer>
+ <name>Vicente J. Ruiz Jurado</name>
+ <email>vjrj at ourproject.org</email>
+ </developer>
+ </developers>
+ <scm>
+ <url>svn://scm.ourproject.org/svnroot/kune/trunk</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.bsc.maven</groupId>
+ <artifactId>maven-processor-plugin</artifactId>
+ <version>1.3.7</version>
+ <executions>
+ <execution>
+ <id>process</id>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <!-- Uncomment and run mvn with -X -e if we have same compile problems
+ <compilerArgument>-verbose</compilerArgument> <fork>true</fork> <verbose>true</verbose> -->
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>2.1.0-1</version>
+ <executions>
+ <execution>
+ <configuration>
+ <!-- <extraJvmArgs>-Xmx512M</extraJvmArgs> -->
+ <soyc>false</soyc>
+ <style>OBF</style>
+ <inline>true</inline>
+ </configuration>
+ <goals>
+ <!-- gwt:* goals to be executed during build -->
+ <goal>compile</goal>
+ <!-- http://mojo.codehaus.org/gwt-maven-plugin/user-guide/library.html -->
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget>
+ <gwt.module>org.ourproject.kune.app.Kune</gwt.module>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>false</downloadJavadocs>
+ <wtpversion>2.0</wtpversion>
+ </configuration>
+ </plugin>
+ <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
+ <version>2.1</version> <executions> <execution> <phase>compile</phase> <goals>
+ <goal>exploded</goal> </goals> </execution> </executions> <configuration>
+ <webappDirectory>/war</webappDirectory> </configuration> </plugin> -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.2.1.v20101111</version>
+ <!--<artifactId>maven-jetty-plugin</artifactId> <version>6.1.14</version> -->
+ <configuration>
+ <!-- <contextPath>/</contextPath> -->
+ <!-- <webAppSourceDirectory>${basedir}/target/${project.artifactId}-${version}</webAppSourceDirectory> -->
+ <!-- <webAppSourceDirectory>war</webAppSourceDirectory> -->
+ <webAppSourceDirectory>war</webAppSourceDirectory>
+ <reload>manual</reload>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>deb-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version> <configuration> <description>kune free/open/libre
+ collaboration platform</description> <maintainer>Kune Development Team <kune-devel at lists.ourproject.org></maintainer>
+ <section>web</section> <priority>optional</priority> <architecture>all</architecture>
+ </configuration> <executions> <execution> <goals> <goal>deb</goal> </goals>
+ </execution> </executions> </plugin> -->
+ <plugin>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-plugin</artifactId>
+ <version>1.7.0.0</version>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <configuration>
+ <changeLogFile>
+ src/main/resources/db/liquibase_changelog.xml </changeLogFile>
+ <driver>com.mysql.jdbc.Driver</driver>
+ <url>jdbc:mysql://localhost/kune_dev</url>
+ <username>kune</username>
+ <password>db4kune</password>
+ <verbose>true</verbose>
+ </configuration>
+ <!-- <configuration> <verbose>true</verbose> <propertiesFile> src/main/resources/db/liquibase.properties
+ </propertiesFile> </configuration> -->
+ <goals>
+ <goal>update</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>core</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>core</classifier>
+ <includes>
+ <include>**/KunePlatform.gwt.xml**</include>
+ <include>**/i18n/I18nTranslationService.**</include>
+ <include>**/i18n/I18nTranslationServiceMocked.** </include>
+ <include>**/TextUtils.**</include>
+ <include>**/IconLabelEditable.**</include>
+ <include>**/QuickTipsHelper.**</include>
+ <include>**/RichText.gwt.xml**</include>
+ <include>**/BasicDialog.**</include>
+ <include>**/HorizontalLine.**</include>
+ <include>**/AbstractLabel.**</include>
+ <include>**/IconLabel.**</include>
+ <include> **/EditableIconLabel.**</include>
+ <include> **/EditableClickListener.**</include>
+ <include>**/KuneStringUtils.**</include>
+ <include>**/IconHyperlink*.**</include>
+ <include>**/LabelWrapper*.**</include>
+ <include>**/KuneUiUtils.**</include>
+ <include>**/View.**</include>
+ <!-- <include>**/platf/**</include> <include>**/platf/client/extend/**</include>
+ <include>**/platf/client/*java</include> <include>**/platf/client/app/**</include>
+ <include>**/platf/client/dispatch/**</include> -->
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>helloworldmodule</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>helloworldmodule</classifier>
+ <includes>
+ <include>**/HelloWorld*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- <plugin> -->
+ <!-- <groupId>org.codehaus.mojo</groupId> -->
+ <!-- <artifactId>selenium-maven-plugin</artifactId> -->
+ <!-- <configuration> -->
+ <!-- <port>4441</port> -->
+ <!-- </configuration> -->
+ <!-- <executions> -->
+ <!-- <execution> -->
+ <!-- <phase>pre-integration-test</phase> -->
+ <!-- <goals> -->
+ <!-- <goal>start-server</goal> -->
+ <!-- </goals> -->
+ <!-- <configuration> -->
+ <!-- <background>true</background> -->
+ <!-- </configuration> -->
+ <!-- </execution> -->
+ <!-- </executions> -->
+ <!-- </plugin> -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <!-- Skip the normal tests, we'll run them in the integration-test phase -->
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- <plugin> <artifactId>maven-clean-plugin</artifactId> <version>2.2</version>
+ <configuration> <filesets> <fileset> <directory>src/main/webapp/gwt/</directory>
+ <includes> <include>**/org.ourproject.kune.app.Kune*</include> <followSymlinks>false</followSymlinks>
+ </includes> </fileset> </filesets> </configuration> </plugin> -->
+ </plugins>
+ <!-- <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory> -->
+ <outputDirectory>war/WEB-INF/classes</outputDirectory>
+ <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ </resources>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <profiles>
+ <profile>
+ <!-- Activate only when within eclipse -->
+ <id>m2eclipse</id>
+ <activation>
+ <property>
+ <name>!m2e.version</name>
+ </property>
+ </activation>
+ <!-- GWT SDK is provided by GWT SDK Classpath Container -->
+ <dependencies>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwtVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwtVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml
===================================================================
--- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,32 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/src/gwt-module.dtd">
<module rename-to="ws">
- <!-- source / public / etc ==================================== -->
- <!-- excluding test sources for this module workaround for open issue 4454
- see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 -->
- <source path='client'
- excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
- <source path="shared" />
- <public path="public" />
- <!-- Dependencies ============================================= -->
- <inherits name="com.google.gwt.user.User" />
- <!-- <inherits name='com.mvp4g.Mvp4gModule' /> -->
- <inherits name="cc.kune.core.ws.armor.WsArmor" />
- <inherits name="org.ourproject.common.Common" />
- <inherits name="com.extjs.gxt.ui.GXT" />
- <inherits name="com.calclab.suco.Suco" />
- <inherits name='com.gwtplatform.mvp.Mvp' />
- <define-configuration-property name="gin.ginjector"
- is-multi-valued="false" />
- <set-configuration-property name="gin.ginjector"
- value="cc.kune.core.client.CoreGinjector" />
- <!-- Styles =================================================== -->
- <stylesheet src="ws.css" />
- <stylesheet src="fontface/stylesheet.css" />
- <!-- Entrypoint =============================================== -->
- <!-- <entry-point class="cc.kune.core.client.KuneEntryPoint" /> -->
- <!-- NOTE: this only compiles for chromium/safari ============= -->
- <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
- <!-- <set-property name="user.agent" value="gecko1_8" /> -->
- <set-property name="user.agent" value="safari" />
+ <!-- source / public / etc ==================================== -->
+ <!-- excluding test sources for this module workaround for open issue 4454
+ see http://code.google.com/p/google-web-toolkit/issues/detail?id=4454 -->
+ <source path='client'
+ excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" />
+ <source path="shared" />
+ <public path="public" />
+ <!-- Dependencies ============================================= -->
+ <inherits name="com.google.gwt.user.User" />
+ <!-- <inherits name='com.mvp4g.Mvp4gModule' /> -->
+ <inherits name="cc.kune.core.ws.armor.WsArmor" />
+ <inherits name="org.ourproject.common.Common" />
+ <inherits name="com.extjs.gxt.ui.GXT" />
+ <inherits name="com.calclab.suco.Suco" />
+ <!-- gwt-platform ============================================= -->
+ <inherits name='com.gwtplatform.mvp.Mvp' />
+ <define-configuration-property name="gin.ginjector"
+ is-multi-valued="false" />
+ <set-configuration-property name="gin.ginjector"
+ value="cc.kune.core.client.CoreGinjector" />
+ <!-- Styles =================================================== -->
+ <stylesheet src="ws.css" />
+ <stylesheet src="fontface/stylesheet.css" />
+ <!-- Entrypoint =============================================== -->
+ <entry-point class="cc.kune.core.client.KuneEntryPoint" />
+ <!-- NOTE: this only compiles for chromium/safari ============= -->
+ <!--http://code.google.com/p/google-web-toolkit/issues/detail?id=42 -->
+ <!-- <set-property name="user.agent" value="gecko1_8" /> -->
+ <set-property name="user.agent" value="safari" />
</module>
\ No newline at end of file
Deleted: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,49 +0,0 @@
-package cc.kune.core.client;
-
-public interface CoreEventBus {
-}
-// /**
-// * The Kune Core EventBus.
-// */
-// @Events(startView = CoreView.class, ginModules = { CoreGinModule.class,
-// CommonGinModule.class })
-// @Debug(logLevel = LogLevel.DETAILED)
-// public interface CoreEventBus extends EventBus {
-//
-// @Event(handlers = UserNotifierPresenter.class)
-// public void alert(String title, String message);
-//
-// @Event(handlers = UserNotifierPresenter.class)
-// public void confirmationAsk(ConfirmationAsk<?> confirmation);
-//
-// @Event(handlers = CookiesManager.class)
-// public void doNothing();
-//
-// @Event
-// // FIXME (nobody do nothing with this)
-// public void gotoToken(String token);
-//
-// @Event(handlers = UserNotifierPresenter.class)
-// public void hideSpin();
-//
-// @Event
-// // FIXME (nobody do nothing with this)
-// public void i18nReady();
-//
-// @Event(handlers = UserNotifierPresenter.class)
-// public void notify(NotifyLevel level, String message);
-//
-// @Event(handlers = UserNotifierPresenter.class)
-// public void showSpin(String message);
-//
-// @Event
-// // FIXME (nobody do nothing with this)
-// public void showSpinLoading();
-//
-// /**
-// * Application start event
-// */
-// @Start
-// @Event(handlers = { CorePresenter.class })
-// void start();
-
Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -61,7 +61,7 @@
bind(Session.class).to(SessionDefault.class).in(Singleton.class);
bind(I18nTranslationService.class).to(I18nUITranslationService.class).in(Singleton.class);
bind(ErrorHandler.class).in(Singleton.class);
- bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class);
+ // bind(ContentProvider.class).to(ContentProviderDefault.class).in(Singleton.class);
bind(HistoryWrapper.class).to(HistoryWrapperDefault.class).in(Singleton.class);
// bind(StateManager.class).to(StateManagerDefault.class).in(Singleton.class);
}
Modified: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -14,16 +14,16 @@
@GinModules({ CoreGinModule.class })
public interface CoreGinjector extends Ginjector {
- AsyncProvider<CorePresenter> getCorePresenter();
+ AsyncProvider<CorePresenter> getCorePresenter();
- EventBus getEventBus();
+ EventBus getEventBus();
- PlaceManager getPlaceManager();
+ PlaceManager getPlaceManager();
- ProxyFailureHandler getProxyFailureHandler();
+ ProxyFailureHandler getProxyFailureHandler();
- AsyncProvider<SpinerPresenter> getSpinerPresenter();
+ AsyncProvider<SpinerPresenter> getSpinerPresenter();
- AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter();
+ AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter();
}
\ No newline at end of file
Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -39,7 +39,6 @@
*/
public void onModuleLoadCont() {
DelayedBindRegistry.bind(ginjector);
-
ginjector.getPlaceManager().revealCurrentPlace();
}
Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,8 +21,9 @@
import org.ourproject.common.client.notify.NotifyLevel;
+import cc.kune.core.client.notify.AlertEvent;
import cc.kune.core.client.notify.SpinerPresenter;
-import cc.kune.core.client.notify.UserNotifierPresenter;
+import cc.kune.core.client.notify.UserNotifyEvent;
import cc.kune.core.client.state.Session;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -32,30 +33,31 @@
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
import com.google.inject.Inject;
+import com.gwtplatform.mvp.client.EventBus;
import com.gwtplatform.mvp.client.proxy.PlaceManager;
public class ErrorHandler {
private final Session session;
private final I18nTranslationService i18n;
private final Event0 onSessionExpired;
- private final UserNotifierPresenter notifier;
private final SpinerPresenter spiner;
private final PlaceManager placeManager;
+ private final EventBus eventBus;
@Inject
- public ErrorHandler(final Session session, final I18nTranslationService i18n, final UserNotifierPresenter notifier,
- final SpinerPresenter spiner, final PlaceManager placeManager) {
+ public ErrorHandler(final Session session, final I18nTranslationService i18n,
+ final SpinerPresenter spiner, final PlaceManager placeManager, EventBus eventBus) {
this.session = session;
this.i18n = i18n;
- this.notifier = notifier;
this.spiner = spiner;
this.placeManager = placeManager;
+ this.eventBus = eventBus;
this.onSessionExpired = new Event0("onSessionExpired");
}
public void doSessionExpired() {
onSessionExpired.fire();
- notifier.notify(NotifyLevel.info, "Your session has expired. Please log in again.");
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, "Your session has expired. Please log in again."));
}
public void onSessionExpired(final Listener0 listener) {
@@ -66,7 +68,7 @@
spiner.fade();
if (caught instanceof AccessViolationException) {
logException(caught);
- notifier.notify(NotifyLevel.error, i18n.t("You do not have rights to perform that action"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("You do not have rights to perform that action")));
} else if (caught instanceof SessionExpiredException) {
logException(caught);
doSessionExpired();
@@ -75,40 +77,40 @@
if (session.isLogged()) {
doSessionExpired();
} else {
- notifier.notify(NotifyLevel.important, i18n.t("Please sign in or register to collaborate"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.important, i18n.t("Please sign in or register to collaborate")));
}
} else if (caught instanceof GroupNotFoundException) {
logException(caught);
- notifier.notify(NotifyLevel.veryImportant, i18n.t("Group not found"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.veryImportant, i18n.t("Group not found")));
goHome();
} else if (caught instanceof IncompatibleRemoteServiceException) {
- notifier.notify(NotifyLevel.error,
- i18n.t("Your browser is outdated with the server software. Please reload this page."));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error,
+ i18n.t("Your browser is outdated with the server software. Please reload this page.")));
} else if (caught instanceof ContentNotFoundException) {
logException(caught);
- notifier.notify(NotifyLevel.veryImportant, i18n.t("Content not found"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.veryImportant, i18n.t("Content not found")));
goHome();
} else if (caught instanceof ContentNotPermittedException) {
logException(caught);
- notifier.notify(NotifyLevel.error, i18n.t("Action not permitted in this location"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Action not permitted in this location")));
goHome();
} else if (caught instanceof ContainerNotPermittedException) {
logException(caught);
- notifier.notify(NotifyLevel.error, i18n.t("Action not permitted in this location"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Action not permitted in this location")));
goHome();
} else if (caught instanceof LastAdminInGroupException) {
logException(caught);
- notifier.alert(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group."
- + " Look for someone to substitute you appropriately as admin before leaving this group."));
+ eventBus.fireEvent(new AlertEvent(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group."
+ + " Look for someone to substitute you appropriately as admin before leaving this group.")));
} else if (caught instanceof AlreadyGroupMemberException) {
logException(caught);
- notifier.notify(NotifyLevel.error, i18n.t("This group is already a group member"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This group is already a group member")));
} else if (caught instanceof AlreadyUserMemberException) {
logException(caught);
- notifier.notify(NotifyLevel.error, i18n.t("This user is already a group member"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This user is already a group member")));
} else {
logException(caught, true);
- notifier.notify(NotifyLevel.error, i18n.t("Error performing operation"));
+ eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Error performing operation")));
GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught);
}
}
Modified: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -35,6 +35,7 @@
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.inject.Inject;
+import com.gwtplatform.mvp.client.EventBus;
public class I18nUITranslationService extends I18nTranslationService {
private HashMap<String, String> lexicon;
@@ -44,25 +45,29 @@
private final Session session;
@Inject
- public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService) {
+ public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService, final EventBus eventBus) {
this.session = session;
this.i18nService = i18nService;
final Location loc = WindowUtils.getLocation();
final String locale = loc.getParameter("locale");
i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() {
+ @Override
public void onFailure(final Throwable caught) {
Log.error("Workspace adaptation to your language failed: " + caught.getMessage());
}
+ @Override
public void onSuccess(final I18nLanguageDTO result) {
currentLang = result;
currentLanguageCode = currentLang.getCode();
session.setCurrentLanguage(currentLang);
i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() {
+ @Override
public void onFailure(final Throwable caught) {
Log.error("Workspace adaptation to your language failed:" + caught.getMessage());
}
+ @Override
public void onSuccess(final HashMap<String, String> result) {
lexicon = result;
session.setCurrentLanguage(currentLang);
@@ -152,9 +157,11 @@
if (session.isLogged()) {
i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text,
new AsyncCallback<String>() {
+ @Override
public void onFailure(final Throwable caught) {
}
+ @Override
public void onSuccess(final String result) {
}
});
Added: trunk/src/main/java/cc/kune/core/client/notify/Alert.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/Alert.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/notify/Alert.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -0,0 +1,12 @@
+package cc.kune.core.client.notify;
+
+import com.gwtplatform.annotation.GenEvent;
+import com.gwtplatform.annotation.Order;
+
+ at GenEvent
+public class Alert {
+ @Order(1)
+ String title;
+ @Order(2)
+ String message;
+}
Property changes on: trunk/src/main/java/cc/kune/core/client/notify/Alert.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -4,12 +4,15 @@
import com.gwtplatform.mvp.client.EventBus;
import com.gwtplatform.mvp.client.Presenter;
import com.gwtplatform.mvp.client.View;
-import com.gwtplatform.mvp.client.proxy.ProxyPlace;
+import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
+import com.gwtplatform.mvp.client.annotations.ProxyStandard;
+import com.gwtplatform.mvp.client.proxy.Proxy;
import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent;
public class SpinerPresenter extends Presenter<SpinerPresenter.SpinerView, SpinerPresenter.SpinerProxy> {
-
- public interface SpinerProxy extends ProxyPlace<SpinerPresenter> {
+
+ @ProxyCodeSplit
+ public interface SpinerProxy extends Proxy<SpinerPresenter> {
}
public interface SpinerView extends View {
Modified: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -3,47 +3,67 @@
import org.ourproject.common.client.notify.ConfirmationAsk;
import org.ourproject.common.client.notify.NotifyLevel;
+import cc.kune.core.client.notify.AlertEvent.AlertHandler;
import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierProxy;
import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierView;
+import cc.kune.core.client.notify.UserNotifyEvent.UserNotifyHandler;
import com.google.inject.Inject;
import com.gwtplatform.mvp.client.EventBus;
import com.gwtplatform.mvp.client.Presenter;
import com.gwtplatform.mvp.client.View;
-import com.gwtplatform.mvp.client.proxy.ProxyPlace;
+import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit;
+import com.gwtplatform.mvp.client.annotations.ProxyEvent;
+import com.gwtplatform.mvp.client.annotations.ProxyStandard;
+import com.gwtplatform.mvp.client.proxy.Proxy;
-public class UserNotifierPresenter extends Presenter<UserNotifierView, UserNotifierProxy> {
+public class UserNotifierPresenter extends
+ Presenter<UserNotifierView, UserNotifierProxy> {
+ @ProxyCodeSplit
+ public interface UserNotifierProxy extends
+ Proxy<UserNotifierPresenter> {
+ }
- public interface UserNotifierProxy extends ProxyPlace<UserNotifierPresenter> {
- }
+ public interface UserNotifierView extends View {
+ public void alert(String title, String message);
- public interface UserNotifierView extends View {
- public void alert(String title, String message);
+ public void confirmationAsk(ConfirmationAsk<?> ask);
- public void confirmationAsk(ConfirmationAsk<?> ask);
+ public void notify(NotifyLevel level, String message);
+ }
- public void notify(NotifyLevel level, String message);
- }
+ @Inject
+ public UserNotifierPresenter(final EventBus eventBus,
+ final UserNotifierView view, final UserNotifierProxy proxy) {
+ super(eventBus, view, proxy);
+ addRegisteredHandler(UserNotifyEvent.getType(),
+ new UserNotifyHandler() {
+ @Override
+ public void onUserNotify(UserNotifyEvent event) {
+ view.notify(event.getLevel(), event.getMessage());
+ }
+ });
+ addRegisteredHandler(AlertEvent.getType(), new AlertHandler() {
+ @Override
+ public void onAlert(AlertEvent event) {
+ view.alert(event.getTitle(), event.getMessage());
+ }
+ });
+ }
- @Inject
- public UserNotifierPresenter(final EventBus eventBus, final UserNotifierView view, final UserNotifierProxy proxy) {
- super(eventBus, view, proxy);
- }
+ @ProxyEvent
+ public void onUserNotify(UserNotifyEvent event) {
+ // FIXME test this
+ getView().notify(event.getLevel(), event.getMessage());
+ }
- public void notify(final NotifyLevel level, final String message) {
- getView().notify(level, message);
- }
+ @ProxyEvent
+ public void onAlert(AlertEvent event) {
+ getView().alert(event.getTitle(), event.getMessage());
+ };
- public void alert(final String title, final String message) {
- getView().alert(title, message);
- };
+ @Override
+ protected void revealInParent() {
+ }
- public void onConfirmationAsk(final ConfirmationAsk<?> ask) {
- getView().confirmationAsk(ask);
- }
-
- @Override
- protected void revealInParent() {
- }
-
}
\ No newline at end of file
Added: trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -0,0 +1,14 @@
+package cc.kune.core.client.notify;
+
+import org.ourproject.common.client.notify.NotifyLevel;
+
+import com.gwtplatform.annotation.GenEvent;
+import com.gwtplatform.annotation.Order;
+
+ at GenEvent
+public class UserNotify {
+ @Order(1)
+ NotifyLevel level;
+ @Order(2)
+ String message;
+}
\ No newline at end of file
Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotify.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,13 +25,13 @@
import cc.kune.core.shared.domain.ContentStatus;
import cc.kune.core.shared.domain.RateResult;
import cc.kune.core.shared.domain.TagCloudResult;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.CommentDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.I18nLanguageDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -24,13 +24,13 @@
import cc.kune.core.shared.domain.ContentStatus;
import cc.kune.core.shared.domain.RateResult;
import cc.kune.core.shared.domain.TagCloudResult;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.CommentDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.I18nLanguageDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,9 +22,9 @@
import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.shared.domain.AdmissionType;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,9 +21,9 @@
import cc.kune.core.shared.domain.AdmissionType;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,9 +20,9 @@
package cc.kune.core.client.rpcservices;
import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.SocialNetworkRequestResult;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,9 +20,9 @@
package cc.kune.core.client.rpcservices;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.SocialNetworkRequestResult;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.UserDTO;
import cc.kune.core.shared.dto.UserInfoDTO;
Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,7 +20,7 @@
package cc.kune.core.client.rpcservices;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.UserDTO;
import cc.kune.core.shared.dto.UserInfoDTO;
Modified: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,7 +1,7 @@
package cc.kune.core.client.state;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.StateAbstractDTO;
import com.calclab.suco.client.events.Event2;
@@ -9,15 +9,15 @@
import com.calclab.suco.client.events.Listener2;
public class AccessRightsClientManager {
- private AccessRightsDTO previousRights;
- private final Event2<AccessRightsDTO, AccessRightsDTO> onRightsChanged;
+ private AccessRights previousRights;
+ private final Event2<AccessRights, AccessRights> onRightsChanged;
public AccessRightsClientManager(final StateManager stateManager) {
this.previousRights = null;
- this.onRightsChanged = new Event2<AccessRightsDTO, AccessRightsDTO>("onRightsChanged");
+ this.onRightsChanged = new Event2<AccessRights , AccessRights >("onRightsChanged");
stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
public void onEvent(final StateAbstractDTO newState) {
- final AccessRightsDTO rights = newState.getGroupRights();
+ final AccessRights rights = newState.getGroupRights();
if (!rights.equals(previousRights)) {
onRightsChanged.fire(previousRights, rights);
previousRights = rights;
@@ -26,7 +26,7 @@
});
}
- public void onRightsChanged(final Listener2<AccessRightsDTO, AccessRightsDTO> listener) {
+ public void onRightsChanged(final Listener2<AccessRights, AccessRights> listener) {
onRightsChanged.add(listener);
}
}
Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,8 +20,8 @@
package cc.kune.core.client.state;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.AsyncCallback;
Modified: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,8 +23,8 @@
import cc.kune.core.client.notify.SpinerPresenter;
import cc.kune.core.client.rpcservices.ContentServiceAsync;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.inject.Inject;
Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -43,6 +43,7 @@
import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.I18nCountryDTO;
import cc.kune.core.shared.dto.I18nLanguageDTO;
import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
@@ -51,7 +52,6 @@
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.ToolSimpleDTO;
import cc.kune.core.shared.dto.UserInfoDTO;
import cc.kune.core.shared.dto.UserSimpleDTO;
Modified: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -26,6 +26,7 @@
import cc.kune.core.client.i18n.I18nReadyEvent;
import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
import cc.kune.core.client.rpcservices.UserServiceAsync;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.I18nCountryDTO;
import cc.kune.core.shared.dto.I18nLanguageDTO;
import cc.kune.core.shared.dto.I18nLanguageSimpleDTO;
@@ -34,7 +35,6 @@
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.ToolSimpleDTO;
import cc.kune.core.shared.dto.UserInfoDTO;
import cc.kune.core.shared.dto.UserSimpleDTO;
@@ -62,12 +62,12 @@
private final Event<UserInfoDTO> onUserSignIn;
private final Event0 onUserSignOut;
private final Provider<UserServiceAsync> userServiceProvider;
+ private final EventBus eventBus;
@Inject
- private static EventBus eventBus;
-
- @Inject
- public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) {
+ public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider,
+ EventBus eventBus) {
+ this.eventBus = eventBus;
this.userHash = cookieManager.getCurrentCookie();
this.userHash = userHash == null || userHash.equals("null") ? null : userHash;
this.userServiceProvider = userServiceProvider;
@@ -77,23 +77,28 @@
this.onUserSignOut = new Event0("onUserSignOut");
}
+ @Override
public void check(final AsyncCallbackSimple<Void> callback) {
Log.debug("Checking session (userhash: " + getUserHash() + ")");
userServiceProvider.get().onlyCheckSession(getUserHash(), callback);
}
+ @Override
public StateContainerDTO getContainerState() {
return (StateContainerDTO) currentState;
}
+ @Override
public StateContentDTO getContentState() {
return (StateContentDTO) currentState;
}
+ @Override
public List<I18nCountryDTO> getCountries() {
return initData.getCountries();
}
+ @Override
public Object[][] getCountriesArray() {
if (countriesArray == null) {
countriesArray = mapCountries();
@@ -101,70 +106,87 @@
return countriesArray;
}
+ @Override
public String getCurrentCCversion() {
return initData.getCurrentCCversion();
}
+ @Override
public String getCurrentGroupShortName() {
return currentState == null ? null : currentState.getStateToken().getGroup();
}
+ @Override
public I18nLanguageDTO getCurrentLanguage() {
return currentLanguage;
}
+ @Override
public StateAbstractDTO getCurrentState() {
return currentState;
}
+ @Override
public StateToken getCurrentStateToken() {
return currentState == null ? null : currentState.getStateToken();
}
+ @Override
public UserSimpleDTO getCurrentUser() {
return currentUserInfo == null ? null : currentUserInfo.getUser();
}
+ @Override
public UserInfoDTO getCurrentUserInfo() {
return currentUserInfo;
}
+ @Override
public LicenseDTO getDefLicense() {
return initData.getDefaultLicense();
}
+ @Override
public String getGalleryPermittedExtensions() {
return initData.getGalleryPermittedExtensions();
}
+ @Override
public Collection<ToolSimpleDTO> getGroupTools() {
return initData.getGroupTools();
}
+ @Override
public int getImgCropsize() {
return initData.getImgCropsize();
}
+ @Override
public int getImgIconsize() {
return initData.getImgIconsize();
}
+ @Override
public int getImgResizewidth() {
return initData.getImgResizewidth();
}
+ @Override
public int getImgThumbsize() {
return initData.getImgThumbsize();
}
+ @Override
public InitDataDTO getInitData() {
return initData;
}
+ @Override
public List<I18nLanguageSimpleDTO> getLanguages() {
return initData.getLanguages();
}
+ @Override
public Object[][] getLanguagesArray() {
if (languagesArray == null) {
languagesArray = mapLangs();
@@ -172,19 +194,23 @@
return languagesArray;
}
+ @Override
public List<LicenseDTO> getLicenses() {
return initData.getLicenses();
}
+ @Override
public boolean getShowDeletedContent() {
return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent();
}
+ @Override
public String getSiteUrl() {
final String baseURL = GWT.getModuleBaseURL();
return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName()));
}
+ @Override
public Object[][] getTimezones() {
if (timezonesArray == null) {
mapTimezones();
@@ -192,26 +218,32 @@
return timezonesArray;
}
+ @Override
public String getUserHash() {
return userHash;
}
+ @Override
public Collection<ToolSimpleDTO> getUserTools() {
return initData.getUserTools();
}
+ @Override
public boolean inSameToken(final StateToken token) {
return getCurrentStateToken().equals(token);
}
+ @Override
public boolean isCurrentStateAContent() {
return currentState instanceof StateContentDTO;
}
+ @Override
public boolean isCurrentStateAGroup() {
return currentState == null ? false : !currentState.getGroup().isPersonal();
}
+ @Override
public boolean isInCurrentUserSpace() {
if (!isLogged()) {
return false;
@@ -222,35 +254,43 @@
return false;
}
+ @Override
public boolean isLogged() {
return userHash != null;
}
+ @Override
public boolean isNotLogged() {
return !isLogged();
}
+ @Override
public void onInitDataReceived(final Listener<InitDataDTO> listener) {
onInitDataReceived.add(listener);
}
+ @Override
public void onUserSignIn(final Listener<UserInfoDTO> listener) {
onUserSignIn.add(listener);
}
+ @Override
public void onUserSignOut(final Listener0 listener) {
onUserSignOut.add(listener);
}
+ @Override
public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) {
this.currentLanguage = currentLanguage;
eventBus.fireEvent(new I18nReadyEvent());
}
+ @Override
public void setCurrentState(final StateAbstractDTO currentState) {
this.currentState = currentState;
}
+ @Override
public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) {
this.currentUserInfo = currentUserInfo;
if (currentUserInfo != null) {
@@ -260,17 +300,19 @@
}
}
+ @Override
public void setInitData(final InitDataDTO initData) {
this.initData = initData;
onInitDataReceived.fire(initData);
}
+ @Override
public void setUserHash(final String userHash) {
this.userHash = userHash;
}
private Object[][] mapCountries() {
- assert (initData != null);
+ assert initData != null;
final Object[][] objs = new Object[initData.getCountries().size()][1];
int i = 0;
for (final I18nCountryDTO country : initData.getCountries()) {
@@ -281,7 +323,7 @@
}
private Object[][] mapLangs() {
- assert (initData != null);
+ assert initData != null;
final Object[][] objs = new Object[initData.getLanguages().size()][1];
int i = 0;
for (final I18nLanguageSimpleDTO language : initData.getLanguages()) {
@@ -292,7 +334,7 @@
}
private void mapTimezones() {
- assert (initData != null);
+ assert initData != null;
timezonesArray = new Object[initData.getTimezones().length][1];
for (int i = 0; i < getTimezones().length; i++) {
final Object[] obj = new Object[] { initData.getTimezones()[i] };
Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,9 +21,9 @@
import cc.kune.core.client.actions.BeforeActionListener;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,9 +25,9 @@
import cc.kune.core.client.actions.BeforeActionListener;
import cc.kune.core.client.notify.SpinerPresenter;
import cc.kune.core.client.rpcservices.AsyncCallbackSimple;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.UserInfoDTO;
import com.allen_sauer.gwt.log.client.Log;
Modified: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,5 +1,7 @@
package cc.kune.core.client.ws;
+import cc.kune.core.client.notify.AlertEvent;
+import cc.kune.core.client.notify.UserNotifierPresenter;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.google.inject.Inject;
@@ -15,7 +17,7 @@
* The Class CorePresenter.
*/
public class CorePresenter extends Presenter<CorePresenter.CoreView, CorePresenter.CoreProxy> {
- @ProxyCodeSplit
+ @ProxyCodeSplit
@NameToken("home")
public interface CoreProxy extends ProxyPlace<CorePresenter> {
}
@@ -25,13 +27,13 @@
@Inject
public CorePresenter(final EventBus eventBus, final CoreView view, final CoreProxy proxy,
- final I18nTranslationService i18n) {
+ final I18nTranslationService i18n, UserNotifierPresenter userNotifier) {
super(eventBus, view, proxy);
}
@Override
protected void revealInParent() {
- RevealRootLayoutContentEvent.fire(eventBus, this);
+ RevealRootLayoutContentEvent.fire(getEventBus(), this);
}
}
Copied: trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java (from rev 1166, trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/shared/domain/AccessRol.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -0,0 +1,24 @@
+/*
+ *
+ * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.shared.domain;
+
+public enum AccessRol {
+ Administrator, Editor, Viewer
+}
Modified: trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,24 +19,8 @@
*/
package cc.kune.core.shared.domain;
-import java.util.List;
-
-
-import cc.kune.domain.Group;
-
import com.google.gwt.user.client.rpc.IsSerializable;
public enum GroupListMode implements IsSerializable {
NORMAL, NOBODY, EVERYONE;
-
- public boolean checkIfIncludes(final Group group, final List<Group> list) {
- switch (this) {
- case NOBODY:
- return false;
- case EVERYONE:
- return true;
- default:
- return list.contains(group);
- }
- }
}
Copied: trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java (from rev 1166, trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/shared/domain/utils/AccessRights.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -0,0 +1,101 @@
+/*
+ *
+ * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.shared.domain.utils;
+
+public class AccessRights {
+ boolean administrable;
+ boolean editable;
+ boolean visible;
+
+ public AccessRights() {
+ this(false, false, false);
+ }
+
+ public AccessRights(final boolean administrable, final boolean editable,
+ final boolean visible) {
+ this.administrable = administrable;
+ this.editable = editable;
+ this.visible = visible;
+ }
+
+ public boolean isAdministrable() {
+ return administrable;
+ }
+
+ public boolean isEditable() {
+ return editable;
+ }
+
+ public boolean isVisible() {
+ return visible;
+ }
+
+ public void setAdministrable(final boolean isAdministrable) {
+ this.administrable = isAdministrable;
+ }
+
+ public void setEditable(final boolean isEditable) {
+ this.editable = isEditable;
+ }
+
+ public void setVisible(final boolean isVisible) {
+ this.visible = isVisible;
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final AccessRights other = (AccessRights) obj;
+ if (administrable != other.administrable) {
+ return false;
+ }
+ if (editable != other.editable) {
+ return false;
+ }
+ if (visible != other.visible) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (administrable ? 1231 : 1237);
+ result = prime * result + (editable ? 1231 : 1237);
+ result = prime * result + (visible ? 1231 : 1237);
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return "AccessRights[a: " + administrable + ", e: " + editable
+ + ", v: " + visible + "]";
+ }
+}
Copied: trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java (from rev 1166, trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java)
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java (rev 0)
+++ trunk/src/main/java/cc/kune/core/shared/domain/utils/StateToken.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -0,0 +1,256 @@
+/*
+ *
+ * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
+ * This file is part of kune.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package cc.kune.core.shared.domain.utils;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+/**
+ * <pre>
+ * http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory
+ * http://en.wikipedia.org/wiki/Fragment_identifier
+ * http://www.w3.org/DesignIssues/Fragment.html
+ * </pre>
+ *
+ * <pre>
+ * When an agent (such as a Web browser) requests a resource from a Web server, the agent sends the URI to the server, but does not send the fragment.
+ * </pre>
+ *
+ */
+public class StateToken implements IsSerializable {
+ public static final String SEPARATOR = ".";
+ private static final String[] EMPTYA = new String[0];
+
+ private static String encode(final String group, final String tool, final String folder, final String document) {
+ String encoded = "";
+ if (group != null) {
+ encoded += group;
+ }
+ if (tool != null) {
+ encoded += SEPARATOR + tool;
+ }
+ if (folder != null) {
+ encoded += SEPARATOR + folder;
+ }
+ if (document != null) {
+ encoded += SEPARATOR + document;
+ }
+ return encoded;
+ }
+
+ private String group;
+ private String tool;
+ private String folder;
+ private String document;
+
+ private String encoded;
+
+ public StateToken() {
+ this(null, null, null, null);
+ }
+
+ public StateToken(final String encoded) {
+ parse(encoded);
+ }
+
+ public StateToken(final String group, final String tool) { // NO_UCD
+ this(group, tool, null, null);
+ }
+
+ public StateToken(final String group, final String tool, final Long folder) {
+ this(group, tool, folder == null ? null : folder.toString(), null);
+ }
+
+ public StateToken(final String group, final String tool, final String folder, final String document) {
+ this.group = group;
+ this.tool = tool;
+ this.folder = folder;
+ this.document = document;
+ resetEncoded();
+ }
+
+ public StateToken clearDocument() {
+ this.document = null;
+ resetEncoded();
+ return this;
+ }
+
+ public StateToken clearFolder() { // NO_UCD
+ this.folder = null;
+ resetEncoded();
+ return this;
+ }
+
+ public StateToken copy() {
+ return new StateToken(this.getEncoded());
+ }
+
+ @Override
+ public boolean equals(final Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final StateToken other = (StateToken) obj;
+ if (getEncoded() == null) {
+ if (other.getEncoded() != null) {
+ return false;
+ }
+ } else if (!getEncoded().equals(other.getEncoded())) {
+ return false;
+ }
+ return true;
+ }
+
+ public String getDocument() {
+ return document;
+ }
+
+ public String getEncoded() {
+ if (encoded == null) {
+ encoded = StateToken.encode(getGroup(), getTool(), getFolder(), getDocument());
+ }
+ return encoded;
+ }
+
+ public String getFolder() {
+ return folder;
+ }
+
+ public String getGroup() {
+ return group;
+ }
+
+ public String getTool() {
+ return tool;
+ }
+
+ public boolean hasAll() {
+ return getGroup() != null && getTool() != null && getFolder() != null && getDocument() != null;
+ }
+
+ public boolean hasGroup() {
+ return getGroup() != null;
+ }
+
+ public boolean hasGroupAndTool() {
+ return getGroup() != null && getTool() != null;
+ }
+
+ public boolean hasGroupToolAndFolder() {
+ return getGroup() != null && getTool() != null && getFolder() != null;
+ }
+
+ @Override
+ public int hashCode() {
+ return getEncoded().hashCode();
+ }
+
+ public boolean hasNothing() {
+ return getGroup() == null && getTool() == null && getFolder() == null && getDocument() == null;
+ }
+
+ public boolean hasSameContainer(final StateToken currentStateToken) {
+ boolean same = false;
+ if (copy().clearDocument().getEncoded().equals(currentStateToken.copy().clearDocument().getEncoded())) {
+ same = true;
+ }
+ return same;
+ }
+
+ public boolean isComplete() {
+ return getDocument() != null;
+ }
+
+ public StateToken setDocument(final Long document) {
+ this.document = document == null ? null : document.toString();
+ resetEncoded();
+ return this;
+ }
+
+ public StateToken setDocument(final String document) {
+ this.document = document;
+ resetEncoded();
+ return this;
+ }
+
+ public void setEncoded(final String encoded) {
+ parse(encoded);
+ }
+
+ public StateToken setFolder(final Long folder) {
+ this.folder = folder == null ? null : folder.toString();
+ resetEncoded();
+ return this;
+ }
+
+ public StateToken setFolder(final String folder) { // NO_UCD
+ this.folder = folder;
+ resetEncoded();
+ return this;
+ }
+
+ public StateToken setGroup(final String group) { // NO_UCD
+ this.group = group;
+ resetEncoded();
+ return this;
+ }
+
+ public StateToken setTool(final String tool) { // NO_UCD
+ this.tool = tool;
+ resetEncoded();
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getEncoded();
+ }
+
+ private String conditionalAssign(final int index, final String[] splitted) {
+ if (splitted.length > index) {
+ return splitted[index];
+ } else {
+ return null;
+ }
+ }
+
+ private void parse(final String encoded) {
+ String[] splitted;
+ if (encoded != null && encoded.length() > 0) {
+ splitted = encoded.split("\\.");
+ } else {
+ splitted = EMPTYA;
+ }
+ group = conditionalAssign(0, splitted);
+ tool = conditionalAssign(1, splitted);
+ folder = conditionalAssign(2, splitted);
+ document = conditionalAssign(3, splitted);
+ resetEncoded();
+ }
+
+ private void resetEncoded() {
+ encoded = null;
+ }
+}
Deleted: trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,101 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.shared.dto;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-public class AccessRightsDTO implements IsSerializable {
- private boolean administrable;
- private boolean editable;
- private boolean visible;
-
- public AccessRightsDTO() {
- this(false, false, false);
- }
-
- public AccessRightsDTO(final boolean isAdministrable, final boolean isEditable, final boolean isVisible) {
- this.administrable = isAdministrable;
- this.editable = isEditable;
- this.visible = isVisible;
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final AccessRightsDTO other = (AccessRightsDTO) obj;
- if (administrable != other.administrable) {
- return false;
- }
- if (editable != other.editable) {
- return false;
- }
- if (visible != other.visible) {
- return false;
- }
- return true;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (administrable ? 1231 : 1237);
- result = prime * result + (editable ? 1231 : 1237);
- result = prime * result + (visible ? 1231 : 1237);
- return result;
- }
-
- public boolean isAdministrable() {
- return administrable;
- }
-
- public boolean isEditable() {
- return editable;
- }
-
- public boolean isVisible() {
- return visible;
- }
-
- public void setAdministrable(final boolean administrable) {
- this.administrable = administrable;
- }
-
- public void setEditable(final boolean editable) {
- this.editable = editable;
- }
-
- public void setVisible(final boolean visible) {
- this.visible = visible;
- }
-
- @Override
- public String toString() {
- return "AccessRightsDTO[a: " + administrable + ", e: " + editable + ", v: " + visible + "]";
- }
-}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,6 +21,8 @@
import java.util.List;
+import cc.kune.core.shared.domain.utils.StateToken;
+
import com.google.gwt.user.client.rpc.IsSerializable;
public class ContainerDTO implements IsSerializable {
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,6 +19,8 @@
*/
package cc.kune.core.shared.dto;
+import cc.kune.core.shared.domain.utils.StateToken;
+
import com.google.gwt.user.client.rpc.IsSerializable;
/**
Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,6 +20,8 @@
package cc.kune.core.shared.dto;
import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.google.gwt.user.client.rpc.IsSerializable;
@@ -30,7 +32,7 @@
private String typeId;
private StateToken stateToken;
private ContentStatus status;
- private AccessRightsDTO rights;
+ private AccessRights rights;
private BasicMimeTypeDTO mimeType;
public Long getId() {
@@ -41,7 +43,7 @@
return mimeType;
}
- public AccessRightsDTO getRights() {
+ public AccessRights getRights() {
return rights;
}
@@ -69,7 +71,7 @@
this.mimeType = mimeType;
}
- public void setRights(final AccessRightsDTO rights) {
+ public void setRights(final AccessRights rights) {
this.rights = rights;
}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,6 +20,7 @@
package cc.kune.core.shared.dto;
import cc.kune.core.shared.domain.AdmissionType;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.google.gwt.user.client.rpc.IsSerializable;
Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,6 +21,7 @@
import cc.kune.core.shared.domain.SocialNetworkVisibility;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
+import cc.kune.core.shared.domain.utils.AccessRights;
import com.google.gwt.user.client.rpc.IsSerializable;
@@ -31,7 +32,7 @@
private ParticipationDataDTO userParticipation;
private UserBuddiesVisibility userBuddiesVisibility;
private UserBuddiesDataDTO userBuddies;
- private AccessRightsDTO groupRights;
+ private AccessRights groupRights;
private boolean isBuddiesVisible;
private boolean isMembersVisible;
@@ -42,7 +43,7 @@
public SocialNetworkDataDTO(final SocialNetworkVisibility socialNetworkVisibility,
final SocialNetworkDTO groupMembers, final ParticipationDataDTO userParticipation,
final UserBuddiesVisibility userBuddiesVisibility, final UserBuddiesDataDTO userBuddies,
- final AccessRightsDTO groupRights, final boolean isBuddiesVisible, final boolean isMembersVisible) {
+ final AccessRights groupRights, final boolean isBuddiesVisible, final boolean isMembersVisible) {
this.socialNetworkVisibility = socialNetworkVisibility;
this.groupMembers = groupMembers;
this.userParticipation = userParticipation;
@@ -57,7 +58,7 @@
return groupMembers;
}
- public AccessRightsDTO getGroupRights() {
+ public AccessRights getGroupRights() {
return groupRights;
}
@@ -101,7 +102,7 @@
this.groupMembers = groupMembers;
}
- public void setGroupRights(final AccessRightsDTO groupRights) {
+ public void setGroupRights(final AccessRights groupRights) {
this.groupRights = groupRights;
}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,6 +21,9 @@
import java.util.List;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
+
import com.google.gwt.user.client.rpc.IsSerializable;
public abstract class StateAbstractDTO implements IsSerializable {
@@ -46,7 +49,7 @@
return socialNetworkData.getGroupMembers();
}
- public AccessRightsDTO getGroupRights() {
+ public AccessRights getGroupRights() {
return socialNetworkData.getGroupRights();
}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,6 +20,7 @@
package cc.kune.core.shared.dto;
import cc.kune.core.shared.domain.TagCloudResult;
+import cc.kune.core.shared.domain.utils.AccessRights;
import com.google.gwt.user.client.rpc.IsSerializable;
@@ -30,7 +31,7 @@
private String toolName;
private ContainerDTO container;
private ContainerDTO rootContainer;
- private AccessRightsDTO containerRights;
+ private AccessRights containerRights;
private LicenseDTO license;
private TagCloudResult tagCloudResult;
private AccessListsDTO accessLists;
@@ -46,7 +47,7 @@
return container;
}
- public AccessRightsDTO getContainerRights() {
+ public AccessRights getContainerRights() {
return containerRights;
}
@@ -86,7 +87,7 @@
this.container = container;
}
- public void setContainerRights(final AccessRightsDTO containerRights) {
+ public void setContainerRights(final AccessRights containerRights) {
this.containerRights = containerRights;
}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -24,6 +24,7 @@
import cc.kune.core.shared.domain.ContentStatus;
import cc.kune.core.shared.domain.RateResult;
+import cc.kune.core.shared.domain.utils.AccessRights;
import com.google.gwt.user.client.rpc.IsSerializable;
@@ -32,7 +33,7 @@
private String documentId;
private int version;
private String content;
- private AccessRightsDTO contentRights;
+ private AccessRights contentRights;
private ContentStatus status;
private Double rate;
private Integer rateByUsers;
@@ -53,7 +54,7 @@
return content;
}
- public AccessRightsDTO getContentRights() {
+ public AccessRights getContentRights() {
return contentRights;
}
@@ -101,7 +102,7 @@
this.content = content;
}
- public void setContentRights(final AccessRightsDTO contentRights) {
+ public void setContentRights(final AccessRights contentRights) {
this.contentRights = contentRights;
}
Deleted: trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,256 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package cc.kune.core.shared.dto;
-
-import com.google.gwt.user.client.rpc.IsSerializable;
-
-/**
- * <pre>
- * http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory
- * http://en.wikipedia.org/wiki/Fragment_identifier
- * http://www.w3.org/DesignIssues/Fragment.html
- * </pre>
- *
- * <pre>
- * When an agent (such as a Web browser) requests a resource from a Web server, the agent sends the URI to the server, but does not send the fragment.
- * </pre>
- *
- */
-public class StateToken implements IsSerializable {
- public static final String SEPARATOR = ".";
- private static final String[] EMPTYA = new String[0];
-
- private static String encode(final String group, final String tool, final String folder, final String document) {
- String encoded = "";
- if (group != null) {
- encoded += group;
- }
- if (tool != null) {
- encoded += SEPARATOR + tool;
- }
- if (folder != null) {
- encoded += SEPARATOR + folder;
- }
- if (document != null) {
- encoded += SEPARATOR + document;
- }
- return encoded;
- }
-
- private String group;
- private String tool;
- private String folder;
- private String document;
-
- private String encoded;
-
- public StateToken() {
- this(null, null, null, null);
- }
-
- public StateToken(final String encoded) {
- parse(encoded);
- }
-
- public StateToken(final String group, final String tool) { // NO_UCD
- this(group, tool, null, null);
- }
-
- public StateToken(final String group, final String tool, final Long folder) {
- this(group, tool, folder == null ? null : folder.toString(), null);
- }
-
- public StateToken(final String group, final String tool, final String folder, final String document) {
- this.group = group;
- this.tool = tool;
- this.folder = folder;
- this.document = document;
- resetEncoded();
- }
-
- public StateToken clearDocument() {
- this.document = null;
- resetEncoded();
- return this;
- }
-
- public StateToken clearFolder() { // NO_UCD
- this.folder = null;
- resetEncoded();
- return this;
- }
-
- public StateToken copy() {
- return new StateToken(this.getEncoded());
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final StateToken other = (StateToken) obj;
- if (getEncoded() == null) {
- if (other.getEncoded() != null) {
- return false;
- }
- } else if (!getEncoded().equals(other.getEncoded())) {
- return false;
- }
- return true;
- }
-
- public String getDocument() {
- return document;
- }
-
- public String getEncoded() {
- if (encoded == null) {
- encoded = StateToken.encode(getGroup(), getTool(), getFolder(), getDocument());
- }
- return encoded;
- }
-
- public String getFolder() {
- return folder;
- }
-
- public String getGroup() {
- return group;
- }
-
- public String getTool() {
- return tool;
- }
-
- public boolean hasAll() {
- return getGroup() != null && getTool() != null && getFolder() != null && getDocument() != null;
- }
-
- public boolean hasGroup() {
- return getGroup() != null;
- }
-
- public boolean hasGroupAndTool() {
- return getGroup() != null && getTool() != null;
- }
-
- public boolean hasGroupToolAndFolder() {
- return getGroup() != null && getTool() != null && getFolder() != null;
- }
-
- @Override
- public int hashCode() {
- return getEncoded().hashCode();
- }
-
- public boolean hasNothing() {
- return getGroup() == null && getTool() == null && getFolder() == null && getDocument() == null;
- }
-
- public boolean hasSameContainer(final StateToken currentStateToken) {
- boolean same = false;
- if (copy().clearDocument().getEncoded().equals(currentStateToken.copy().clearDocument().getEncoded())) {
- same = true;
- }
- return same;
- }
-
- public boolean isComplete() {
- return getDocument() != null;
- }
-
- public StateToken setDocument(final Long document) {
- this.document = document == null ? null : document.toString();
- resetEncoded();
- return this;
- }
-
- public StateToken setDocument(final String document) {
- this.document = document;
- resetEncoded();
- return this;
- }
-
- public void setEncoded(final String encoded) {
- parse(encoded);
- }
-
- public StateToken setFolder(final Long folder) {
- this.folder = folder == null ? null : folder.toString();
- resetEncoded();
- return this;
- }
-
- public StateToken setFolder(final String folder) { // NO_UCD
- this.folder = folder;
- resetEncoded();
- return this;
- }
-
- public StateToken setGroup(final String group) { // NO_UCD
- this.group = group;
- resetEncoded();
- return this;
- }
-
- public StateToken setTool(final String tool) { // NO_UCD
- this.tool = tool;
- resetEncoded();
- return this;
- }
-
- @Override
- public String toString() {
- return getEncoded();
- }
-
- private String conditionalAssign(final int index, final String[] splitted) {
- if (splitted.length > index) {
- return splitted[index];
- } else {
- return null;
- }
- }
-
- private void parse(final String encoded) {
- String[] splitted;
- if (encoded != null && encoded.length() > 0) {
- splitted = encoded.split("\\.");
- } else {
- splitted = EMPTYA;
- }
- group = conditionalAssign(0, splitted);
- tool = conditionalAssign(1, splitted);
- folder = conditionalAssign(2, splitted);
- document = conditionalAssign(3, splitted);
- resetEncoded();
- }
-
- private void resetEncoded() {
- encoded = null;
- }
-}
Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,6 +1,7 @@
package cc.kune.core.shared.dto;
import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.domain.utils.StateToken;
public class StateTokenUtils {
Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java
===================================================================
--- trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,6 +19,8 @@
*/
package cc.kune.core.shared.dto;
+import cc.kune.core.shared.domain.utils.StateToken;
+
import com.google.gwt.user.client.rpc.IsSerializable;
public class UserSimpleDTO implements IsSerializable {
Modified: trunk/src/main/java/cc/kune/domain/AccessLists.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/AccessLists.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/AccessLists.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -27,8 +27,9 @@
import javax.persistence.Table;
import org.hibernate.search.annotations.DocumentId;
-import org.ourproject.kune.platf.server.access.AccessRol;
+import cc.kune.core.shared.domain.AccessRol;
+
@Entity
@Table(name = "access_lists")
public class AccessLists {
Modified: trunk/src/main/java/cc/kune/domain/Container.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/Container.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/Container.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -49,7 +49,7 @@
import org.hibernate.search.annotations.IndexedEmbedded;
import org.hibernate.search.annotations.Store;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.utils.HasId;
import cc.kune.domain.utils.HasStateToken;
Modified: trunk/src/main/java/cc/kune/domain/Content.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/Content.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/Content.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -53,7 +53,7 @@
import org.hibernate.search.annotations.IndexedEmbedded;
import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.utils.HasStateToken;
import com.google.inject.name.Named;
Modified: trunk/src/main/java/cc/kune/domain/Group.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/Group.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/Group.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -47,8 +47,8 @@
import org.hibernate.validator.constraints.Length;
import cc.kune.core.shared.domain.AdmissionType;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupType;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.domain.utils.HasId;
import com.google.inject.name.Named;
Modified: trunk/src/main/java/cc/kune/domain/GroupList.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/GroupList.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/GroupList.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -74,6 +74,17 @@
}
}
+ public boolean checkIfIncludes(final Group group, final List<Group> list, final GroupListMode mode) {
+ switch (mode) {
+ case NOBODY:
+ return false;
+ case EVERYONE:
+ return true;
+ default:
+ return list.contains(group);
+ }
+ }
+
public ArrayList<Group> duplicate() {
return new ArrayList<Group>(list);
}
@@ -91,7 +102,7 @@
}
public boolean includes(final Group group) {
- return mode.checkIfIncludes(group, this.list);
+ return checkIfIncludes(group, this.list, mode);
}
public boolean isEmpty() {
Modified: trunk/src/main/java/cc/kune/domain/User.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/User.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/User.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -46,7 +46,7 @@
import org.hibernate.validator.constraints.Length;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.utils.HasId;
import com.google.inject.name.Named;
Modified: trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,7 +19,7 @@
*/
package cc.kune.domain.utils;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface HasStateToken {
Modified: trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,12 +19,13 @@
*/
package cc.kune.domain.utils;
-import org.ourproject.kune.platf.server.access.AccessRights;
+
import org.ourproject.kune.platf.server.sn.ParticipationData;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.SocialNetwork;
public class SocialNetworkData {
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -28,8 +28,8 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -35,8 +35,8 @@
import cc.kune.core.client.i18n.I18nUITranslationService;
import cc.kune.core.client.state.Session;
import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -30,8 +30,8 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
import cc.kune.core.client.utils.TextUtils;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -28,7 +28,7 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,7 +25,7 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.google.gwt.core.client.Scheduler;
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -29,10 +29,10 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContainerDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.workspace.client.cnt.AbstractContentView;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface GalleryFolderContentView extends AbstractContentView {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,9 +21,8 @@
import java.util.HashMap;
+import cc.kune.core.shared.domain.utils.AccessRights;
-import cc.kune.core.shared.dto.AccessRightsDTO;
-
import com.allen_sauer.gwt.log.client.Log;
public class ActionRegistry<T> {
@@ -40,7 +39,7 @@
}
public void addAction(final ActionDescriptor<T> action, final String... typeIds) {
- assert (action != null);
+ assert action != null;
for (final String typeId : typeIds) {
String text = action.getText();
Log.debug("Registering action " + (text == null ? "with icon" : "'" + text + "'") + " for " + typeId);
@@ -49,13 +48,13 @@
}
}
- public ActionItemCollection<T> getCurrentActions(final T item, final boolean isLogged,
- final AccessRightsDTO rights, final boolean toolbarItems) {
+ public ActionItemCollection<T> getCurrentActions(final T item, final boolean isLogged, final AccessRights rights,
+ final boolean toolbarItems) {
return getCurrentActions(item, GENERIC, isLogged, rights, toolbarItems);
}
public ActionItemCollection<T> getCurrentActions(final T item, final String typeId, final boolean isLogged,
- final AccessRightsDTO rights, final boolean toolbarItems) {
+ final AccessRights rights, final boolean toolbarItems) {
final ActionItemCollection<T> collection = new ActionItemCollection<T>();
for (final ActionDescriptor<T> action : getActions(typeId)) {
@@ -98,7 +97,7 @@
return actionColl;
}
- private boolean mustAdd(final boolean isLogged, final AccessRightsDTO rights, final ActionDescriptor<T> action) {
+ private boolean mustAdd(final boolean isLogged, final AccessRights rights, final ActionDescriptor<T> action) {
if (action.mustBeAuthenticated()) {
if (!isLogged) {
return false;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,7 +25,7 @@
import org.ourproject.kune.platf.client.utils.UrlParam;
import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.DOM;
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -4,7 +4,7 @@
import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition;
import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class MediaUtils {
Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRights.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,65 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.ourproject.kune.platf.server.access;
-
-public class AccessRights {
- boolean administrable;
- boolean editable;
- boolean visible;
-
- public AccessRights() {
- this(false, false, false);
- }
-
- public AccessRights(final boolean administrable, final boolean editable, final boolean visible) {
- this.administrable = administrable;
- this.editable = editable;
- this.visible = visible;
- }
-
- public boolean isAdministrable() {
- return administrable;
- }
-
- public boolean isEditable() {
- return editable;
- }
-
- public boolean isVisible() {
- return visible;
- }
-
- public void setAdministrable(final boolean isAdministrable) {
- this.administrable = isAdministrable;
- }
-
- public void setEditable(final boolean isEditable) {
- this.editable = isEditable;
- }
-
- public void setVisible(final boolean isVisible) {
- this.visible = isVisible;
- }
-
- @Override
- public String toString() {
- return "AccessRights[a: " + administrable + ", e: " + editable + ", v: " + visible + "]";
- }
-}
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,6 +19,7 @@
*/
package org.ourproject.kune.platf.server.access;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.AccessLists;
import cc.kune.domain.User;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,6 +23,8 @@
import java.util.HashSet;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.AccessLists;
import cc.kune.domain.Group;
import cc.kune.domain.GroupList;
Deleted: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRol.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,24 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2009 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.ourproject.kune.platf.server.access;
-
-public enum AccessRol {
- Administrator, Editor, Viewer
-}
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,6 +21,7 @@
import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.domain.AccessRol;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
import cc.kune.domain.User;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,6 +22,8 @@
import cc.kune.core.client.errors.AccessViolationException;
import cc.kune.core.client.errors.DefaultException;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.AccessLists;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import cc.kune.core.client.errors.DefaultException;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.Comment;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -33,7 +33,7 @@
import cc.kune.core.client.errors.GroupNotFoundException;
import cc.kune.core.client.errors.NoDefaultContentException;
import cc.kune.core.client.errors.ToolNotFoundException;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.Comment;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/Authorizated.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,8 +22,9 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import org.ourproject.kune.platf.server.access.AccessRol;
+import cc.kune.core.shared.domain.AccessRol;
+
import com.google.inject.BindingAnnotation;
/**
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -24,15 +24,15 @@
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
import org.ourproject.kune.platf.server.UserSession;
-import org.ourproject.kune.platf.server.access.AccessRights;
import org.ourproject.kune.platf.server.access.AccessRightsService;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.access.AccessService;
import org.ourproject.kune.platf.server.content.ContentUtils;
import org.ourproject.kune.platf.server.manager.GroupManager;
import cc.kune.core.client.errors.AccessViolationException;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
import cc.kune.domain.Group;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,6 +19,7 @@
*/
package org.ourproject.kune.platf.server.manager;
+
import org.ourproject.kune.platf.server.sn.ParticipationData;
import cc.kune.core.client.errors.AccessViolationException;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -30,7 +30,7 @@
import org.ourproject.kune.platf.client.ui.download.FileConstants;
import org.ourproject.kune.platf.server.manager.GroupManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.Group;
import com.google.inject.Inject;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -30,13 +30,13 @@
import org.apache.commons.fileupload.FileItem;
import org.ourproject.kune.platf.client.ui.download.FileConstants;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
import org.ourproject.kune.platf.server.auth.Authenticated;
import org.ourproject.kune.platf.server.auth.Authorizated;
import org.ourproject.kune.platf.server.manager.GroupManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.domain.BasicMimeType;
import cc.kune.domain.Group;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -33,7 +33,6 @@
import org.apache.commons.logging.LogFactory;
import org.ourproject.kune.platf.client.ui.download.FileConstants;
import org.ourproject.kune.platf.client.ui.download.ImageSize;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
import org.ourproject.kune.platf.server.auth.Authenticated;
import org.ourproject.kune.platf.server.auth.Authorizated;
@@ -42,7 +41,8 @@
import org.ourproject.kune.platf.server.properties.KuneProperties;
import cc.kune.core.client.errors.ContentNotFoundException;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.BasicMimeType;
import cc.kune.domain.Content;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -28,7 +28,6 @@
import org.apache.commons.fileupload.FileItem;
import org.ourproject.kune.platf.client.ui.download.ImageSize;
import org.ourproject.kune.platf.server.UserSession;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.access.AccessService;
import org.ourproject.kune.platf.server.auth.ActionLevel;
import org.ourproject.kune.platf.server.auth.Authenticated;
@@ -39,7 +38,8 @@
import org.ourproject.kune.platf.server.properties.KuneProperties;
import org.ourproject.kune.platf.server.utils.StringW;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import cc.kune.domain.BasicMimeType;
import cc.kune.domain.Container;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -40,7 +40,7 @@
import org.ourproject.kune.platf.client.ui.download.FileConstants;
import org.ourproject.kune.platf.server.properties.KuneProperties;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.google.inject.Inject;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -24,7 +24,7 @@
import java.io.IOException;
import java.io.InputStream;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class FileUtils {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -24,7 +24,6 @@
import javax.persistence.EntityManager;
import org.ourproject.kune.platf.server.ServerException;
-import org.ourproject.kune.platf.server.access.AccessRights;
import org.ourproject.kune.platf.server.access.AccessRightsService;
import org.ourproject.kune.platf.server.manager.SocialNetworkManager;
import org.ourproject.kune.platf.server.manager.UserManager;
@@ -41,6 +40,7 @@
import cc.kune.core.shared.domain.GroupListMode;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.GroupType;
import cc.kune.core.shared.dto.SocialNetworkRequestResult;
import cc.kune.domain.Group;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -28,7 +28,6 @@
import org.ourproject.kune.chat.server.managers.XmppManager;
import org.ourproject.kune.platf.server.UserSession;
import org.ourproject.kune.platf.server.access.AccessRightsService;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.access.AccessService;
import org.ourproject.kune.platf.server.access.FinderService;
import org.ourproject.kune.platf.server.auth.ActionLevel;
@@ -53,10 +52,12 @@
import cc.kune.core.client.errors.NoDefaultContentException;
import cc.kune.core.client.errors.ToolNotFoundException;
import cc.kune.core.client.rpcservices.ContentService;
+import cc.kune.core.shared.domain.AccessRol;
import cc.kune.core.shared.domain.ContentStatus;
import cc.kune.core.shared.domain.RateResult;
import cc.kune.core.shared.domain.TagCloudResult;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.CommentDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.I18nLanguageDTO;
@@ -64,7 +65,6 @@
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
import cc.kune.core.shared.dto.StateNoContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.domain.AccessLists;
import cc.kune.domain.Comment;
import cc.kune.domain.Container;
@@ -116,6 +116,7 @@
this.mapper = mapper;
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -126,6 +127,7 @@
contentManager.addAuthor(user, contentId, authorShortName);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Viewer)
@Transactional(type = TransactionType.READ_WRITE)
@@ -137,6 +139,7 @@
return mapper.map(comment, CommentDTO.class);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Viewer)
@Transactional(type = TransactionType.READ_WRITE)
@@ -148,6 +151,7 @@
return mapper.map(comment, CommentDTO.class);
}
+ @Override
@Authenticated
@Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -157,6 +161,7 @@
return createContent(parentToken, title, typeId, body);
}
+ @Override
@Authenticated
@Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -168,6 +173,7 @@
return getState(user, container);
}
+ @Override
@Authenticated
@Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor)
@Transactional(type = TransactionType.READ_WRITE)
@@ -195,6 +201,7 @@
}
}
+ @Override
@Authenticated
@Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -203,6 +210,7 @@
return createContent(parentToken, "Wave embeded test", typeId, waveId);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Administrator)
@Transactional(type = TransactionType.READ_WRITE)
@@ -211,6 +219,7 @@
return getState(getCurrentUser(), contentManager.setStatus(contentId, ContentStatus.inTheDustbin));
}
+ @Override
@Authenticated(mandatory = false)
@Transactional(type = TransactionType.READ_ONLY)
public StateAbstractDTO getContent(final String userHash, final StateToken token) throws DefaultException {
@@ -237,6 +246,7 @@
}
}
+ @Override
@Authenticated(mandatory = false)
@Authorizated(accessRolRequired = AccessRol.Viewer)
@Transactional(type = TransactionType.READ_ONLY)
@@ -245,6 +255,7 @@
return getSummaryTags(group);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Viewer)
@Transactional(type = TransactionType.READ_WRITE)
@@ -256,6 +267,7 @@
return mapper.map(comment, CommentDTO.class);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Viewer)
@Transactional(type = TransactionType.READ_WRITE)
@@ -271,6 +283,7 @@
}
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -281,6 +294,7 @@
contentManager.removeAuthor(user, contentId, authorShortName);
}
+ @Override
@Authenticated
@Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -290,6 +304,7 @@
return getContent(userHash, token);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -305,6 +320,7 @@
return getContent(userHash, token);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -316,6 +332,7 @@
creationService.saveContent(user, content, textContent);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Administrator)
@Transactional(type = TransactionType.READ_WRITE)
@@ -325,6 +342,7 @@
return mapper.map(content, ContentSimpleDTO.class);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -335,6 +353,7 @@
return mapper.map(contentManager.setLanguage(user, contentId, languageCode), I18nLanguageDTO.class);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -345,6 +364,7 @@
contentManager.setPublishedOn(user, contentId, publishedOn);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor)
@Transactional(type = TransactionType.READ_WRITE)
@@ -358,6 +378,7 @@
return getState(getCurrentUser(), content);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Administrator)
@Transactional(type = TransactionType.READ_WRITE)
@@ -367,6 +388,7 @@
return getState(getCurrentUser(), content);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false)
@Transactional(type = TransactionType.READ_WRITE)
@@ -379,6 +401,7 @@
return getSummaryTags(group);
}
+ @Override
@Authenticated
@Authorizated(accessRolRequired = AccessRol.Viewer)
@Transactional(type = TransactionType.READ_WRITE)
@@ -454,7 +477,7 @@
final ContentSimpleDTO siblingDTO) {
final Content sibling = contentManager.find(siblingDTO.getId());
final AccessLists lists = sibling.hasAccessList() ? sibling.getAccessLists() : groupAccessList;
- siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRightsDTO.class));
+ siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRights.class));
}
private StateContainerDTO mapState(final StateContainer state, final User user) {
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,7 +20,6 @@
package org.ourproject.kune.platf.server.rpc;
import org.ourproject.kune.platf.server.UserSession;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
import org.ourproject.kune.platf.server.auth.Authenticated;
import org.ourproject.kune.platf.server.auth.Authorizated;
@@ -31,11 +30,12 @@
import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.client.rpcservices.GroupService;
+import cc.kune.core.shared.domain.AccessRol;
import cc.kune.core.shared.domain.AdmissionType;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.domain.Content;
import cc.kune.domain.Group;
import cc.kune.domain.User;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,7 +20,6 @@
package org.ourproject.kune.platf.server.rpc;
import org.ourproject.kune.platf.server.UserSession;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
import org.ourproject.kune.platf.server.auth.Authenticated;
import org.ourproject.kune.platf.server.auth.Authorizated;
@@ -30,9 +29,10 @@
import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.SocialNetworkRequestResult;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.domain.Group;
import cc.kune.domain.User;
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 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,7 +23,6 @@
import org.jivesoftware.smack.util.Base64;
import org.ourproject.kune.platf.server.UserSession;
-import org.ourproject.kune.platf.server.access.AccessRol;
import org.ourproject.kune.platf.server.auth.ActionLevel;
import org.ourproject.kune.platf.server.auth.Authenticated;
import org.ourproject.kune.platf.server.auth.Authorizated;
@@ -38,8 +37,9 @@
import cc.kune.core.client.errors.DefaultException;
import cc.kune.core.client.errors.UserAuthException;
import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.shared.domain.AccessRol;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.UserDTO;
import cc.kune.core.shared.dto.UserInfoDTO;
import cc.kune.domain.Group;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,11 +21,12 @@
import java.util.List;
-import org.ourproject.kune.platf.server.access.AccessRights;
import org.ourproject.kune.platf.server.sn.ParticipationData;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
-import cc.kune.core.shared.dto.StateToken;
+
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.Group;
import cc.kune.domain.SocialNetwork;
import cc.kune.domain.utils.SocialNetworkData;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -19,9 +19,9 @@
*/
package org.ourproject.kune.platf.server.state;
-import org.ourproject.kune.platf.server.access.AccessRights;
import cc.kune.core.shared.domain.TagCloudResult;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.AccessLists;
import cc.kune.domain.Container;
import cc.kune.domain.I18nLanguage;
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,9 +22,9 @@
import java.util.Date;
import java.util.List;
-import org.ourproject.kune.platf.server.access.AccessRights;
import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.BasicMimeType;
import cc.kune.domain.User;
Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -28,9 +28,9 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContainerDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -55,6 +55,7 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.AccessRolDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.GroupDTO;
@@ -62,7 +63,6 @@
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -255,7 +255,7 @@
import cc.kune.core.client.state.AccessRightsClientManager;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateTokenUtils;
import cc.kune.core.shared.dto.UserSimpleDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface ActionContentToolbar extends ActionToolbar<StateToken> {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,7 +22,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ActionContentToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionContentToolbar {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ContentActionRegistry extends ActionRegistry<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -29,12 +29,12 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.BasicMimeTypeDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener;
@@ -66,11 +66,13 @@
this.i18n = i18n;
this.mediaUtils = mediaUtils;
stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
+ @Override
public void onEvent(final StateAbstractDTO state) {
setState(state);
}
});
onWaveLoaded = new Listener0() {
+ @Override
public void onEvent() {
NotifyUser.hideProgress();
NotifyUser.info("Wave loaded");
@@ -90,6 +92,7 @@
return waveType;
}
+ @Override
public void refreshState() {
setState(session.getContentState());
}
@@ -141,7 +144,7 @@
}
private ActionItemCollection<StateToken> getActionCollection(final StateContainerDTO state,
- final AccessRightsDTO rights) {
+ final AccessRights rights) {
return actionRegistry.getCurrentActions(state.getStateToken(), state.getTypeId(), session.isLogged(), rights,
true);
}
@@ -153,7 +156,7 @@
private void setNormalContent(final StateContentDTO state) {
final String contentBody = getContentBody(state);
- if ((contentBody == null || contentBody.length() == 0)) {
+ if (contentBody == null || contentBody.length() == 0) {
if (state.getContentRights().isEditable()) {
view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page"));
} else {
@@ -177,11 +180,11 @@
if (mimeType != null) {
final FileDownloadUtils fileDownloadUtils = downloadProvider.get();
if (mimeType.isImage()) {
- view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token,
- ImageSize.sized), false);
+ view.showImage(fileDownloadUtils.getImageUrl(token),
+ fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), false);
} else if (mimeType.isPdf()) {
- view.showImage(fileDownloadUtils.getImageUrl(token), fileDownloadUtils.getImageResizedUrl(token,
- ImageSize.sized), true);
+ view.showImage(fileDownloadUtils.getImageUrl(token),
+ fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true);
} else if (mimeType.isMp3()) {
view.setRawContent(mediaUtils.get().getMp3Embed(token));
} else if (mimeType.isOgg()) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,8 +22,8 @@
import org.ourproject.kune.workspace.client.upload.FileUploader;
import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateContainerDTO;
-import cc.kune.core.shared.dto.StateToken;
public interface ContextNavigator {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,7 +22,7 @@
import org.ourproject.kune.platf.client.actions.ActionItemCollection;
import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ContextNavigatorItem {
private final String id;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -26,7 +26,7 @@
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.allen_sauer.gwt.log.client.Log;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -39,7 +39,8 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.BasicMimeTypeDTO;
import cc.kune.core.shared.dto.ContainerDTO;
import cc.kune.core.shared.dto.ContainerSimpleDTO;
@@ -47,7 +48,6 @@
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.UserInfoDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -95,8 +95,10 @@
addRenameListener();
}
+ @Override
public void addFileUploaderListener(final FileUploader uploader) {
uploader.addOnUploadCompleteListener(new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken currentUploadStateToken) {
if (currentUploadStateToken.hasSameContainer(session.getCurrentStateToken())) {
stateManager.reload();
@@ -105,6 +107,7 @@
});
}
+ @Override
public void attach() {
// FIXME At the moment detach (removeFromParent) destroy the gwt-ext
// TreePanel and the widget must be recreated (cannot be attached again
@@ -113,6 +116,7 @@
bottomToolbar.attach();
}
+ @Override
public void clear() {
topToolbar.clear();
bottomToolbar.clear();
@@ -120,12 +124,14 @@
actionsByItem.clear();
}
+ @Override
public void detach() {
view.detach();
topToolbar.detach();
bottomToolbar.detach();
}
+ @Override
public void editItem(final StateToken stateToken) {
view.editItem(genId(stateToken));
}
@@ -135,10 +141,12 @@
addListeners();
}
+ @Override
public boolean isSelected(final StateToken stateToken) {
return view.isSelected(genId(stateToken));
}
+ @Override
public void refreshState() {
final StateAbstractDTO currentState = session.getCurrentState();
if (currentState instanceof StateContainerDTO) {
@@ -146,6 +154,7 @@
}
}
+ @Override
public void selectItem(final StateToken stateToken) {
view.selectItem(genId(stateToken));
topToolbar.disableMenusAndClearButtons();
@@ -155,15 +164,18 @@
bottomToolbar.addActions(itemCollection, AbstractFoldableContentActions.CONTEXT_BOTTOMBAR);
}
+ @Override
public void setEditOnNextStateChange(final boolean edit) {
editOnNextStateChange = edit;
}
+ @Override
public void setItemStatus(final StateToken stateToken, final ContentStatus status) {
clear();
refreshState();
}
+ @Override
public void setState(final StateContainerDTO state, final boolean select) {
setStateContainer(state, select);
}
@@ -178,7 +190,7 @@
private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId,
final BasicMimeTypeDTO mimeType, final ContentStatus status, final StateToken stateToken,
- final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) {
+ final StateToken parentStateToken, final AccessRights rights, final boolean isNodeSelected) {
final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken,
contentTypeId, session.isLogged(), rights, true);
@@ -199,11 +211,13 @@
private void addListeners() {
session.onUserSignIn(new Listener<UserInfoDTO>() {
+ @Override
public void onEvent(final UserInfoDTO parameter) {
clear();
}
});
session.onUserSignOut(new Listener0() {
+ @Override
public void onEvent() {
clear();
}
@@ -212,11 +226,13 @@
private void addRenameListener() {
final Listener2<StateToken, String> onSuccess = new Listener2<StateToken, String>() {
+ @Override
public void onEvent(final StateToken token, final String newName) {
setItemText(token, newName);
}
};
final Listener2<StateToken, String> onFail = new Listener2<StateToken, String>() {
+ @Override
public void onEvent(final StateToken token, final String oldName) {
setItemText(token, oldName);
}
@@ -225,7 +241,7 @@
renameAction.onFail(onFail);
}
- private void createChildItems(final ContainerDTO container, final AccessRightsDTO containerRights) {
+ private void createChildItems(final ContainerDTO container, final AccessRights containerRights) {
for (final ContainerSimpleDTO siblingFolder : container.getChilds()) {
addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatus.publishedOnline,
siblingFolder.getStateToken(),
@@ -239,7 +255,7 @@
}
private void createTreePath(final StateToken state, final ContainerSimpleDTO[] absolutePath,
- final AccessRightsDTO rights) {
+ final AccessRights rights) {
for (final ContainerSimpleDTO folder : absolutePath) {
final StateToken folderStateToken = folder.getStateToken();
final StateToken parentStateToken = state.copy().clearDocument().setFolder(folder.getParentFolderId());
@@ -298,12 +314,12 @@
private void setStateContainer(final StateContainerDTO state, final boolean select) {
final StateToken stateToken = state.getStateToken();
- final boolean isContent = (state instanceof StateContentDTO);
+ final boolean isContent = state instanceof StateContentDTO;
StateContentDTO stateContent = null;
final ContainerDTO container = state.getContainer();
- final AccessRightsDTO containerRights = state.getContainerRights();
- AccessRightsDTO rights;
+ final AccessRights containerRights = state.getContainerRights();
+ AccessRights rights;
showRootFolder(state, containerRights);
@@ -343,7 +359,7 @@
bottomToolbar.attach();
}
- private void showRootFolder(final StateContainerDTO state, final AccessRightsDTO containerRights) {
+ private void showRootFolder(final StateContainerDTO state, final AccessRights containerRights) {
// If container is not a root folder process root (add
// childs to view)
final ContainerDTO root = state.getRootContainer();
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,7 +22,7 @@
import org.ourproject.kune.platf.client.View;
import cc.kune.core.shared.domain.ContentStatus;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface ContextNavigatorView extends View {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,7 +23,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ActionContextBottomToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,7 +23,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ActionContextTopToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ContextActionRegistry extends ActionRegistry<StateToken> {
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -6,9 +6,9 @@
import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField;
import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.BasicMimeTypeDTO;
import cc.kune.core.shared.dto.LinkDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,8 +25,8 @@
import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.LinkDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.StateTokenUtils;
import cc.kune.core.shared.i18n.I18nTranslationService;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -5,9 +5,9 @@
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel;
import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.BasicMimeTypeDTO;
import cc.kune.core.shared.dto.LinkDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -5,7 +5,7 @@
import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils;
import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -31,8 +31,8 @@
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsTheme;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.ioc.Provider;
import com.google.gwt.user.client.ui.HorizontalPanel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,8 +23,8 @@
import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip;
import org.ourproject.kune.workspace.client.themes.WsTheme;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.StateToken;
public interface EntityHeaderView {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -24,8 +24,8 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener0;
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 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -31,10 +31,10 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.GroupType;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,8 +25,8 @@
import org.ourproject.kune.workspace.client.options.EntityOptions;
import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -6,8 +6,8 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener2;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -5,8 +5,8 @@
import org.ourproject.kune.workspace.client.options.EntityOptions;
import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.LicenseDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.UserInfoDTO;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -28,7 +28,7 @@
import org.ourproject.kune.workspace.client.themes.WsThemeSelector;
import cc.kune.core.client.utils.TextUtils;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.google.gwt.event.dom.client.ClickEvent;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -8,10 +8,10 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.View;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface EntityOptionsPublicSpaceConfView extends View {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -10,7 +10,7 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ToolSimpleDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -27,8 +27,8 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContentSimpleDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.ToolSimpleDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -27,7 +27,7 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ToolSimpleDTO;
import cc.kune.core.shared.dto.UserInfoDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,8 +23,8 @@
import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.LinkDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,11 +23,11 @@
import cc.kune.core.client.state.StateManager;
import cc.kune.core.shared.domain.ContentStatus;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupListDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.StateTokenUtils;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -42,7 +42,7 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.AccessRolDTO;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
@@ -85,11 +85,13 @@
this.toolbar = toolbar;
this.fileDownUtilsProvider = fileDownUtilsProvider;
stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
+ @Override
public void onEvent(final StateAbstractDTO state) {
setState(state);
}
});
stateManager.onSocialNetworkChanged(new Listener<StateAbstractDTO>() {
+ @Override
public void onEvent(final StateAbstractDTO state) {
setState(state);
}
@@ -116,8 +118,8 @@
user.getStateToken()) : BuddiesSummaryView.NOAVATAR;
final String tooltip = super.createTooltipWithLogo(user.getShortName(), user.getStateToken(),
user.hasLogo(), true);
- view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(),
- new AccessRightsDTO(true, true, true), false), avatarUrl, user.getName(), tooltip);
+ view.addBuddie(user, actionRegistry.getCurrentActions(user, session.isLogged(), new AccessRights(
+ true, true, true), false), avatarUrl, user.getName(), tooltip);
}
final boolean hasLocalBuddies = buddies.size() > 0;
final int numExtBuddies = userBuddies.getOtherExtBuddies();
@@ -155,6 +157,7 @@
private void createAddNewBuddiesAction() {
final ActionToolbarMenuDescriptor<UserSimpleDTO> addNewBuddiesAction = new ActionToolbarMenuDescriptor<UserSimpleDTO>(
AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() {
+ @Override
public void onEvent(final UserSimpleDTO parameter) {
NotifyUser.info("In development");
}
@@ -168,16 +171,19 @@
private void createSetBuddiesVisibilityAction(final String textDescription, final UserBuddiesVisibility visibility) {
final ActionToolbarMenuRadioDescriptor<UserSimpleDTO> buddiesVisibilityAction = new ActionToolbarMenuRadioDescriptor<UserSimpleDTO>(
AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() {
+ @Override
public void onEvent(final UserSimpleDTO parameter) {
userServiceAsync.get().setBuddiesVisibility(session.getUserHash(),
session.getCurrentState().getGroup().getStateToken(), visibility,
new AsyncCallbackSimple<Void>() {
+ @Override
public void onSuccess(final Void result) {
NotifyUser.info(i18n.t("Buddies visibility changed"));
}
});
}
}, BUDDIES_VISIBILITY_GROUP, new RadioMustBeChecked() {
+ @Override
public boolean mustBeChecked() {
final StateAbstractDTO currentState = session.getCurrentState();
if (currentState.getGroup().isPersonal()) {
@@ -196,6 +202,7 @@
private void registerActions() {
final ActionMenuItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionMenuItemDescriptor<UserSimpleDTO>(
AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() {
+ @Override
public void onEvent(final UserSimpleDTO user) {
chatEngineProvider.get().addNewBuddie(user.getShortName());
}
@@ -204,6 +211,7 @@
addAsBuddie.setTextDescription(i18n.t("Add as a buddie"));
addAsBuddie.setIconUrl("images/add-green.png");
addAsBuddie.setEnableCondition(new ActionEnableCondition<UserSimpleDTO>() {
+ @Override
public boolean mustBeEnabled(final UserSimpleDTO user) {
return !chatEngineProvider.get().isBuddie(user.getShortName());
}
@@ -212,6 +220,7 @@
final ActionMenuItemDescriptor<UserSimpleDTO> go = new ActionMenuItemDescriptor<UserSimpleDTO>(
AccessRolDTO.Viewer, new Listener<UserSimpleDTO>() {
+ @Override
public void onEvent(final UserSimpleDTO user) {
stateManager.gotoToken(user.getShortName());
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.actions.ActionRegistry;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
/**
* The Class GroupActionRegistry stores actions over groups (mainly used in SN)
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -30,8 +30,8 @@
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import cc.kune.core.client.i18n.I18nUITranslationService;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.emiteuimodule.client.users.UserGridPanel;
import com.calclab.suco.client.events.Listener;
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 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -45,8 +45,9 @@
import cc.kune.core.client.state.StateManager;
import cc.kune.core.shared.domain.AdmissionType;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.AccessListsDTO;
-import cc.kune.core.shared.dto.AccessRightsDTO;
import cc.kune.core.shared.dto.AccessRolDTO;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.InitDataDTO;
@@ -54,7 +55,6 @@
import cc.kune.core.shared.dto.SocialNetworkDTO;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.emite.core.client.xmpp.stanzas.XmppURI;
import com.calclab.suco.client.events.Listener;
@@ -95,6 +95,7 @@
this.liveSearcherProvider = liveSearcherProvider;
this.groupActionRegistry = groupActionRegistry;
final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() {
+ @Override
public void onEvent(final StateAbstractDTO state) {
setState(state);
toolbar.disableMenusAndClearButtons();
@@ -106,9 +107,11 @@
stateManager.onStateChanged(setStateListener);
stateManager.onSocialNetworkChanged(setStateListener);
session.onInitDataReceived(new Listener<InitDataDTO>() {
+ @Override
public void onEvent(final InitDataDTO initData) {
addUserOperation(new MenuItem<GroupDTO>("images/new-chat.gif", i18n.t("Start a chat with this member"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO group) {
chatEngineProvider.get().show();
if (chatEngineProvider.get().isLoggedIn()) {
@@ -139,6 +142,7 @@
NotifyUser.showProgressProcessing();
snServiceProvider.get().addCollabMember(session.getUserHash(), session.getCurrentState().getStateToken(),
groupShortName, new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Member added as collaborator"));
@@ -155,8 +159,10 @@
private void createActions() {
final ActionToolbarMenuDescriptor<StateToken> addMember = new ActionToolbarMenuDescriptor<StateToken>(
AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken parameter) {
liveSearcherProvider.get().onSelection(new Listener<LinkDTO>() {
+ @Override
public void onEvent(final LinkDTO link) {
view.confirmAddCollab(link.getShortName(), link.getLongName());
}
@@ -183,16 +189,19 @@
private void createNewMembersPolicyAction(final String textDescription, final AdmissionType admissionPolicy) {
final ActionToolbarMenuRadioDescriptor<StateToken> newMembersPolicy = new ActionToolbarMenuRadioDescriptor<StateToken>(
AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken parameter) {
groupServiceProvider.get().setGroupNewMembersJoiningPolicy(session.getUserHash(),
session.getCurrentState().getGroup().getStateToken(), admissionPolicy,
new AsyncCallbackSimple<Void>() {
+ @Override
public void onSuccess(final Void result) {
NotifyUser.info(i18n.t("Members joining policy changed"));
}
});
}
}, NEW_MEMBERS_POLICY_GROUP, new RadioMustBeChecked() {
+ @Override
public boolean mustBeChecked() {
final StateAbstractDTO currentState = session.getCurrentState();
return currentState.getGroup().getAdmissionType().equals(admissionPolicy);
@@ -207,16 +216,19 @@
private void createSetMembersVisibilityAction(final String textDescription, final SocialNetworkVisibility visibility) {
final ActionToolbarMenuRadioDescriptor<StateToken> showMembers = new ActionToolbarMenuRadioDescriptor<StateToken>(
AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken parameter) {
groupServiceProvider.get().setSocialNetworkVisibility(session.getUserHash(),
session.getCurrentState().getGroup().getStateToken(), visibility,
new AsyncCallbackSimple<Void>() {
+ @Override
public void onSuccess(final Void result) {
NotifyUser.info(i18n.t("Members visibility changed"));
}
});
}
}, MEMBERS_VISIBILITY_GROUP, new RadioMustBeChecked() {
+ @Override
public boolean mustBeChecked() {
final StateAbstractDTO currentState = session.getCurrentState();
if (!currentState.getGroup().isPersonal()) {
@@ -233,7 +245,7 @@
}
@SuppressWarnings("unchecked")
- private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRightsDTO rights) {
+ private void setGroupMembers(final SocialNetworkDTO socialNetwork, final AccessRights rights) {
final AccessListsDTO accessLists = socialNetwork.getAccessLists();
final List<GroupDTO> adminsList = accessLists.getAdmins().getList();
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -27,8 +27,8 @@
import org.ourproject.kune.workspace.client.skel.SummaryPanel;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener;
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 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -32,7 +32,7 @@
import cc.kune.core.client.state.AccessRightsClientManager;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.ParticipationDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
@@ -63,6 +63,7 @@
false);
super.addGroupOperation(gotoGroupMenuItem, false);
final Listener<StateAbstractDTO> setStateListener = new Listener<StateAbstractDTO>() {
+ @Override
public void onEvent(final StateAbstractDTO state) {
setState(state);
}
@@ -78,7 +79,7 @@
@SuppressWarnings("unchecked")
private void setState(final StateAbstractDTO state) {
final ParticipationDataDTO participation = state.getParticipation();
- final AccessRightsDTO rights = state.getGroupRights();
+ final AccessRights rights = state.getGroupRights();
view.clear();
final List<GroupDTO> groupsIsAdmin = participation.getGroupsIsAdmin();
final List<GroupDTO> groupsIsCollab = participation.getGroupsIsCollab();
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -6,7 +6,7 @@
import cc.kune.core.client.state.AccessRightsClientManager;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.AccessRolDTO;
import cc.kune.core.shared.i18n.I18nTranslationService;
@@ -17,7 +17,7 @@
public static UIStatus refreshStatus(final AccessRolDTO rolRequired, final boolean authNeed,
final boolean isLogged, final boolean visibleForMembers, final boolean visibleForNonMemb,
- final AccessRightsDTO newRights) {
+ final AccessRights newRights) {
boolean newVisibility = false;
boolean newEnabled = false;
if (authNeed && !isLogged) {
@@ -27,7 +27,7 @@
newEnabled = RolComparator.isEnabled(rolRequired, newRights);
if (newEnabled) {
final boolean isMember = RolComparator.isMember(newRights);
- newEnabled = newVisibility = ((isMember && visibleForMembers) || (!isMember && visibleForNonMemb));
+ newEnabled = newVisibility = isMember && visibleForMembers || !isMember && visibleForNonMemb;
} else {
newVisibility = false;
}
@@ -52,8 +52,8 @@
this.visibleForMembers = true;
this.visibleForNonMemb = true;
this.authNeed = false;
- rightsManager.onRightsChanged(new Listener2<AccessRightsDTO, AccessRightsDTO>() {
- public void onEvent(final AccessRightsDTO prevRights, final AccessRightsDTO newRights) {
+ rightsManager.onRightsChanged(new Listener2<AccessRights, AccessRights>() {
+ public void onEvent(final AccessRights prevRights, final AccessRights newRights) {
setStatus(refreshStatus(rolRequired, authNeed, session.isLogged(), visibleForMembers,
visibleForNonMemb, newRights));
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,11 +1,11 @@
package org.ourproject.kune.workspace.client.socialnet;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.AccessRolDTO;
public final class RolComparator {
- public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRightsDTO rights) {
+ public static boolean isEnabled(final AccessRolDTO rolRequired, final AccessRights rights) {
switch (rolRequired) {
case Administrator:
return rights.isAdministrable();
@@ -17,7 +17,7 @@
return false;
}
- public static boolean isMember(final AccessRightsDTO newRights) {
+ public static boolean isMember(final AccessRights newRights) {
return newRights.isAdministrable() || newRights.isEditable();
}
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 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -40,10 +40,10 @@
import cc.kune.core.client.state.AccessRightsClientManager;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener;
@@ -127,7 +127,7 @@
}
protected GridItem<GroupDTO> createGridItem(final GridGroup groupCategory, final GroupDTO group,
- final AccessRightsDTO rights, final MenuItem<GroupDTO>... gridMenuItems) {
+ final AccessRights rights, final MenuItem<GroupDTO>... gridMenuItems) {
final GridItem<GroupDTO> gridItem = createDefMemberMenu(group, groupCategory);
final CustomMenu<GroupDTO> menu = gridItem.getMenu();
if (rights.isAdministrable()) {
@@ -195,12 +195,14 @@
private void createMenuActions() {
gotoGroupMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this group homepage"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO groupDTO) {
stateManager.gotoToken(groupDTO.getShortName());
}
});
gotoMemberMenuItem = new MenuItem<GroupDTO>("images/group-home.gif", i18n.t("Visit this member homepage"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO groupDTO) {
stateManager.gotoToken(groupDTO.getShortName());
}
@@ -208,17 +210,20 @@
unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Do not participate anymore in this group"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO groupDTO) {
removeMemberAction(groupDTO);
}
});
changeToCollabMenuItem = new MenuItem<GroupDTO>("images/arrow-down-green.gif",
i18n.t("Change to collaborator"), new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO group) {
NotifyUser.showProgressProcessing();
snServiceProvider.get().setAdminAsCollab(session.getUserHash(),
session.getCurrentState().getStateToken(), group.getShortName(),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Member type changed"));
@@ -229,11 +234,13 @@
});
removeMemberMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Remove this member"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO group) {
NotifyUser.showProgressProcessing();
snServiceProvider.get().deleteMember(session.getUserHash(),
session.getCurrentState().getStateToken(), group.getShortName(),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Member removed"));
@@ -252,11 +259,13 @@
});
changeToAdminMenuItem = new MenuItem<GroupDTO>("images/arrow-up-green.gif", i18n.t("Change to admin"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO group) {
NotifyUser.showProgressProcessing();
snServiceProvider.get().setCollabAsAdmin(session.getUserHash(),
session.getCurrentState().getStateToken(), group.getShortName(),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Member type changed"));
@@ -267,11 +276,13 @@
});
acceptJoinGroupMenuItem = new MenuItem<GroupDTO>("images/accept.gif", i18n.t("Accept this member"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO group) {
NotifyUser.showProgressProcessing();
snServiceProvider.get().acceptJoinGroup(session.getUserHash(),
session.getCurrentState().getStateToken(), group.getShortName(),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Member accepted"));
@@ -282,11 +293,13 @@
});
denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Reject this member"),
new Listener<GroupDTO>() {
+ @Override
public void onEvent(final GroupDTO group) {
NotifyUser.showProgressProcessing();
snServiceProvider.get().denyJoinGroup(session.getUserHash(),
session.getCurrentState().getStateToken(), group.getShortName(),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Member rejected"));
@@ -301,6 +314,7 @@
NotifyUser.showProgressProcessing();
snServiceProvider.get().unJoinGroup(session.getUserHash(), new StateToken(groupDTO.getShortName()),
new AsyncCallbackSimple<SocialNetworkDataDTO>() {
+ @Override
public void onSuccess(final SocialNetworkDataDTO result) {
NotifyUser.hideProgress();
NotifyUser.info(i18n.t("Removed as member"));
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -9,9 +9,9 @@
import cc.kune.core.client.state.AccessRightsClientManager;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.AccessRolDTO;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface ActionGroupSummaryToolbar extends ActionToolbar<StateToken> {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,7 +22,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ActionGroupSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements
ActionGroupSummaryToolbar {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,7 +22,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter;
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class ActionParticipationSummaryToolbarPresenter extends ActionToolbarPresenter<StateToken> implements
ActionParticipationToolbar {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -21,7 +21,7 @@
import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface ActionParticipationToolbar extends ActionToolbar<StateToken> {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,7 +1,7 @@
package org.ourproject.kune.workspace.client.themes;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -3,7 +3,7 @@
import org.cobogw.gwt.user.client.CSS;
import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Event0;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,10 +25,10 @@
import cc.kune.core.client.rpcservices.GroupServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.InitDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Event2;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,10 +25,10 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
import com.calclab.suco.client.events.Listener2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -25,8 +25,8 @@
import cc.kune.core.client.errors.NameNotPermittedException;
import cc.kune.core.client.rpcservices.ContentServiceAsync;
import cc.kune.core.client.state.Session;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.events.Event2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -23,7 +23,7 @@
import org.ourproject.kune.workspace.client.themes.WsTheme;
import org.ourproject.kune.workspace.client.themes.WsThemeManager;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.calclab.suco.client.events.Listener2;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -20,7 +20,7 @@
package org.ourproject.kune.workspace.client.upload;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -22,7 +22,7 @@
import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool;
import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.calclab.suco.client.events.Event;
import com.calclab.suco.client.events.Listener;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -1,6 +1,6 @@
package org.ourproject.kune.workspace.client.wave;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public interface WaveInsert {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -8,8 +8,8 @@
import cc.kune.core.client.rpcservices.ContentServiceAsync;
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.i18n.I18nTranslationService;
import com.calclab.suco.client.ioc.Provider;
Modified: trunk/src/main/resources/dozerBeanMapping.xml
===================================================================
--- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-18 17:00:55 UTC (rev 1169)
@@ -75,10 +75,6 @@
</field>
</mapping>
<mapping>
- <class-a> cc.kune.core.shared.dto.AccessRightsDTO </class-a>
- <class-b> org.ourproject.kune.platf.server.access.AccessRights </class-b>
- </mapping>
- <mapping>
<class-a>cc.kune.core.shared.dto.StateContentDTO</class-a>
<class-b>org.ourproject.kune.platf.server.state.StateContent</class-b>
<field>
@@ -96,15 +92,15 @@
<class-a>cc.kune.core.shared.dto.StateAbstractDTO</class-a>
<class-b>org.ourproject.kune.platf.server.state.StateAbstract</class-b>
</mapping>
+<!-- <mapping>-->
+<!-- <class-a> cc.kune.core.shared.dto.StateToken </class-a>-->
+<!-- <class-b> cc.kune.core.shared.dto.StateToken </class-b>-->
+<!-- <field>-->
+<!-- <a>encoded</a>-->
+<!-- <b>encoded</b>-->
+<!-- </field>-->
+<!-- </mapping>-->
<mapping>
- <class-a> cc.kune.core.shared.dto.StateToken </class-a>
- <class-b> cc.kune.core.shared.dto.StateToken </class-b>
- <field>
- <a>encoded</a>
- <b>encoded</b>
- </field>
- </mapping>
- <mapping>
<class-a> cc.kune.core.shared.dto.BasicMimeTypeDTO </class-a>
<class-b> cc.kune.domain.BasicMimeType </class-b>
</mapping>
@@ -250,7 +246,7 @@
</mapping>
<mapping>
<class-a> cc.kune.core.shared.dto.AccessRolDTO </class-a>
- <class-b> org.ourproject.kune.platf.server.access.AccessRol </class-b>
+ <class-b> cc.kune.core.shared.domain.AccessRol </class-b>
</mapping>
<mapping>
<class-a> cc.kune.core.shared.dto.ToolSimpleDTO </class-a>
Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java
===================================================================
--- trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -10,8 +10,8 @@
import cc.kune.core.client.actions.BeforeActionListener;
import cc.kune.core.client.notify.SpinerPresenter;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateAbstractDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.testing.events.MockedListener;
import com.calclab.suco.testing.events.MockedListener0;
Modified: trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java
===================================================================
--- trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -6,7 +6,7 @@
import org.junit.Test;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class StateTokenTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -7,9 +7,9 @@
import org.mockito.Mockito;
import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.AccessRolDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.calclab.suco.client.events.Listener;
@@ -26,12 +26,12 @@
@Test
public void actionsEmptyButNeverNull() {
Mockito.when(session.isLogged()).thenReturn(true);
- checkActionLists(0, new AccessRightsDTO(true, true, true), true);
- checkActionLists(0, new AccessRightsDTO(true, true, true), false);
- checkActionLists(0, new AccessRightsDTO(false, true, true), true);
- checkActionLists(0, new AccessRightsDTO(false, true, true), false);
- checkActionLists(0, new AccessRightsDTO(false, false, true), true);
- checkActionLists(0, new AccessRightsDTO(false, false, true), false);
+ checkActionLists(0, new AccessRights(true, true, true), true);
+ checkActionLists(0, new AccessRights(true, true, true), false);
+ checkActionLists(0, new AccessRights(false, true, true), true);
+ checkActionLists(0, new AccessRights(false, true, true), false);
+ checkActionLists(0, new AccessRights(false, false, true), true);
+ checkActionLists(0, new AccessRights(false, false, true), false);
}
@Before
@@ -40,16 +40,19 @@
registry = new ActionRegistry<StateToken>();
adminAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Administrator, SOME_ID,
new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken parameter) {
}
});
editorAction = new ActionToolbarMenuAndItemDescriptor<StateToken>(AccessRolDTO.Editor, SOME_ID,
new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken parameter) {
}
});
viewerAction = new ActionMenuItemDescriptor<StateToken>(AccessRolDTO.Viewer, new Listener<StateToken>() {
+ @Override
public void onEvent(final StateToken parameter) {
}
});
@@ -60,32 +63,32 @@
public void mustBeAuthFalse() {
Mockito.when(session.isLogged()).thenReturn(false);
addDefActions();
- checkActionLists(0, new AccessRightsDTO(false, true, true), true);
- checkActionLists(1, new AccessRightsDTO(false, true, true), false);
+ checkActionLists(0, new AccessRights(false, true, true), true);
+ checkActionLists(1, new AccessRights(false, true, true), false);
}
@Test
public void testAddWhenAdmin() {
Mockito.when(session.isLogged()).thenReturn(true);
addDefActions();
- checkActionLists(2, new AccessRightsDTO(true, true, true), true);
- checkActionLists(3, new AccessRightsDTO(true, true, true), false);
+ checkActionLists(2, new AccessRights(true, true, true), true);
+ checkActionLists(3, new AccessRights(true, true, true), false);
}
@Test
public void testAddWhenEditor() {
Mockito.when(session.isLogged()).thenReturn(true);
addDefActions();
- checkActionLists(1, new AccessRightsDTO(false, true, true), true);
- checkActionLists(2, new AccessRightsDTO(false, true, true), false);
+ checkActionLists(1, new AccessRights(false, true, true), true);
+ checkActionLists(2, new AccessRights(false, true, true), false);
}
@Test
public void testAddWhenViewer() {
Mockito.when(session.isLogged()).thenReturn(true);
addDefActions();
- checkActionLists(0, new AccessRightsDTO(false, false, true), true);
- checkActionLists(1, new AccessRightsDTO(false, false, true), false);
+ checkActionLists(0, new AccessRights(false, false, true), true);
+ checkActionLists(1, new AccessRights(false, false, true), false);
}
private void addDefActions() {
@@ -94,9 +97,11 @@
registry.addAction(viewerAction, DEF_CONTENT_TYPE_ID);
}
- private void checkActionLists(final int expectedActions, final AccessRightsDTO accessRightsDTO,
+ private void checkActionLists(final int expectedActions, final AccessRights AccessRights,
final boolean toolbarActions) {
- assertEquals(expectedActions, registry.getCurrentActions(new StateToken(), DEF_CONTENT_TYPE_ID,
- session.isLogged(), accessRightsDTO, toolbarActions).size());
+ assertEquals(
+ expectedActions,
+ registry.getCurrentActions(new StateToken(), DEF_CONTENT_TYPE_ID, session.isLogged(), AccessRights,
+ toolbarActions).size());
}
}
Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -11,7 +11,7 @@
import org.ourproject.kune.workspace.client.upload.FileUploaderView;
import cc.kune.core.client.state.Session;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
public class FileUploaderPresenterTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -14,13 +14,13 @@
import cc.kune.core.client.errors.ContentNotFoundException;
import cc.kune.core.client.errors.UserMustBeLoggedException;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContainerDTO;
import cc.kune.core.shared.dto.ContainerSimpleDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
public class ContentServiceAddTest extends ContentServiceIntegrationTest {
@@ -43,9 +43,9 @@
doLogin();
defaultContent = getSiteDefaultContent();
assertEquals(1, defaultContent.getContainer().getContents().size());
- final AccessRightsDTO cntRights = defaultContent.getContentRights();
- final AccessRightsDTO ctxRights = defaultContent.getContainerRights();
- final AccessRightsDTO groupRights = defaultContent.getGroupRights();
+ final AccessRights cntRights = defaultContent.getContentRights();
+ final AccessRights ctxRights = defaultContent.getContainerRights();
+ final AccessRights groupRights = defaultContent.getGroupRights();
final String title = "New Content Title";
final StateContentDTO added = contentService.addContent(session.getHash(),
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -9,11 +9,11 @@
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import cc.kune.core.client.errors.ContentNotFoundException;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
import cc.kune.core.shared.dto.StateNoContentDTO;
-import cc.kune.core.shared.dto.StateToken;
public class ContentServiceGetTest extends ContentServiceIntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -4,8 +4,8 @@
import cc.kune.core.client.rpcservices.ContentService;
import cc.kune.core.client.rpcservices.UserService;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.inject.Inject;
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -14,12 +14,12 @@
import cc.kune.core.client.errors.AccessViolationException;
import cc.kune.core.shared.domain.TagCloudResult;
import cc.kune.core.shared.domain.TagCount;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.ContainerDTO;
import cc.kune.core.shared.dto.ContentSimpleDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
import cc.kune.core.shared.dto.StateContainerDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.core.shared.dto.UserSimpleDTO;
public class ContentServiceVariousTest extends ContentServiceIntegrationTest {
Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -11,8 +11,8 @@
import cc.kune.core.client.errors.AlreadyUserMemberException;
import cc.kune.core.client.errors.UserMustBeLoggedException;
import cc.kune.core.client.rpcservices.SocialNetworkService;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
-import cc.kune.core.shared.dto.StateToken;
import com.google.inject.Inject;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -8,6 +8,7 @@
import org.ourproject.kune.platf.server.TestDomainHelper;
import org.ourproject.kune.testhelper.ctx.DomainContext;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.domain.AccessLists;
import cc.kune.domain.Group;
import cc.kune.domain.SocialNetwork;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -14,7 +14,7 @@
import org.ourproject.kune.platf.server.manager.RateManager;
import cc.kune.core.client.errors.ContentNotFoundException;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.Container;
import cc.kune.domain.Content;
import cc.kune.domain.Group;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -8,11 +8,11 @@
import org.mockito.Mockito;
import org.ourproject.kune.platf.integration.IntegrationTest;
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
-import org.ourproject.kune.platf.server.access.AccessRol;
import cc.kune.core.client.errors.AccessViolationException;
import cc.kune.core.client.errors.ContentNotFoundException;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.AccessRol;
+import cc.kune.core.shared.domain.utils.StateToken;
import com.wideplay.warp.persist.Transactional;
Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -15,7 +15,7 @@
import org.ourproject.kune.platf.integration.IntegrationTestHelper;
import org.ourproject.kune.platf.server.properties.KuneProperties;
-import cc.kune.core.shared.dto.StateToken;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.domain.BasicMimeType;
import cc.kune.domain.Content;
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 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -9,7 +9,6 @@
import org.junit.Test;
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.manager.GroupManager;
import org.ourproject.kune.platf.server.sn.ParticipationData;
import org.ourproject.kune.platf.server.sn.UserBuddiesData;
@@ -18,6 +17,8 @@
import cc.kune.core.shared.domain.GroupListMode;
import cc.kune.core.shared.domain.SocialNetworkVisibility;
import cc.kune.core.shared.domain.UserBuddiesVisibility;
+import cc.kune.core.shared.domain.utils.AccessRights;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.CommentDTO;
import cc.kune.core.shared.dto.ContainerDTO;
import cc.kune.core.shared.dto.ContainerSimpleDTO;
@@ -28,7 +29,6 @@
import cc.kune.core.shared.dto.LinkDTO;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.StateContentDTO;
-import cc.kune.core.shared.dto.StateToken;
import cc.kune.domain.BasicMimeType;
import cc.kune.domain.Comment;
import cc.kune.domain.Container;
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -7,9 +7,9 @@
import cc.kune.core.client.state.Session;
import cc.kune.core.client.state.StateManager;
+import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.GroupDTO;
import cc.kune.core.shared.dto.GroupType;
-import cc.kune.core.shared.dto.StateToken;
public class EntityLogoPresenterTest {
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -5,24 +5,24 @@
import org.junit.Before;
import org.junit.Test;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.AccessRolDTO;
public class RolActionTest {
- private AccessRightsDTO adminRights;
- private AccessRightsDTO editorRights;
- private AccessRightsDTO viewerRights;
- private AccessRightsDTO noPermRights;
+ private AccessRights adminRights;
+ private AccessRights editorRights;
+ private AccessRights viewerRights;
+ private AccessRights noPermRights;
private UIStatus ff;
private UIStatus tt;
@Before
public void before() {
- adminRights = new AccessRightsDTO(true, true, true);
- editorRights = new AccessRightsDTO(false, true, true);
- viewerRights = new AccessRightsDTO(false, false, true);
- noPermRights = new AccessRightsDTO(false, false, false);
+ adminRights = new AccessRights(true, true, true);
+ editorRights = new AccessRights(false, true, true);
+ viewerRights = new AccessRights(false, false, true);
+ noPermRights = new AccessRights(false, false, false);
ff = new UIStatus(false, false);
tt = new UIStatus(true, true);
}
Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java
===================================================================
--- trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-16 02:22:00 UTC (rev 1168)
+++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-18 17:00:55 UTC (rev 1169)
@@ -5,17 +5,17 @@
import org.junit.Test;
-import cc.kune.core.shared.dto.AccessRightsDTO;
+import cc.kune.core.shared.domain.utils.AccessRights;
import cc.kune.core.shared.dto.AccessRolDTO;
public class RolComparatorTest {
@Test
public void testIsEnabled() {
- final AccessRightsDTO adminRights = new AccessRightsDTO(true, true, true);
- final AccessRightsDTO editorRights = new AccessRightsDTO(false, true, true);
- final AccessRightsDTO viewerRights = new AccessRightsDTO(false, false, true);
- final AccessRightsDTO noPermRights = new AccessRightsDTO(false, false, false);
+ final AccessRights adminRights = new AccessRights(true, true, true);
+ final AccessRights editorRights = new AccessRights(false, true, true);
+ final AccessRights viewerRights = new AccessRights(false, false, true);
+ final AccessRights noPermRights = new AccessRights(false, false, false);
assertTrue(RolComparator.isEnabled(AccessRolDTO.Administrator, adminRights));
assertFalse(RolComparator.isEnabled(AccessRolDTO.Administrator, editorRights));
assertFalse(RolComparator.isEnabled(AccessRolDTO.Administrator, viewerRights));
@@ -32,10 +32,10 @@
@Test
public void testIsMember() {
- assertFalse(RolComparator.isMember(new AccessRightsDTO(false, false, false)));
- assertFalse(RolComparator.isMember(new AccessRightsDTO(false, false, true)));
- assertTrue(RolComparator.isMember(new AccessRightsDTO(false, true, true)));
- assertTrue(RolComparator.isMember(new AccessRightsDTO(true, true, true)));
+ assertFalse(RolComparator.isMember(new AccessRights(false, false, false)));
+ assertFalse(RolComparator.isMember(new AccessRights(false, false, true)));
+ assertTrue(RolComparator.isMember(new AccessRights(false, true, true)));
+ assertTrue(RolComparator.isMember(new AccessRights(true, true, true)));
}
}
More information about the kune-commits
mailing list