kune-commits

Download

[email protected]

December 2010

1 participants
27 discussions

r1167 - in trunk: . src/main/java/cc/kune src/main/java/cc/kune/core/client/rpcservices src/main/java/cc/kune/core/shared src/main/java/cc/kune/core/shared/domain 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/server src/main/java/org/ourproject/kune/chat/client src/main/java/org/ourproject/kune/chat/server src/main/java/org/ourproject/kune/docs/server src/main/java/org/ourproject/kune/gallery/serve
by Vicente J. Ruiz Jurado 16 Dec '10

16 Dec '10

Author: vjrj_ Date: 2010-12-16 03:20:33 +0100 (Thu, 16 Dec 2010) New Revision: 1167 Added: trunk/src/main/java/cc/kune/core/shared/domain/ trunk/src/main/java/cc/kune/core/shared/domain/AdmissionType.java trunk/src/main/java/cc/kune/core/shared/domain/ContentStatus.java trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java trunk/src/main/java/cc/kune/core/shared/domain/RateResult.java trunk/src/main/java/cc/kune/core/shared/domain/SocialNetworkVisibility.java trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java trunk/src/main/java/cc/kune/core/shared/domain/TagCount.java trunk/src/main/java/cc/kune/core/shared/domain/UserBuddiesVisibility.java trunk/src/main/java/cc/kune/domain/ trunk/src/main/java/cc/kune/domain/AccessLists.java trunk/src/main/java/cc/kune/domain/BasicMimeType.java trunk/src/main/java/cc/kune/domain/Comment.java trunk/src/main/java/cc/kune/domain/Container.java trunk/src/main/java/cc/kune/domain/ContainerTranslation.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/domain/ContentTranslation.java trunk/src/main/java/cc/kune/domain/CustomProperties.java trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.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/I18nCountry.java trunk/src/main/java/cc/kune/domain/I18nLanguage.java trunk/src/main/java/cc/kune/domain/I18nTranslation.java trunk/src/main/java/cc/kune/domain/License.java trunk/src/main/java/cc/kune/domain/Properties.java trunk/src/main/java/cc/kune/domain/Property.java trunk/src/main/java/cc/kune/domain/PropertyGroup.java trunk/src/main/java/cc/kune/domain/PropertySetted.java trunk/src/main/java/cc/kune/domain/PropertySubgroup.java trunk/src/main/java/cc/kune/domain/Rate.java trunk/src/main/java/cc/kune/domain/Revision.java trunk/src/main/java/cc/kune/domain/SocialNetwork.java trunk/src/main/java/cc/kune/domain/Tag.java trunk/src/main/java/cc/kune/domain/TagUserContent.java trunk/src/main/java/cc/kune/domain/ToolConfiguration.java trunk/src/main/java/cc/kune/domain/User.java trunk/src/main/java/cc/kune/domain/utils/ trunk/src/main/java/cc/kune/domain/utils/DataFieldBridge.java trunk/src/main/java/cc/kune/domain/utils/HasId.java trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java Removed: trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/ trunk/src/test/java/org/ourproject/kune/docs/client/ trunk/src/test/java/org/ourproject/kune/platf/client/tool/ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ trunk/src/test/java/org/ourproject/kune/platf/server/content/ trunk/src/test/java/org/ourproject/kune/workspace/client/editor/ trunk/src/test/java/org/ourproject/kune/workspace/client/sitebar/msg/ Modified: trunk/pom.xml 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/UserService.java trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.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/StateContainerDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.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/AuthorizatedMethodInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationService.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertiesManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyGroupManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySettedManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySubgroupManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.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/impl/ExtMediaDescripManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nCountryManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nLanguageManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyGroupManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySubgroupManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/RateManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/TagManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.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/I18nRPC.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/sn/ParticipationData.java trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.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/platf/server/state/StateService.java trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java trunk/src/main/java/org/ourproject/kune/platf/server/users/Link.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.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/ContextPropEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.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/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java trunk/src/main/resources/dozerBeanMapping.xml trunk/src/main/resources/log4j.properties trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.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/domain/GroupListTest.java trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/finders/LicenseFinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/finders/UserFinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefaultTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java Log: NEW - # 9: Roo use/integration http://kune.ourproject.org/issues/ticket/9 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/pom.xml 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,14 +1,12 @@ <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/xsd/maven-4.0.0.xsd"> + 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</groupId> + <groupId>cc.kune</groupId> <artifactId>kune</artifactId> - <packaging>jar</packaging> + <packaging>war</packaging> <version>0.0.7</version> - <description> - kune free/open/libre collaboration platform - </description> <name>kune</name> + <description> kune free/open/libre collaboration platform </description> <url>http://kune.ourproject.org</url> <properties>  @@ -16,6 +14,8 @@ <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> @@ -148,7 +148,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> + <version>5.1.13</version> </dependency>  <dependency> @@ -159,7 +159,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>3.1.0.GA</version> + <version>4.0.2.GA</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -204,9 +204,28 @@ <version>2.0-SNAPSHOT</version> </dependency> <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> +  + </dependency> + <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> +  + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> + <version>${slf4j.version}</version> +  </dependency>  <dependency> @@ -304,8 +323,9 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> -  + <version>4.8.1</version> +  + <scope>test</scope> </dependency>   @@ -338,13 +358,13 @@ <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> @@ -711,7 +731,7 @@ <includes> <include>**/KunePlatform.gwt.xml**</include> <include>**/i18n/I18nTranslationService.**</include> - <include>**/i18n/I18nTranslationServiceMocked.**</include> + <include>**/i18n/I18nTranslationServiceMocked.** </include> <include>**/TextUtils.**</include> <include>**/IconLabelEditable.**</include> <include>**/QuickTipsHelper.**</include> @@ -720,8 +740,8 @@ <include>**/HorizontalLine.**</include> <include>**/AbstractLabel.**</include> <include>**/IconLabel.**</include> - <include> **/EditableIconLabel.** </include> - <include> **/EditableClickListener.** </include> + <include> **/EditableIconLabel.**</include> + <include> **/EditableClickListener.**</include> <include>**/KuneStringUtils.**</include> <include>**/IconHyperlink*.**</include> <include>**/LabelWrapper*.**</include> @@ -868,4 +888,4 @@ </dependencies> </profile> </profiles> -</project> \ No newline at end of file +</project> 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,16 +22,16 @@ import java.util.Date; import cc.kune.core.client.errors.DefaultException; +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.CommentDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.ContentStatusDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; -import cc.kune.core.shared.dto.RateResultDTO; 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.TagCloudResultDTO; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; @@ -59,11 +59,11 @@ StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException; - TagCloudResultDTO getSummaryTags(String userHash, StateToken groupToken) throws DefaultException; + TagCloudResult getSummaryTags(String userHash, StateToken groupToken) throws DefaultException; CommentDTO markCommentAsAbuse(String userHash, StateToken token, Long commentId) throws DefaultException; - RateResultDTO rateContent(String userHash, StateToken token, Double value) throws DefaultException; + RateResult rateContent(String userHash, StateToken token, Double value) throws DefaultException; void removeAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; @@ -79,11 +79,11 @@ void setPublishedOn(String userHash, StateToken token, Date date) throws DefaultException; - StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatusDTO status); + StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatus status); - StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status); + StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatus status); - TagCloudResultDTO setTags(String userHash, StateToken token, String tags) throws DefaultException; + TagCloudResult setTags(String userHash, StateToken token, String tags) throws DefaultException; CommentDTO voteComment(String userHash, StateToken token, Long commentId, boolean votePositive) throws DefaultException; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,17 +21,16 @@ import java.util.Date; - +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.CommentDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.ContentStatusDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; -import cc.kune.core.shared.dto.RateResultDTO; 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.TagCloudResultDTO; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -59,11 +58,11 @@ void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); - void getSummaryTags(String userHash, StateToken groupToken, AsyncCallback<TagCloudResultDTO> asyncCallback); + void getSummaryTags(String userHash, StateToken groupToken, AsyncCallback<TagCloudResult> asyncCallback); void markCommentAsAbuse(String userHash, StateToken token, Long commentId, AsyncCallback<CommentDTO> asyncCallback); - void rateContent(String userHash, StateToken token, Double value, AsyncCallback<RateResultDTO> asyncCallback); + void rateContent(String userHash, StateToken token, Double value, AsyncCallback<RateResult> asyncCallback); void removeAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback); @@ -81,13 +80,13 @@ void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<Void> asyncCallback); - void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status, + void setStatus(String userHash, StateToken stateToken, ContentStatus status, AsyncCallback<StateAbstractDTO> asyncCallback); - void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status, + void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatus status, AsyncCallback<StateAbstractDTO> asyncCallback); - void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResultDTO> asyncCallback); + void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResult> asyncCallback); void voteComment(String userHash, StateToken token, Long commentId, boolean votePositive, AsyncCallback<CommentDTO> 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -20,10 +20,10 @@ package cc.kune.core.client.rpcservices; import cc.kune.core.client.errors.DefaultException; -import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.RemoteService; @@ -45,9 +45,9 @@ GroupDTO setGroupBackImage(String userHash, StateToken token); - void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy); + void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionType admissionPolicy); - void setSocialNetworkVisibility(String userHash, StateToken groupToken, SocialNetworkVisibilityDTO visibility); + void setSocialNetworkVisibility(String userHash, StateToken groupToken, SocialNetworkVisibility visibility); void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled); 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,11 +19,10 @@ */ package cc.kune.core.client.rpcservices; - -import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; import cc.kune.core.shared.dto.StateToken; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -44,10 +43,10 @@ void setGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); - void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy, + void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionType admissionPolicy, AsyncCallback<Void> asyncCallback); - void setSocialNetworkVisibility(String userHash, StateToken token, SocialNetworkVisibilityDTO visibility, + void setSocialNetworkVisibility(String userHash, StateToken token, SocialNetworkVisibility visibility, AsyncCallback<Void> asyncCallback); void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled, 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,10 +19,9 @@ */ package cc.kune.core.client.rpcservices; - 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.dto.UserBuddiesVisibilityDTO; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; @@ -44,6 +43,6 @@ UserInfoDTO reloadUserInfo(String userHash) throws DefaultException; - void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility); + void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibility visibility); } 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,9 +19,8 @@ */ 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.dto.UserBuddiesVisibilityDTO; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; @@ -41,7 +40,7 @@ void reloadUserInfo(String userHash, AsyncCallback<UserInfoDTO> asyncCallback); - void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility, + void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibility visibility, AsyncCallback<Void> asyncCallback); } Copied: trunk/src/main/java/cc/kune/core/shared/domain/AdmissionType.java (from rev 1164, trunk/src/main/java/org/ourproject/kune/platf/server/domain/AdmissionType.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/AdmissionType.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/AdmissionType.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,26 @@ +/* + * + * 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; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum AdmissionType implements IsSerializable { + Moderated, Open, Closed +} Copied: trunk/src/main/java/cc/kune/core/shared/domain/ContentStatus.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/ContentStatus.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/ContentStatus.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/ContentStatus.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,26 @@ +/* + * + * 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; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum ContentStatus implements IsSerializable { + editingInProgress, submittedForEvaluation, publishedOnline, rejected, inTheDustbin +} Copied: trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupListMode.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/GroupListMode.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,42 @@ +/* + * + * 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; + +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/RateResult.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/RateResult.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/RateResult.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/RateResult.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,63 @@ +/* + * + * 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; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class RateResult implements IsSerializable { + private Double rate; + private Integer rateByUsers; + private Double currentUserRate; + + public RateResult() { + this(null, null, null); + } + + public RateResult(final Double rate, final Integer rateByUsers, final Double currentUserRate) { + this.rate = rate; + this.rateByUsers = rateByUsers; + this.currentUserRate = currentUserRate; + } + + public Double getCurrentUserRate() { + return currentUserRate; + } + + public Double getRate() { + return rate; + } + + public Integer getRateByUsers() { + return rateByUsers; + } + + public void setCurrentUserRate(final Double currentUserRate) { + this.currentUserRate = currentUserRate; + } + + public void setRate(final Double rate) { + this.rate = rate; + } + + public void setRateByUsers(final Integer rateByUsers) { + this.rateByUsers = rateByUsers; + } + +} Copied: trunk/src/main/java/cc/kune/core/shared/domain/SocialNetworkVisibility.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetworkVisibility.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/SocialNetworkVisibility.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/SocialNetworkVisibility.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,26 @@ +/* + * + * 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; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum SocialNetworkVisibility implements IsSerializable { + anyone, onlymembers, onlyadmins +} Copied: trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagCloudResult.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/TagCloudResult.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,65 @@ +/* + * + * 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; + +import java.util.List; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class TagCloudResult implements IsSerializable { + private List<TagCount> tagCountList; + private int maxValue; + private int minValue; + + public TagCloudResult(final List<TagCount> tagCountList, final int maxValue, final int minValue) { + this.tagCountList = tagCountList; + this.maxValue = maxValue; + this.minValue = minValue; + } + + public int getMaxValue() { + return maxValue; + } + + public int getMinValue() { + return minValue; + } + + public List<TagCount> getTagCountList() { + return tagCountList; + } + + public void setMaxValue(final int maxValue) { + this.maxValue = maxValue; + } + + public void setMinValue(final int minValue) { + this.minValue = minValue; + } + + public void setTagCountList(final List<TagCount> tagCountList) { + this.tagCountList = tagCountList; + } + + @Override + public String toString() { + return "TagCloudResult[list:" + tagCountList + "; maxValue: " + maxValue + "; minValue: " + minValue + "]"; + } +} Copied: trunk/src/main/java/cc/kune/core/shared/domain/TagCount.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagCount.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/TagCount.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/TagCount.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,58 @@ +/* + * + * 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; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public class TagCount implements IsSerializable { + private String name; + // FIXME: try to use Integer + private Long count; + + public TagCount() { + this(null, null); + } + + public TagCount(final String name) { + this(name, null); + } + + public TagCount(final String name, final Long count) { + this.name = name; + this.count = count; + } + + public Long getCount() { + return count; + } + + public String getName() { + return name; + } + + public void setCount(final Long count) { + this.count = count; + } + + public void setName(final String name) { + this.name = name; + } + +} Property changes on: trunk/src/main/java/cc/kune/core/shared/domain/TagCount.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/shared/domain/UserBuddiesVisibility.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/UserBuddiesVisibility.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/domain/UserBuddiesVisibility.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/domain/UserBuddiesVisibility.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,26 @@ +/* + * + * 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; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum UserBuddiesVisibility implements IsSerializable { + anyone, yourbuddies, onlyyou +} Deleted: trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,26 +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 enum AdmissionTypeDTO implements IsSerializable { - Moderated, Open, Closed -} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,79 +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; - -@Deprecated -public class ChatUserParamsDTO implements IsSerializable { - - private String avatar; - - private boolean publishRoster; - - private SubscriptionMode subscriptionMode; - - private String chatColor; - - public ChatUserParamsDTO() { - this(null, false, SubscriptionMode.autoAcceptAll, null); - }; - - public ChatUserParamsDTO(final String avatar, final boolean publishRoster, final SubscriptionMode subscriptionMode, - final String chatColor) { - this.avatar = avatar; - this.publishRoster = publishRoster; - this.subscriptionMode = subscriptionMode; - this.chatColor = chatColor; - } - - public String getAvatar() { - return avatar; - } - - public String getChatColor() { - return chatColor; - } - - public SubscriptionMode getSubscriptionMode() { - return subscriptionMode; - } - - public boolean isPublishRoster() { - return publishRoster; - } - - public void setAvatar(final String avatar) { - this.avatar = avatar; - } - - public void setChatColor(final String chatColor) { - this.chatColor = chatColor; - } - - public void setPublishRoster(final boolean publishRoster) { - this.publishRoster = publishRoster; - } - - public void setSubscriptionMode(final SubscriptionMode subscriptionMode) { - this.subscriptionMode = subscriptionMode; - } - -} 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,6 +19,8 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.ContentStatus; + import com.google.gwt.user.client.rpc.IsSerializable; public class ContentSimpleDTO implements IsSerializable { @@ -27,7 +29,7 @@ private String title; private String typeId; private StateToken stateToken; - private ContentStatusDTO status; + private ContentStatus status; private AccessRightsDTO rights; private BasicMimeTypeDTO mimeType; @@ -47,7 +49,7 @@ return stateToken; } - public ContentStatusDTO getStatus() { + public ContentStatus getStatus() { return status; } @@ -75,7 +77,7 @@ this.stateToken = stateToken; } - public void setStatus(final ContentStatusDTO status) { + public void setStatus(final ContentStatus status) { this.status = status; } Deleted: trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,26 +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 enum ContentStatusDTO implements IsSerializable { - editingInProgress, submittedForEvaluation, publishedOnline, rejected, inTheDustbin -} \ No newline at end of file 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,6 +19,8 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.AdmissionType; + import com.google.gwt.user.client.rpc.IsSerializable; public class GroupDTO implements IsSerializable { @@ -33,7 +35,7 @@ private String workspaceTheme; private boolean hasLogo; private StateToken stateToken; - AdmissionTypeDTO admissionType; + AdmissionType admissionType; public GroupDTO() { this(null, null, GroupType.ORGANIZATION); @@ -67,7 +69,7 @@ return true; } - public AdmissionTypeDTO getAdmissionType() { + public AdmissionType getAdmissionType() { return admissionType; } @@ -134,7 +136,7 @@ return groupType.equals(GroupType.PERSONAL); } - public void setAdmissionType(final AdmissionTypeDTO admissionType) { + public void setAdmissionType(final AdmissionType admissionType) { this.admissionType = admissionType; } Deleted: trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,62 +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 RateResultDTO implements IsSerializable { - private Double rate; - private Integer rateByUsers; - private Double currentUserRate; - - public RateResultDTO() { - this(null, null, null); - } - - public RateResultDTO(Double rate, Integer rateByUsers, Double currentUserRate) { - this.rate = rate; - this.rateByUsers = rateByUsers; - this.currentUserRate = currentUserRate; - } - - public Double getCurrentUserRate() { - return currentUserRate; - } - - public Double getRate() { - return rate; - } - - public Integer getRateByUsers() { - return rateByUsers; - } - - public void setCurrentUserRate(Double currentUserRate) { - this.currentUserRate = currentUserRate; - } - - public void setRate(Double rate) { - this.rate = rate; - } - - public void setRateByUsers(Integer rateByUsers) { - this.rateByUsers = rateByUsers; - } -} 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,14 +19,17 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.SocialNetworkVisibility; +import cc.kune.core.shared.domain.UserBuddiesVisibility; + import com.google.gwt.user.client.rpc.IsSerializable; public class SocialNetworkDataDTO implements IsSerializable { - private SocialNetworkVisibilityDTO socialNetworkVisibility; + private SocialNetworkVisibility socialNetworkVisibility; private SocialNetworkDTO groupMembers; private ParticipationDataDTO userParticipation; - private UserBuddiesVisibilityDTO userBuddiesVisibility; + private UserBuddiesVisibility userBuddiesVisibility; private UserBuddiesDataDTO userBuddies; private AccessRightsDTO groupRights; private boolean isBuddiesVisible; @@ -36,9 +39,9 @@ this(null, null, null, null, null, null, false, false); } - public SocialNetworkDataDTO(final SocialNetworkVisibilityDTO socialNetworkVisibility, + public SocialNetworkDataDTO(final SocialNetworkVisibility socialNetworkVisibility, final SocialNetworkDTO groupMembers, final ParticipationDataDTO userParticipation, - final UserBuddiesVisibilityDTO userBuddiesVisibility, final UserBuddiesDataDTO userBuddies, + final UserBuddiesVisibility userBuddiesVisibility, final UserBuddiesDataDTO userBuddies, final AccessRightsDTO groupRights, final boolean isBuddiesVisible, final boolean isMembersVisible) { this.socialNetworkVisibility = socialNetworkVisibility; this.groupMembers = groupMembers; @@ -66,7 +69,7 @@ return isMembersVisible; } - public SocialNetworkVisibilityDTO getSocialNetworkVisibility() { + public SocialNetworkVisibility getSocialNetworkVisibility() { return socialNetworkVisibility; } @@ -74,7 +77,7 @@ return userBuddies; } - public UserBuddiesVisibilityDTO getUserBuddiesVisibility() { + public UserBuddiesVisibility getUserBuddiesVisibility() { return userBuddiesVisibility; } @@ -114,16 +117,16 @@ this.isMembersVisible = isMembersVisible; } - public void setSocialNetworkVisibility(final SocialNetworkVisibilityDTO socialNetworkVisibilityDTO) { - this.socialNetworkVisibility = socialNetworkVisibilityDTO; + public void setSocialNetworkVisibility(final SocialNetworkVisibility socialNetworkVisibility) { + this.socialNetworkVisibility = socialNetworkVisibility; } public void setUserBuddies(final UserBuddiesDataDTO userBuddies) { this.userBuddies = userBuddies; } - public void setUserBuddiesVisibility(final UserBuddiesVisibilityDTO userBuddiesVisibilityDTO) { - this.userBuddiesVisibility = userBuddiesVisibilityDTO; + public void setUserBuddiesVisibility(final UserBuddiesVisibility userBuddiesVisibility) { + this.userBuddiesVisibility = userBuddiesVisibility; } public void setUserParticipation(final ParticipationDataDTO userParticipation) { Deleted: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,26 +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 enum SocialNetworkVisibilityDTO implements IsSerializable { - anyone, onlymembers, onlyadmins -} 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,6 +19,8 @@ */ package cc.kune.core.shared.dto; +import cc.kune.core.shared.domain.TagCloudResult; + import com.google.gwt.user.client.rpc.IsSerializable; public class StateContainerDTO extends StateAbstractDTO implements IsSerializable { @@ -30,7 +32,7 @@ private ContainerDTO rootContainer; private AccessRightsDTO containerRights; private LicenseDTO license; - private TagCloudResultDTO tagCloudResult; + private TagCloudResult tagCloudResult; private AccessListsDTO accessLists; public StateContainerDTO() { @@ -60,7 +62,7 @@ return rootContainer; } - public TagCloudResultDTO getTagCloudResult() { + public TagCloudResult getTagCloudResult() { return tagCloudResult; } @@ -72,43 +74,43 @@ return typeId; } - public boolean isType(String type) { + public boolean isType(final String type) { return getTypeId().equals(type); } - public void setAccessLists(AccessListsDTO accessLists) { + public void setAccessLists(final AccessListsDTO accessLists) { this.accessLists = accessLists; } - public void setContainer(ContainerDTO container) { + public void setContainer(final ContainerDTO container) { this.container = container; } - public void setContainerRights(AccessRightsDTO containerRights) { + public void setContainerRights(final AccessRightsDTO containerRights) { this.containerRights = containerRights; } - public void setLanguage(I18nLanguageDTO language) { + public void setLanguage(final I18nLanguageDTO language) { this.language = language; } - public void setLicense(LicenseDTO license) { + public void setLicense(final LicenseDTO license) { this.license = license; } - public void setRootContainer(ContainerDTO rootContainer) { + public void setRootContainer(final ContainerDTO rootContainer) { this.rootContainer = rootContainer; } - public void setTagCloudResult(TagCloudResultDTO tagCloudResult) { + public void setTagCloudResult(final TagCloudResult tagCloudResult) { this.tagCloudResult = tagCloudResult; } - public void setToolName(String toolName) { + public void setToolName(final String toolName) { this.toolName = toolName; } - public void setTypeId(String typeId) { + public void setTypeId(final String typeId) { this.typeId = typeId; } 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,6 +22,9 @@ import java.util.Date; import java.util.List; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.RateResult; + import com.google.gwt.user.client.rpc.IsSerializable; public class StateContentDTO extends StateContainerDTO implements IsSerializable { @@ -30,7 +33,7 @@ private int version; private String content; private AccessRightsDTO contentRights; - private ContentStatusDTO status; + private ContentStatus status; private Double rate; private Integer rateByUsers; private Double currentUserRate; @@ -78,7 +81,7 @@ return rateByUsers; } - public ContentStatusDTO getStatus() { + public ContentStatus getStatus() { return status; } @@ -90,57 +93,57 @@ return version; } - public void setAuthors(List<UserSimpleDTO> authors) { + public void setAuthors(final List<UserSimpleDTO> authors) { this.authors = authors; } - public void setContent(String content) { + public void setContent(final String content) { this.content = content; } - public void setContentRights(AccessRightsDTO contentRights) { + public void setContentRights(final AccessRightsDTO contentRights) { this.contentRights = contentRights; } - public void setCurrentUserRate(Double currentUserRate) { + public void setCurrentUserRate(final Double currentUserRate) { this.currentUserRate = currentUserRate; } - public void setDocumentId(String documentId) { + public void setDocumentId(final String documentId) { this.documentId = documentId; } - public void setMimeType(BasicMimeTypeDTO mimeType) { + public void setMimeType(final BasicMimeTypeDTO mimeType) { this.mimeType = mimeType; } - public void setPublishedOn(Date publishedOn) { + public void setPublishedOn(final Date publishedOn) { this.publishedOn = publishedOn; } - public void setRate(Double rate) { + public void setRate(final Double rate) { this.rate = rate; } - public void setRate(RateResultDTO result) { + public void setRate(final RateResult result) { setRate(result.getRate()); setRateByUsers(result.getRateByUsers()); setCurrentUserRate(result.getCurrentUserRate()); } - public void setRateByUsers(Integer rateByUsers) { + public void setRateByUsers(final Integer rateByUsers) { this.rateByUsers = rateByUsers; } - public void setStatus(ContentStatusDTO status) { + public void setStatus(final ContentStatus status) { this.status = status; } - public void setTags(String tags) { + public void setTags(final String tags) { this.tags = tags; } - public void setVersion(int version) { + public void setVersion(final int version) { this.version = version; } Deleted: trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,69 +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 java.util.List; - -import com.google.gwt.user.client.rpc.IsSerializable; - -public class TagCloudResultDTO implements IsSerializable { - private List<TagCountDTO> tagCountList; - private int maxValue; - private int minValue; - - public TagCloudResultDTO() { - this(null, 0, 0); - } - - public TagCloudResultDTO(List<TagCountDTO> tagCountList, int maxValue, int minValue) { - this.tagCountList = tagCountList; - this.maxValue = maxValue; - this.minValue = minValue; - } - - public int getMaxValue() { - return maxValue; - } - - public int getMinValue() { - return minValue; - } - - public List<TagCountDTO> getTagCountList() { - return tagCountList; - } - - public void setMaxValue(int maxValue) { - this.maxValue = maxValue; - } - - public void setMinValue(int minValue) { - this.minValue = minValue; - } - - public void setTagCountList(List<TagCountDTO> tagCountList) { - this.tagCountList = tagCountList; - } - - @Override - public String toString() { - return "TagCloudResultDTO[list:" + tagCountList + "; maxValue: " + maxValue + "; minValue: " + minValue + "]"; - } -} Deleted: trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,59 +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 TagCountDTO implements IsSerializable { - private String name; - // FIXME: try to use Integer - private Long count; - - public TagCountDTO() { - this(null, null); - } - - public TagCountDTO(final String name, final Long count) { - this.name = name; - this.count = count; - } - - public Long getCount() { - return count; - } - - public String getName() { - return name; - } - - public void setCount(final Long count) { - this.count = count; - } - - public void setName(final String name) { - this.name = name; - } - - @Override - public String toString() { - return name + "(" + count + ")"; - } - -} Deleted: trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,26 +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 enum UserBuddiesVisibilityDTO implements IsSerializable { - anyone, yourbuddies, onlyyou -} Copied: trunk/src/main/java/cc/kune/domain/AccessLists.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/AccessLists.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/AccessLists.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/AccessLists.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,114 @@ +/* + * + * 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.domain; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +import org.hibernate.search.annotations.DocumentId; +import org.ourproject.kune.platf.server.access.AccessRol; + +@Entity +@Table(name = "access_lists") +public class AccessLists { + + @OneToOne(cascade = CascadeType.ALL) + protected GroupList admins; + + @OneToOne(cascade = CascadeType.ALL) + protected GroupList editors; + + @OneToOne(cascade = CascadeType.ALL) + protected GroupList viewers; + + @Id + @GeneratedValue + @DocumentId + private Long id; + + public AccessLists() { + this.admins = new GroupList(); + this.editors = new GroupList(); + this.viewers = new GroupList(); + } + + public void addAdmin(final Group group) { + admins.add(group); + } + + public void addEditor(final Group group) { + editors.add(group); + } + + public void addViewer(final Group group) { + viewers.add(group); + } + + public GroupList getAdmins() { + return admins; + } + + public GroupList getEditors() { + return editors; + } + + public Long getId() { + return id; + } + + public GroupList getList(final AccessRol rol) { + if (rol == AccessRol.Administrator) { + return getAdmins(); + } else if (rol == AccessRol.Editor) { + return getEditors(); + } else { + return getViewers(); + } + } + + public GroupList getViewers() { + return viewers; + } + + public void removeAdmin(final Group group) { + admins.remove(group); + } + + public void removeEditor(final Group group) { + editors.remove(group); + } + + public void removeViewer(final Group group) { + viewers.remove(group); + } + + public void setId(final Long id) { + this.id = id; + } + + @Override + public String toString() { + return "AccessList[admins :" + admins + "; editors: " + editors + "; viewers: " + viewers + "]"; + } +} Copied: trunk/src/main/java/cc/kune/domain/BasicMimeType.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/BasicMimeType.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/BasicMimeType.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,103 @@ +/* + * + * 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.domain; + +import javax.persistence.Embeddable; + +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Store; + +@Embeddable +public class BasicMimeType { + + @Field(index = Index.UN_TOKENIZED, store = Store.NO) + private String mimetype; + @Field(index = Index.UN_TOKENIZED, store = Store.NO) + private String mimesubtype; + + public BasicMimeType() { + this(null, null); + } + + public BasicMimeType(final String mimetype) { + if (mimetype != null) { + final String[] split = mimetype.split("/", 2); + this.mimetype = split[0]; + if (split.length > 1 && split[1].length() > 0) { + this.mimesubtype = split[1]; + } + } + } + + public BasicMimeType(final String type, final String subtype) { + this.mimetype = type; + this.mimesubtype = subtype; + } + + public String getSubtype() { + return mimesubtype; + } + + public String getType() { + return mimetype; + } + + /** + * Duplicate code in BMTDTO + * + * @return + */ + public boolean isImage() { + return mimetype != null && mimetype.equals("image"); + } + + /** + * Duplicate code in BMTDTO + * + * @return + */ + public boolean isPdf() { + return mimetype != null && mimesubtype != null && mimetype.equals("application") && mimesubtype.equals("pdf"); + } + + /** + * Duplicate code in BMTDTO + * + * @return + */ + public boolean isText() { + return mimetype != null && mimesubtype != null && mimetype.equals("text") && mimesubtype.equals("plain"); + } + + public void setSubtype(final String subtype) { + this.mimesubtype = subtype; + } + + public void setType(final String type) { + this.mimetype = type; + } + + @Override + public String toString() { + return mimesubtype == null ? mimetype : mimetype + "/" + mimesubtype; + } + +} Copied: trunk/src/main/java/cc/kune/domain/Comment.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Comment.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Comment.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Comment.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,219 @@ +/* + * + * 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.domain; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.IndexedEmbedded; +import org.hibernate.search.annotations.Store; + +@Entity +@Table(name = "comment") +public class Comment { + + @Id + @GeneratedValue + @DocumentId + private Long id; + + @ManyToOne + @JoinColumn + @IndexedEmbedded + private Content content; + + @Basic(optional = false) + private Long publishedOn; + + @IndexedEmbedded + @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + private User author; + + // Parent/Child pattern: + // http://www.hibernate.org/hib_docs/reference/en/html/example-parentchild.html + // http://www.researchkitchen.co.uk/blog/archives/57 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn + private Comment parent; + + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Comment> childs; + + @IndexedEmbedded + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + private List<User> positiveVoters; + + @IndexedEmbedded + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + private List<User> negativeVoters; + + @IndexedEmbedded + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + private List<User> abuseInformers; + + @Field(index = Index.TOKENIZED, store = Store.NO) + private String text; + + public Comment() { + this.publishedOn = System.currentTimeMillis(); + this.childs = new HashSet<Comment>(); + this.positiveVoters = new ArrayList<User>(); + this.negativeVoters = new ArrayList<User>(); + this.abuseInformers = new ArrayList<User>(); + } + + public void addAbuseInformer(final User informer) { + if (!abuseInformers.contains(informer)) { + abuseInformers.add(informer); + } + } + + public void addNegativeVoter(final User voter) { + if (!negativeVoters.contains(voter)) { + negativeVoters.add(voter); + } + if (positiveVoters.contains(voter)) { + positiveVoters.remove(voter); + } + } + + public void addPositiveVoter(final User voter) { + if (!positiveVoters.contains(voter)) { + positiveVoters.add(voter); + } + if (negativeVoters.contains(voter)) { + negativeVoters.remove(voter); + } + } + + public List<User> getAbuseInformers() { + return abuseInformers; + } + + @Transient + public int getAbuseInformersCount() { + return abuseInformers.size(); + } + + public User getAuthor() { + return author; + } + + public Set<Comment> getChilds() { + return childs; + } + + public Content getContent() { + return content; + } + + public Long getId() { + return id; + } + + public List<User> getNegativeVoters() { + return negativeVoters; + } + + @Transient + public int getNegativeVotersCount() { + return negativeVoters.size(); + } + + public Comment getParent() { + return parent; + } + + public List<User> getPositiveVoters() { + return positiveVoters; + } + + @Transient + public int getPositiveVotersCount() { + return positiveVoters.size(); + } + + public Long getPublishedOn() { + return publishedOn; + } + + public String getText() { + return text; + } + + public void setAbuseInformers(final List<User> abuseInformers) { + this.abuseInformers = abuseInformers; + } + + public void setAuthor(final User author) { + this.author = author; + } + + public void setChilds(final Set<Comment> childs) { + this.childs = childs; + } + + public void setContent(final Content content) { + this.content = content; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setNegativeVoters(final List<User> negativeVoters) { + this.negativeVoters = negativeVoters; + } + + public void setParent(final Comment parent) { + this.parent = parent; + } + + public void setPositiveVoters(final List<User> positiveVoters) { + this.positiveVoters = positiveVoters; + } + + public void setPublishedOn(final Long publishedOn) { + this.publishedOn = publishedOn; + } + + public void setText(final String text) { + this.text = text; + } +} Copied: trunk/src/main/java/cc/kune/domain/Container.java (from rev 1163, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Container.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,299 @@ +/* + * + * 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.domain; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.OrderBy; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.hibernate.search.annotations.ContainedIn; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.IndexedEmbedded; +import org.hibernate.search.annotations.Store; + +import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.utils.HasId; +import cc.kune.domain.utils.HasStateToken; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Indexed +@Table(name = "containers") +public class Container implements HasId, HasStateToken { + @Id + @GeneratedValue + @DocumentId + Long id; + + @Column + @Field(index = Index.TOKENIZED, store = Store.NO) + private String name; + + private String toolName; + + private String typeId; + + @ManyToOne + private I18nLanguage language; + + @IndexedEmbedded(depth = 1, prefix = "owner_") + @OneToOne + private Group owner; + + // Parent/Child pattern: + // http://www.hibernate.org/hib_docs/reference/en/html/example-parentchild.html + // http://www.researchkitchen.co.uk/blog/archives/57 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn + private Container parent; + + @OrderBy("createdOn DESC") + @OneToMany(mappedBy = "parent", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Container> childs; + + @ContainedIn + @OrderBy("createdOn DESC") + @OneToMany(mappedBy = "container", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Content> contents; + + @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + private List<Container> absolutePath; + + @OneToMany(cascade = CascadeType.ALL) + private List<ContainerTranslation> containerTranslations; + + @OneToOne(cascade = CascadeType.ALL) + private AccessLists accessLists; + + @Basic(optional = false) + private Long createdOn; + + @Basic(optional = true) + private Date deletedOn; + + public Container() { + this(null, null, null); + } + + public Container(final String title, final Group group, final String toolName) { + this.name = title; + owner = group; + this.toolName = toolName; + this.contents = new HashSet<Content>(); + this.childs = new HashSet<Container>(); + this.absolutePath = new ArrayList<Container>(); + this.createdOn = System.currentTimeMillis(); + } + + public void addChild(final Container child) { + child.setParent(this); + childs.add(child); + } + + public void addContent(final Content descriptor) { + // FIXME: something related with lazy initialization (workaround using + // size()) + contents.size(); + contents.add(descriptor); + } + + @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.parent = :container AND c.name LIKE :title") + public Long findIfExistsTitle(@Named("container") final Container container, @Named("title") final String title) { + return null; + } + + public List<Container> getAbsolutePath() { + return absolutePath; + } + + @Transient + public AccessLists getAccessLists() { + return hasAccessList() ? accessLists : isRoot() ? getOwner().getAccessLists() : getParent().getAccessLists(); + } + + public List<ContainerTranslation> getAliases() { + return containerTranslations; + } + + public Set<Container> getChilds() { + return childs; + } + + public List<ContainerTranslation> getContainerTranslations() { + return containerTranslations; + } + + public Set<Content> getContents() { + return contents; + } + + public Long getCreatedOn() { + return createdOn; + } + + public Date getDeletedOn() { + return deletedOn; + } + + public Long getId() { + return id; + } + + public I18nLanguage getLanguage() { + return language; + } + + public String getName() { + return name; + } + + public Group getOwner() { + return owner; + } + + public Container getParent() { + return parent; + } + + public Long getParentFolderId() { + return parent != null ? parent.getId() : null; + } + + @Transient + public StateToken getStateToken() { + return new StateToken(getOwner().getShortName(), getToolName(), getId()); + } + + @Transient + public String getStateTokenEncoded() { + return getStateToken().getEncoded(); + } + + public String getToolName() { + return toolName; + } + + public String getTypeId() { + return typeId; + } + + @Transient + public boolean hasAccessList() { + return accessLists != null; + } + + @Transient + public boolean isLeaf() { + return childs.size() == 0 && contents.size() == 0; + } + + @Transient + public boolean isRoot() { + return parent == null; + } + + public void setAbsolutePath(final List<Container> absolutePath) { + this.absolutePath = absolutePath; + } + + public void setAccessLists(final AccessLists accessLists) { + this.accessLists = accessLists; + } + + public void setAliases(final List<ContainerTranslation> containerTranslations) { + this.containerTranslations = containerTranslations; + } + + public void setChilds(final Set<Container> childs) { + this.childs = childs; + } + + public void setContainerTranslations(final List<ContainerTranslation> containerTranslations) { + this.containerTranslations = containerTranslations; + } + + public void setContents(final HashSet<Content> contents) { + this.contents = contents; + } + + public void setCreatedOn(final Long createdOn) { + this.createdOn = createdOn; + } + + public void setDeletedOn(final Date deletedOn) { + this.deletedOn = deletedOn; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setLanguage(final I18nLanguage language) { + this.language = language; + } + + public void setName(final String name) { + this.name = name; + } + + public void setOwner(final Group owner) { + this.owner = owner; + } + + public void setParent(final Container parent) { + this.parent = parent; + } + + public void setToolName(final String toolName) { + this.toolName = toolName; + } + + public void setTypeId(final String typeId) { + this.typeId = typeId; + } + + @Override + public String toString() { + return "Container[(" + getStateTokenEncoded() + "): " + getName() + "]"; + } +} Copied: trunk/src/main/java/cc/kune/domain/ContainerTranslation.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/ContainerTranslation.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/ContainerTranslation.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/ContainerTranslation.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,67 @@ +/* + * + * 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.domain; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +import cc.kune.domain.utils.HasId; + +@Entity +@Table(name = "container_translation") +public class ContainerTranslation implements HasId { + @Id + @GeneratedValue + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private I18nLanguage language; + + private String name; + + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(final String name) { + this.name = name; + } + + public I18nLanguage getLanguage() { + return language; + } + + public void setLanguage(final I18nLanguage language) { + this.language = language; + } + +} Copied: trunk/src/main/java/cc/kune/domain/Content.java (from rev 1163, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Content.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,373 @@ +/* + * + * 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.domain; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; +import javax.validation.constraints.NotNull; + +import org.hibernate.search.annotations.ContainedIn; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.IndexedEmbedded; + +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.utils.HasStateToken; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; +import com.wideplay.warp.persist.dao.FirstResult; +import com.wideplay.warp.persist.dao.MaxResults; + +@Entity +@Table(name = "contents") +@Indexed +@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +public class Content implements HasStateToken { + + private static final String TITLE = "title"; + private static final String GROUP = "group"; + private static final String MIMETYPE = "mimetype"; + + public static final Content NO_CONTENT = new Content(); + + @Id + @DocumentId + @GeneratedValue + // @PMD:REVIEWED:ShortVariable: by vjrj on 21/05/09 15:28 + private Long id; + + @Version + private int version; + + @OneToOne + private License license; + + @IndexedEmbedded + @OneToOne(cascade = { CascadeType.ALL }) + private Revision lastRevision; + + @Basic(optional = false) + private Long createdOn; + + @Basic(optional = true) + private Date deletedOn; + + @Basic(optional = true) + private Date publishedOn; + + // @NotNull?? + private String typeId; + + @OneToMany(cascade = CascadeType.ALL) + private List<ContentTranslation> translations; + + @ManyToOne + @JoinColumn + @IndexedEmbedded + private Container container; + + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private I18nLanguage language; + + @OneToOne(cascade = CascadeType.ALL) + private AccessLists accessLists; + + @IndexedEmbedded + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + private List<User> authors; + + @ContainedIn + @OneToMany(mappedBy = "content", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Set<Comment> comments; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private ContentStatus status; + + @IndexedEmbedded + @Embedded + private BasicMimeType mimeType; + + /** + * filename if is an uploaded content + */ + private String filename; + + public Content() { + translations = new ArrayList<ContentTranslation>(); + authors = new ArrayList<User>(); + comments = new HashSet<Comment>(); + createdOn = System.currentTimeMillis(); + lastRevision = new Revision(this); + accessLists = null; + status = ContentStatus.editingInProgress; + } + + public void addAuthor(final User user) { + if (!this.authors.contains(user)) { + this.authors.add(user); + } + } + + public void addComment(final Comment comment) { + // FIXME: something related with lazy initialization (workaround using + // size()) + comments.size(); + comments.add(comment); + } + + public void addRevision(final Revision revision) { + if (lastRevision == null) { + lastRevision = revision; + } else { + revision.setPrevious(lastRevision); + lastRevision = revision; + } + } + + @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC") + public List<Content> find2Mime(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title, + @Named(MIMETYPE) final String mimetype, @Named("mimetype2") final String mimetype2, + @FirstResult final int offset, @MaxResults final int limit) { + return null; + } + + @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND (mimeType.mimetype=:mimetype OR mimeType.mimetype=:mimetype2) AND container.owner.shortName=:group AND deletedOn=null") + public int find2MimeCount(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title, + @Named(MIMETYPE) final String mimetype, @Named("mimetype2") final String mimetype2) { + return 0; + } + + @Finder(query = "select count(*) from Container ctx, Content ctn where ctn.container.id = ctx.id and ctx = :container and ctn.lastRevision.title LIKE :title") + public Long findIfExistsTitle(@Named("container") final Container container, @Named(TITLE) final String title) { + return null; + } + + @Finder(query = "FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null ORDER BY lastRevision.title ASC") + public List<Content> findMime(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title, + @Named(MIMETYPE) final String mimetype, @FirstResult final int offset, @MaxResults final int limit) { + return null; + } + + @Finder(query = "SELECT count(id) FROM Content WHERE lastRevision.title LIKE :title AND mimeType.mimetype=:mimetype AND container.owner.shortName=:group AND deletedOn=null") + public int findMimeCount(@Named(GROUP) final String groupShortName, @Named(TITLE) final String title, + @Named(MIMETYPE) final String mimetype) { + return 0; + } + + @Transient + public AccessLists getAccessLists() { + return hasAccessList() ? accessLists : getContainer().getAccessLists(); + } + + public List<User> getAuthors() { + return authors; + } + + public Set<Comment> getComments() { + return comments; + } + + public Container getContainer() { + return container; + } + + public Long getCreatedOn() { + return createdOn; + } + + public Date getDeletedOn() { + return deletedOn; + } + + public String getFilename() { + return filename; + } + + public Long getId() { + return id; + } + + public I18nLanguage getLanguage() { + return language; + } + + public Revision getLastRevision() { + return lastRevision; + } + + public License getLicense() { + return license; + } + + public BasicMimeType getMimeType() { + return mimeType; + } + + public Group getOwner(final Group group) { + return container.getOwner(); + } + + public Date getPublishedOn() { + return publishedOn; + } + + @Transient + public StateToken getStateToken() { + return getContainer().getStateToken().copy().setDocument(getId()); + } + + @Transient + public String getStateTokenEncoded() { + return getStateToken().getEncoded(); + } + + public ContentStatus getStatus() { + return status; + } + + public String getTitle() { + return lastRevision.getTitle(); + } + + public List<ContentTranslation> getTranslations() { + return translations; + } + + public String getTypeId() { + return typeId; + } + + public int getVersion() { + return version; + } + + @Transient + public boolean hasAccessList() { + return accessLists != null; + } + + public void removeAuthor(final User user) { + this.authors.remove(user); + } + + public void setAccessLists(final AccessLists accessLists) { + this.accessLists = accessLists; + } + + public void setAuthors(final List<User> authors) { + this.authors = authors; + } + + public void setComments(final Set<Comment> comments) { + this.comments = comments; + } + + public void setContainer(final Container container) { + this.container = container; + } + + public void setCreatedOn(final Long createdOn) { + this.createdOn = createdOn; + } + + public void setDeletedOn(final Date date) { + this.deletedOn = date; + } + + public void setFilename(final String filename) { + this.filename = filename; + } + + // @PMD:REVIEWED:ShortVariable: by vjrj on 21/05/09 15:28 + public void setId(final Long id) { + this.id = id; + } + + public void setLanguage(final I18nLanguage language) { + this.language = language; + } + + public void setLastRevision(final Revision revision) { + this.lastRevision = revision; + } + + public void setLicense(final License license) { + this.license = license; + } + + public void setMimeType(final BasicMimeType mimeType) { + this.mimeType = mimeType; + } + + public void setPublishedOn(final Date publishedOn) { + this.publishedOn = publishedOn; + } + + public void setStatus(final ContentStatus status) { + this.status = status; + } + + public void setTranslations(final List<ContentTranslation> translations) { + this.translations = translations; + } + + public void setTypeId(final String typeId) { + this.typeId = typeId; + } + + public void setVersion(final int version) { + this.version = version; + } + + @Override + public String toString() { + return "Content[(" + getStateTokenEncoded() + "): " + getTitle() + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/domain/ContentTranslation.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/ContentTranslation.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/ContentTranslation.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/ContentTranslation.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,69 @@ +/* + * + * 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.domain; + +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + +import cc.kune.domain.utils.HasId; + + +@Entity +@Table(name = "content_translations") +public class ContentTranslation implements HasId { + + @Id + @GeneratedValue + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private I18nLanguage language; + + private Long contentId; + + public Long getContentId() { + return contentId; + } + + public Long getId() { + return id; + } + + public I18nLanguage getLanguage() { + return language; + } + + public void setContentId(final Long contentId) { + this.contentId = contentId; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setLanguage(final I18nLanguage language) { + this.language = language; + } + +} Copied: trunk/src/main/java/cc/kune/domain/CustomProperties.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/CustomProperties.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/CustomProperties.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/CustomProperties.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,76 @@ +/* + * + * 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.domain; + +import java.util.HashMap; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.Table; + +import cc.kune.domain.utils.HasId; + +@Entity +@Table(name = "customproperties") +public class CustomProperties implements HasId { + + @Id + @GeneratedValue + private Long id; + + @Lob + private HashMap<Class<?>, Object> data; + + public CustomProperties() { + data = new HashMap<Class<?>, Object>(); + } + + public HashMap<Class<?>, Object> getData() { + return data; + } + + @SuppressWarnings("unchecked") + public <T> T getData(final Class<T> type) { + return (T) data.get(type); + } + + public Long getId() { + return id; + } + + public <T> boolean hasPropertie(final Class<T> type) { + return data.containsKey(type); + } + + @SuppressWarnings("unchecked") + public <T> T setData(final Class<T> type, final T value) { + return (T) data.put(type, value); + } + + public void setData(final HashMap<Class<?>, Object> data) { + this.data = data; + } + + public void setId(final Long id) { + this.id = id; + } +} Copied: trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/ExtMediaDescrip.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/ExtMediaDescrip.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,121 @@ +package cc.kune.domain; + +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.validator.constraints.Length; + +import cc.kune.domain.utils.HasId; + +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "ext_media_descriptors") +public class ExtMediaDescrip implements HasId { + + @Id + @GeneratedValue + private Long id; + @Column(nullable = false) + private String name; + @Column(nullable = false) + private String siteurl; + @Column(nullable = false) + private String detectRegex; + @Column(nullable = false) + private String idRegex; + @Column(nullable = false) + @Length(max = 1000) + private String embedTemplate; + private int width; + private int height; + + public ExtMediaDescrip() { + this(null, null, null, null, null, 0, 0); + } + + public ExtMediaDescrip(final String name, final String siteurl, final String detectRegex, final String idRegex, + final String embedTemplate, final int defWidth, final int defHeight) { + this.name = name; + this.siteurl = siteurl; + this.detectRegex = detectRegex; + this.idRegex = idRegex; + this.embedTemplate = embedTemplate; + width = defWidth; + height = defHeight; + } + + @Finder(query = "from ExtMediaDescrip") + public List<ExtMediaDescrip> getAll() { + return null; + } + + public String getDetectRegex() { + return detectRegex; + } + + public String getEmbedTemplate() { + return embedTemplate; + } + + public int getHeight() { + return height; + } + + public Long getId() { + return id; + } + + public String getIdRegex() { + return idRegex; + } + + public String getName() { + return name; + } + + public String getSiteurl() { + return siteurl; + } + + public int getWidth() { + return width; + } + + public void setDetectRegex(final String detectRegex) { + this.detectRegex = detectRegex; + } + + public void setEmbedTemplate(final String embedTemplate) { + this.embedTemplate = embedTemplate; + } + + public void setHeight(final int height) { + this.height = height; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setIdRegex(final String idRegex) { + this.idRegex = idRegex; + } + + public void setName(final String name) { + this.name = name; + } + + public void setSiteurl(final String siteurl) { + this.siteurl = siteurl; + } + + public void setWidth(final int width) { + this.width = width; + } +} Copied: trunk/src/main/java/cc/kune/domain/Group.java (from rev 1163, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Group.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Group.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,339 @@ +/* + * + * 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.domain; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Embedded; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Lob; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.validation.constraints.Pattern; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Store; +import org.hibernate.validator.constraints.Length; + +import cc.kune.core.shared.domain.AdmissionType; +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; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Indexed +@Table(name = "groups") +public class Group implements HasId { + + // see: http://docs.codehaus.org/display/PICO/Good+Citizen: + // Never expect or return null + public static final Group NO_GROUP = null; + public static final String PROPS_ID = "groupprops"; + + @Id + @DocumentId + @GeneratedValue + private Long id; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + AdmissionType admissionType; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + GroupType groupType; + + @Field(index = Index.UN_TOKENIZED, store = Store.NO) + @Column(unique = true) + @Length(min = 3, max = 15, message = "The shortname must be between 3 and 15 characters of length") + @Pattern(regexp = "^[a-z0-9_\\-]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes") + private String shortName; + + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(unique = true) + @Length(min = 3, max = 50, message = "The longName must be between 3 and 50 characters of length") + private String longName; + + @OneToOne + private Content defaultContent; + + @OneToOne + private Content groupBackImage; + + @OneToOne(cascade = CascadeType.ALL) + private SocialNetwork socialNetwork; + + @OneToOne + private License defaultLicense; + + @OneToMany + private final Map<String, ToolConfiguration> toolsConfig; + + private String workspaceTheme; + + @Lob + private byte[] logo; + + @Embedded + private BasicMimeType logoMime; + + @Basic(optional = false) + private final Long createdOn; + + public Group() { + this(null, null, null, null); + } + + public Group(final String shortName, final String longName) { + this(shortName, longName, null, GroupType.PROJECT); + } + + public Group(final String shortName, final String longName, final License defaultLicense, final GroupType type) { + this.shortName = shortName; + this.longName = longName; + this.toolsConfig = new HashMap<String, ToolConfiguration>(); + this.socialNetwork = new SocialNetwork(); + this.defaultLicense = defaultLicense; + this.groupType = type; + this.admissionType = AdmissionType.Moderated; + this.createdOn = System.currentTimeMillis(); + } + + @Override + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final Group other = (Group) obj; + if (shortName == null) { + if (other.shortName != null) { + return false; + } + } else if (!shortName.equals(other.shortName)) { + return false; + } + return true; + } + + public boolean existToolConfig(final String toolName) { + return toolsConfig.get(toolName) != null; + } + + @Finder(query = "FROM Group g WHERE g.id IN (SELECT g.id FROM g.socialNetwork.accessLists.admins.list adm WHERE adm.id = :groupid)") + public List<Group> findAdminInGroups(@Named("groupid") final Long groupId) { + return null; + } + + @Finder(query = "FROM Group g WHERE g.shortName = :shortName") + public Group findByShortName(@Named("shortName") final String shortName) { + return null; + } + + @Finder(query = "FROM Group g WHERE g.id IN (SELECT g.id FROM g.socialNetwork.accessLists.editors.list AS ed WHERE ed.id = :groupid)") + public List<Group> findCollabInGroups(@Named("groupid") final Long groupId) { + return null; + } + + @Finder(query = "SELECT t.root.toolName FROM ToolConfiguration t WHERE t.enabled=true AND t.root.owner.id = :groupid") + public List<String> findEnabledTools(@Named("groupid") final Long groupId) { + return null; + } + + @Transient + public AccessLists getAccessLists() { + return getSocialNetwork().getAccessLists(); + } + + public AdmissionType getAdmissionType() { + return admissionType; + } + + @Finder(query = "FROM Group") + public List<Group> getAll() { + return null; + } + + public Long getCreatedOn() { + return createdOn; + } + + public Content getDefaultContent() { + return defaultContent; + } + + public License getDefaultLicense() { + return defaultLicense; + } + + public Content getGroupBackImage() { + return groupBackImage; + } + + public GroupType getGroupType() { + return groupType; + } + + public boolean getHasLogo() { + return hasLogo(); + } + + public Long getId() { + return id; + } + + public byte[] getLogo() { + return logo; + } + + public BasicMimeType getLogoMime() { + return logoMime; + } + + public String getLongName() { + return longName; + } + + public Container getRoot(final String toolName) { + return toolsConfig.get(toolName).getRoot(); + } + + public String getShortName() { + return shortName; + } + + public SocialNetwork getSocialNetwork() { + return socialNetwork; + } + + @Transient + public StateToken getStateToken() { + return new StateToken(shortName); + } + + public ToolConfiguration getToolConfiguration(final String name) { + return toolsConfig.get(name); + } + + public Map<String, ToolConfiguration> getToolsConfig() { + return toolsConfig; + } + + public String getWorkspaceTheme() { + return workspaceTheme; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + (shortName == null ? 0 : shortName.hashCode()); + return result; + } + + @Transient + public boolean hasLogo() { + return (logo != null && logo.length > 0 && logoMime != null); + } + + public boolean isPersonal() { + return getGroupType().equals(GroupType.PERSONAL); + } + + public void setAdmissionType(final AdmissionType admissionType) { + this.admissionType = admissionType; + } + + public void setDefaultContent(final Content defaultContent) { + this.defaultContent = defaultContent; + } + + public void setDefaultLicense(final License defaultLicense) { + this.defaultLicense = defaultLicense; + } + + public void setGroupBackImage(final Content groupBackImage) { + this.groupBackImage = groupBackImage; + } + + public void setGroupType(final GroupType groupType) { + this.groupType = groupType; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setLogo(final byte[] logo) { + this.logo = logo; + } + + public void setLogoMime(final BasicMimeType logoMime) { + this.logoMime = logoMime; + } + + public void setLongName(final String longName) { + this.longName = longName; + } + + public void setShortName(final String shortName) { + this.shortName = shortName; + } + + public void setSocialNetwork(final SocialNetwork socialNetwork) { + this.socialNetwork = socialNetwork; + } + + public ToolConfiguration setToolConfig(final String name, final ToolConfiguration config) { + toolsConfig.put(name, config); + return config; + } + + public void setWorkspaceTheme(final String workspaceTheme) { + this.workspaceTheme = workspaceTheme; + } + + @Override + public String toString() { + return "Group[" + shortName + "]"; + } +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/domain/GroupList.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/GroupList.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/GroupList.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/GroupList.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,126 @@ +/* + * + * 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.domain; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.ManyToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + +import cc.kune.core.shared.domain.GroupListMode; + +@Entity +@Table(name = "group_list") +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +public class GroupList { + @OrderBy("shortName ASC") + @ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }) + List<Group> list; + + @Id + @GeneratedValue + private Long id; + + @Enumerated(EnumType.ORDINAL) + @Basic + private GroupListMode mode; + + public GroupList() { + this(new ArrayList<Group>()); + this.mode = GroupListMode.NORMAL; + } + + public GroupList(final List<Group> list) { + this.list = list; + } + + public void add(final Group group) { + // No group duplicate + // TODO: Get this outside Domain? + if (!list.contains(group)) { + list.add(group); + } + // TODO: Get this outside Domain? + if (getMode() == GroupListMode.NOBODY) { + setMode(GroupListMode.NORMAL); + } + } + + public ArrayList<Group> duplicate() { + return new ArrayList<Group>(list); + } + + public Long getId() { + return id; + } + + public List<Group> getList() { + return list; + } + + public GroupListMode getMode() { + return mode; + } + + public boolean includes(final Group group) { + return mode.checkIfIncludes(group, this.list); + } + + public boolean isEmpty() { + return list.size() == 0; + } + + public void remove(final Group group) { + list.remove(group); + // TODO: Get this outside Domain? + if (list.isEmpty()) { + setMode(GroupListMode.NOBODY); + } + } + + public void setId(final Long id) { + this.id = id; + } + + public void setList(final List<Group> list) { + this.list = list; + } + + public void setMode(final GroupListMode mode) { + this.mode = mode; + } + + @Override + public String toString() { + return "GroupList[(" + mode + "): " + list + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/domain/I18nCountry.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nCountry.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/I18nCountry.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/I18nCountry.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,191 @@ +/* + * + * 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.domain; + +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Indexed; + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +/** + * GlobalizeCountries generated by hbm2java from original rails globalize schema + * + * More info: http://en.wikipedia.org/wiki/Date_and_time_notation_by_country + * http://en.wikipedia.org/wiki/Common_Locale_Data_Repository + * + */ +@Entity +@Indexed +@Table(name = "globalize_countries") +public class I18nCountry implements HasId { + + @Id + // Is not a @GeneratedValue similar to I18nLanguage (we have already ids) + @DocumentId + @Column(name = "id", unique = true, nullable = false) + private Long id; + + @Column(name = "code", length = 2) + private String code; + + @Column(name = "english_name") + private String englishName; + + @Column(name = "date_format") + private String dateFormat; + + @Column(name = "currency_format") + private String currencyFormat; + + @Column(name = "currency_code", length = 3) + private String currencyCode; + + @Column(name = "thousands_sep", length = 2) + private String thousandsSep; + + @Column(name = "decimal_sep", length = 2) + private String decimalSep; + + @Column(name = "currency_decimal_sep", length = 2) + private String currencyDecimalSep; + + @Column(name = "number_grouping_scheme") + private String numberGroupingScheme; + + public I18nCountry() { + this(null, null, null, null, null, null, null, null, null, null); + } + + public I18nCountry(final Long id, final String code, final String currencyCode, final String currencyDecimalSep, + final String currencyFormat, final String dateFormat, final String decimalSep, final String englishName, + final String numberGroupingScheme, final String thousandsSep) { + this.id = id; + this.code = code; + this.englishName = englishName; + this.dateFormat = dateFormat; + this.currencyFormat = currencyFormat; + this.currencyCode = currencyCode; + this.thousandsSep = thousandsSep; + this.decimalSep = decimalSep; + this.currencyDecimalSep = currencyDecimalSep; + this.numberGroupingScheme = numberGroupingScheme; + } + + @Finder(query = "FROM I18nCountry WHERE code = :country") + public I18nCountry findByCode(@Named("country") final String country) { + return null; + } + + @Finder(query = "FROM I18nCountry ORDER BY english_name") + public List<I18nCountry> getAll() { + return null; + } + + public String getCode() { + return this.code; + } + + public String getCurrencyCode() { + return this.currencyCode; + } + + public String getCurrencyDecimalSep() { + return this.currencyDecimalSep; + } + + public String getCurrencyFormat() { + return this.currencyFormat; + } + + public String getDateFormat() { + return this.dateFormat; + } + + public String getDecimalSep() { + return this.decimalSep; + } + + public String getEnglishName() { + return this.englishName; + } + + public Long getId() { + return this.id; + } + + public String getNumberGroupingScheme() { + return this.numberGroupingScheme; + } + + public String getThousandsSep() { + return this.thousandsSep; + } + + public void setCode(final String code) { + this.code = code; + } + + public void setCurrencyCode(final String currencyCode) { + this.currencyCode = currencyCode; + } + + public void setCurrencyDecimalSep(final String currencyDecimalSep) { + this.currencyDecimalSep = currencyDecimalSep; + } + + public void setCurrencyFormat(final String currencyFormat) { + this.currencyFormat = currencyFormat; + } + + public void setDateFormat(final String dateFormat) { + this.dateFormat = dateFormat; + } + + public void setDecimalSep(final String decimalSep) { + this.decimalSep = decimalSep; + } + + public void setEnglishName(final String englishName) { + this.englishName = englishName; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setNumberGroupingScheme(final String numberGroupingScheme) { + this.numberGroupingScheme = numberGroupingScheme; + } + + public void setThousandsSep(final String thousandsSep) { + this.thousandsSep = thousandsSep; + } + +} Copied: trunk/src/main/java/cc/kune/domain/I18nLanguage.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nLanguage.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/I18nLanguage.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/I18nLanguage.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,312 @@ +/* + * + * 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.domain; + +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.Pattern; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Store; +import org.hibernate.validator.constraints.Length; + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +/** + * GlobalizeLanguages generated by hbm2java from original rails globalize schema + * + * http://en.wikipedia.org/wiki/Calendar_date + * http://en.wikipedia.org/wiki/Date_and_time_notation_by_country + */ +@Entity +@Indexed +@Table(name = "globalize_languages") +public class I18nLanguage implements HasId { + + @Id + // Is not GeneratedValue + @DocumentId + @Column(name = "id", unique = true, nullable = false) + private Long id; + + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(name = "code", unique = true) + private String code; + + @Column(name = "iso_639_1", length = 2) + private String iso6391; + + @Column(name = "iso_639_2", length = 3, unique = true) + private String iso6392; + + @Column(name = "iso_639_3", length = 3, unique = true) + private String iso6393; + + @Column(name = "rfc_3066", unique = true) + private String rfc3066; + + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(name = "english_name") + private String englishName; + + @Column(name = "english_name_locale") + private String englishNameLocale; + + @Column(name = "english_name_modifier") + private String englishNameModifier; + + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(name = "native_name") + private String nativeName; + + @Column(name = "native_name_locale") + private String nativeNameLocale; + + @Column(name = "native_name_modifier") + private String nativeNameModifier; + + @Column(name = "macro_language") + private Boolean macroLanguage; + + @Column(name = "direction") + private String direction; + + @Pattern(regexp = "^[c=\\d?:%!<>&|() ]+$") + @Column(name = "pluralization") + @Length(max = 200) + private String pluralization; + + @Column(name = "scope", length = 1) + private String scope; + + @Column(name = "date_format") + private String dateFormat; + + @Column(name = "date_format_short") + private String dateFormatShort; + + public I18nLanguage() { + this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + } + + // Only for tests + public I18nLanguage(final Long id, final String englishName, final String nativeName, final String code) { + this.id = id; + this.englishName = englishName; + this.nativeName = nativeName; + this.code = code; + } + + // code is iso6391 || iso6392 || rfc3306 (see DatabaseInicializer) + public I18nLanguage(final Long id, final String code, final String direction, final String englishName, + final String englishNameLocale, final String englishNameModifier, final String iso6391, + final String iso6392, final String iso6393, final Boolean macroLanguage, final String nativeName, + final String nativeNameLocale, final String nativeNameModifier, final String pluralization, + final String rfc3066, final String scope, final String dateFormat) { + this.id = id; + this.iso6391 = iso6391; + this.iso6392 = iso6392; + this.iso6393 = iso6393; + this.rfc3066 = rfc3066; + this.englishName = englishName; + this.englishNameLocale = englishNameLocale; + this.englishNameModifier = englishNameModifier; + this.nativeName = nativeName; + this.nativeNameLocale = nativeNameLocale; + this.nativeNameModifier = nativeNameModifier; + this.macroLanguage = macroLanguage; + this.direction = direction; + this.pluralization = pluralization; + this.scope = scope; + this.code = code; + this.dateFormat = dateFormat; + } + + @Finder(query = "FROM I18nLanguage l WHERE code = :language") + public I18nLanguage findByCode(@Named("language") final String language) { + return null; + } + + @Finder(query = "FROM I18nLanguage ORDER BY englishName") + public List<I18nLanguage> getAll() { + return null; + } + + public String getCode() { + return code; + } + + public String getDateFormat() { + return dateFormat; + } + + public String getDateFormatShort() { + return dateFormatShort; + } + + public String getDirection() { + return this.direction; + } + + public String getEnglishName() { + return this.englishName; + } + + public String getEnglishNameLocale() { + return this.englishNameLocale; + } + + public String getEnglishNameModifier() { + return this.englishNameModifier; + } + + public Long getId() { + return this.id; + } + + public String getIso6391() { + return this.iso6391; + } + + public String getIso6392() { + return this.iso6392; + } + + public String getIso6393() { + return this.iso6393; + } + + public Boolean getMacroLanguage() { + return this.macroLanguage; + } + + public String getNativeName() { + return this.nativeName; + } + + public String getNativeNameLocale() { + return this.nativeNameLocale; + } + + public String getNativeNameModifier() { + return this.nativeNameModifier; + } + + public String getPluralization() { + return this.pluralization; + } + + public String getRfc3066() { + return this.rfc3066; + } + + public String getScope() { + return this.scope; + } + + @Column(unique = true) + public void setCode(final String code) { + this.code = code; + } + + public void setDateFormat(final String dateFormat) { + this.dateFormat = dateFormat; + } + + public void setDateFormatShort(final String dateFormatShort) { + this.dateFormatShort = dateFormatShort; + } + + public void setDirection(final String direction) { + this.direction = direction; + } + + public void setEnglishName(final String englishName) { + this.englishName = englishName; + } + + public void setEnglishNameLocale(final String englishNameLocale) { + this.englishNameLocale = englishNameLocale; + } + + public void setEnglishNameModifier(final String englishNameModifier) { + this.englishNameModifier = englishNameModifier; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setIso6391(final String iso6391) { + this.iso6391 = iso6391; + } + + public void setIso6392(final String iso6392) { + this.iso6392 = iso6392; + } + + public void setIso6393(final String iso6393) { + this.iso6393 = iso6393; + } + + public void setMacroLanguage(final Boolean macroLanguage) { + this.macroLanguage = macroLanguage; + } + + public void setNativeName(final String nativeName) { + this.nativeName = nativeName; + } + + public void setNativeNameLocale(final String nativeNameLocale) { + this.nativeNameLocale = nativeNameLocale; + } + + public void setNativeNameModifier(final String nativeNameModifier) { + this.nativeNameModifier = nativeNameModifier; + } + + public void setPluralization(final String pluralization) { + this.pluralization = pluralization; + } + + public void setRfc3066(final String rfc3066) { + this.rfc3066 = rfc3066; + } + + public void setScope(final String scope) { + this.scope = scope; + } + + @Override + public String toString() { + return "I18nLanguage[" + englishName + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/domain/I18nTranslation.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/I18nTranslation.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/I18nTranslation.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/I18nTranslation.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,253 @@ +/* + * + * 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.domain; + +import java.util.List; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Indexed; + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; +import com.wideplay.warp.persist.dao.FirstResult; +import com.wideplay.warp.persist.dao.MaxResults; + +/** + * GlobalizeTranslations generated by hbm2java from original rails globalize + * schema + */ +@Entity +@Indexed +@Table(name = "globalize_translations") +@NamedQueries( { + @NamedQuery(name = "untranslated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text=null"), + @NamedQuery(name = "translated", query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :language and text!=null"), + @NamedQuery(name = "untranslatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text=null"), + @NamedQuery(name = "translatedcount", query = "SELECT COUNT(gt.id) FROM I18nTranslation gt WHERE gt.language = :language and text!=null") }) +public class I18nTranslation implements HasId { + + public static final String DEF_NAMESPACE = "kune_core"; + public static final Integer DEF_PLUR_INDEX = 1; + public static final String DEFAULT_LANG = "en"; + public static final String UNTRANSLATED_VALUE = null; + private static final String TRANSLATED_QUERY = "translated"; + private static final String UNTRANSLATED_QUERY = "untranslated"; + private static final String TRANSLATED_COUNT_QUERY = "translatedcount"; + private static final String UNTRANSLATED_COUNT_QUERY = "untranslatedcount"; + + @Id + @GeneratedValue + @DocumentId + @Column(name = "id", unique = true, nullable = false) + private Long id; + + @Column(name = "gtype") + private String type; + + @Column(name = "tr_key") + private String trKey; + + @Column(name = "table_name") + private String tableName; + + @Column(name = "item_id") + private Integer itemId; + + @Column(name = "facet") + private String facet; + + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "language_id") + private I18nLanguage language; + + @Column(name = "pluralization_index") + private Integer pluralizationIndex; + + @Column(name = "text") + private String text; + + public I18nTranslation() { + this(null, null, null, null, null, null, null, null); + } + + public I18nTranslation(final String trKey, final I18nLanguage language, final String text) { + this("", null, DEF_PLUR_INDEX, "", text, trKey, DEF_NAMESPACE, language); + } + + public I18nTranslation(final String facet, final Integer itemId, final Integer pluralizationIndex, + final String tableName, final String text, final String trKey, final String type, + final I18nLanguage language) { + this.type = type; + this.trKey = trKey; + this.tableName = tableName; + this.itemId = itemId; + this.facet = facet; + this.language = language; + this.pluralizationIndex = pluralizationIndex; + this.text = text; + } + + public I18nTranslation cloneForNewLanguage() { + final I18nTranslation clone = new I18nTranslation(); + clone.type = type; + clone.trKey = trKey; + clone.tableName = tableName; + clone.itemId = itemId; + clone.facet = facet; + clone.language = null; + clone.pluralizationIndex = pluralizationIndex; + clone.text = null; + return clone; + } + + @Finder(query = "SELECT gt FROM I18nTranslation gt JOIN gt.language gl WHERE gl.code = :language") + public List<I18nTranslation> findByLanguage(@Named("language") final String language) { + return null; + } + + public String getFacet() { + return this.facet; + } + + public Long getId() { + return this.id; + } + + public Integer getItemId() { + return this.itemId; + } + + public I18nLanguage getLanguage() { + return language; + } + + @Finder(query = "SELECT gt FROM I18nTranslation gt WHERE gt.language = :deflanguage AND gt.trKey NOT IN (SELECT gt.trKey FROM I18nTranslation gt WHERE gt.language = :language)") + public List<I18nTranslation> getNonExistentFromDefault(@Named("deflanguage") final I18nLanguage deflanguage, + @Named("language") final I18nLanguage language) { + return null; + } + + public Integer getPluralizationIndex() { + return this.pluralizationIndex; + } + + public String getTableName() { + return this.tableName; + } + + public String getText() { + return this.text; + } + + @Finder(namedQuery = TRANSLATED_QUERY) + public List<I18nTranslation> getTranslatedLexicon(@Named("language") final I18nLanguage language) { + return null; + } + + @Finder(namedQuery = TRANSLATED_QUERY) + public List<I18nTranslation> getTranslatedLexicon(@Named("language") final I18nLanguage language, + @FirstResult final int first, @MaxResults final int max) { + return null; + } + + @Finder(namedQuery = TRANSLATED_COUNT_QUERY) + public Long getTranslatedLexiconCount(@Named("language") final I18nLanguage language) { + return null; + } + + public String getTrKey() { + return this.trKey; + } + + public String getType() { + return this.type; + } + + @Finder(namedQuery = UNTRANSLATED_QUERY) + public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") final I18nLanguage language) { + return null; + } + + @Finder(namedQuery = UNTRANSLATED_QUERY) + public List<I18nTranslation> getUnstranslatedLexicon(@Named("language") final I18nLanguage language, + @FirstResult final int first, @MaxResults final int max) { + return null; + } + + @Finder(namedQuery = UNTRANSLATED_COUNT_QUERY) + public Long getUnstranslatedLexiconCount(@Named("language") final I18nLanguage language) { + return null; + } + + public void setFacet(final String facet) { + this.facet = facet; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setItemId(final Integer itemId) { + this.itemId = itemId; + } + + public void setLanguage(final I18nLanguage language) { + this.language = language; + } + + public void setPluralizationIndex(final Integer pluralizationIndex) { + this.pluralizationIndex = pluralizationIndex; + } + + public void setTableName(final String tableName) { + this.tableName = tableName; + } + + public void setText(final String text) { + this.text = text; + } + + public void setTrKey(final String trKey) { + this.trKey = trKey; + } + + public void setType(final String type) { + this.type = type; + } + + @Override + public String toString() { + return "I18nTranslation[" + trKey + " (" + language + ") " + text + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/domain/License.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/License.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/License.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/License.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,177 @@ +/* + * + * 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.domain; + +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "licenses") +public class License implements HasId { + @Id + @GeneratedValue + private Long id; + + @Column(unique = true) + private String shortName; + + @Column(unique = true) + private String longName; + + private String description; + + @Column(nullable = false) + private String url; + private boolean isCC; + private boolean isCopyleft; + private boolean isDeprecated; + private String rdf; + @Column(nullable = false) + private String imageUrl; + + public License() { + this(null, null, null, null, false, false, false, null, null); + } + + public License(final String shortName, final String longName, final String description, final String url, + final boolean isCC, final boolean isCopyleft, final boolean isDeprecated, final String rdf, + final String imageUrl) { + this.shortName = shortName; + this.longName = longName; + this.description = description; + this.url = url; + this.isCC = isCC; + this.isCopyleft = isCopyleft; + this.isDeprecated = isDeprecated; + this.rdf = rdf; + this.imageUrl = imageUrl; + } + + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } + + public String getShortName() { + return shortName; + } + + public void setShortName(final String shortName) { + this.shortName = shortName; + } + + public String getLongName() { + return longName; + } + + public void setLongName(final String longName) { + this.longName = longName; + } + + public String getDescription() { + return description; + } + + public void setDescription(final String description) { + this.description = description; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(final String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getRdf() { + return rdf; + } + + public void setRdf(final String rdf) { + this.rdf = rdf; + } + + public String getUrl() { + return url; + } + + public void setUrl(final String url) { + this.url = url; + } + + public boolean isCC() { + return isCC; + } + + public boolean isCopyleft() { + return isCopyleft; + } + + public boolean isDeprecated() { + return isDeprecated; + } + + public void setCC(final boolean isCC) { + this.isCC = isCC; + } + + public void setCopyleft(final boolean isCopyleft) { + this.isCopyleft = isCopyleft; + } + + public void setDeprecated(final boolean isDeprecated) { + this.isDeprecated = isDeprecated; + } + + @Finder(query = "from License l where l.shortName = :shortName") + public License findByShortName(@Named("shortName") final String shortName) { + return null; + } + + @Finder(query = "from License") + public List<License> getAll() { + return null; + } + + @Finder(query = "from License where isCC = true") + public List<License> getCC() { + return null; + } + + @Finder(query = "from License where isCC = false") + public List<License> getNotCC() { + return null; + } +} Copied: trunk/src/main/java/cc/kune/domain/Properties.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Properties.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Properties.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Properties.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,80 @@ +package cc.kune.domain; + +import java.util.HashMap; +import java.util.Map; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.MapKey; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +import cc.kune.domain.utils.HasId; + +/** + * Properties defined for some elements (identified by the group) + * + */ +@Entity +@Table(name = "properties") +public class Properties implements HasId { + + @Id + @GeneratedValue + private Long id; + + /** + * Every list of properties are from a unique PropertyGroup (like User + * properties, or Group properties) + * + */ + @NotNull + @ManyToOne + private final PropertyGroup pgroup; + + @OneToMany(cascade = CascadeType.ALL) + @MapKey(name = "property") + // @Cascade( { org.hibernate.annotations.CascadeType.DELETE_ORPHAN }) + // @OnDelete(action = OnDeleteAction.CASCADE) + private Map<Property, PropertySetted> list; + + public Properties() { + this(null); + } + + public Properties(final PropertyGroup group) { + pgroup = group; + list = new HashMap<Property, PropertySetted>(); + } + + // @Finder(query = + // "SELECT p FROM Properties ps JOIN ps.list p WHERE p.property.name = :pname") + // public PropertySetted find(@Named("pname") final String key) { + // return null; + // } + + public Long getId() { + return id; + } + + public Map<Property, PropertySetted> getList() { + return list; + } + + public PropertyGroup getPgroup() { + return pgroup; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setList(final Map<Property, PropertySetted> list) { + this.list = list; + } + +} Copied: trunk/src/main/java/cc/kune/domain/Property.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Property.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Property.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Property.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,217 @@ +package cc.kune.domain; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +import org.hibernate.annotations.Index; + +import cc.kune.domain.utils.HasId; + +import com.google.gwt.user.client.rpc.IsSerializable; +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "property") +// @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +public class Property implements HasId { + + public enum Type implements IsSerializable { + STRING, ENUM, BOOL, LIST, HIDDEN + } + + @Id + @GeneratedValue + // (strategy = GenerationType.TABLE) + private Long id; + + /** + * Required "symbolic" name of the user preference; displayed to the user + * during editing if no display_name is defined. Must contain only letters, + * number and underscores, i.e. the regular expression ^[a-zA-Z0-9_]+$. Must + * be unique. + **/ + @Index(name = "propname") + @Column(unique = true) + @Pattern(regexp = "^[a-zA-Z0-9_]+$", message = "The name can only contain Western characters, numbers, and dashes") + private String name; + + /** + * Optional string to display alongside the user preferences in the edit + * window (in google gadgets must be unique). + **/ + private String displayName; + + /** + * Optional string that indicates the data type of this attribute. Can be + * string, bool, enum, hidden (final a string that is not visible or user + * editable), or list (final dynamic array generated from user input). The + * default is string. + **/ + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Type datatype; + + /** + * Optional boolean argument (true or false) indicating whether this user + * preference is required. The default is false. + **/ + @Basic + private boolean required; + + /** + * Optional string that indicates a user preference's default value. + **/ + private String defaultValue; + + /** + * Optional string list that indicates enum valid values. + **/ + @Basic + private ArrayList<String> enumValues; + + @NotNull + @ManyToOne + private PropertyGroup pgroup; + + @NotNull + @ManyToOne + private PropertySubgroup sgroup; + + public Property() { + this(null, null, Type.STRING, false, null, new ArrayList<String>(), null, null); + } + + public Property(final Property prop) { + this.name = prop.getName(); + this.required = prop.getRequired(); + this.datatype = prop.getDatatype(); + this.defaultValue = prop.getDefaultValue(); + this.displayName = prop.getDisplayName(); + this.enumValues = prop.getEnumValues(); + this.pgroup = prop.getPgroup(); + this.sgroup = prop.getSgroup(); + } + + public Property(final String name, final String displayName, final Type datatype, final boolean required, + final String defaultValue, final ArrayList<String> enumValues, final PropertyGroup pgroup, + final PropertySubgroup sgroup) { + this.name = name; + this.displayName = displayName; + this.datatype = datatype; + this.required = required; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + this.pgroup = pgroup; + this.sgroup = sgroup; + } + + public Property(final String name, final String displayName, final Type datatype, final boolean required, + final String defaultValue, final PropertyGroup pgroup, final PropertySubgroup sgroup) { + this(name, displayName, datatype, required, defaultValue, new ArrayList<String>(), pgroup, sgroup); + } + + @Finder(query = "SELECT p FROM Property p JOIN p.pgroup g WHERE g = :pgroup") + public List<Property> find(@Named("pgroup") final PropertyGroup pGroup) { + return null; + } + + @Finder(query = "SELECT p.name FROM Property p JOIN p.sgroup g WHERE g = :sgroup") + public List<String> find(@Named("sgroup") final PropertySubgroup sGroup) { + return null; + } + + @Finder(query = "FROM Property p WHERE p.name = :name") + public Property find(@Named("name") final String name) { + return null; + } + + @Finder(query = "FROM Property") + public List<Property> getAll() { + return null; + } + + public Type getDatatype() { + return datatype; + } + + public String getDefaultValue() { + return defaultValue; + } + + public String getDisplayName() { + return displayName; + } + + public ArrayList<String> getEnumValues() { + return enumValues; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public PropertyGroup getPgroup() { + return pgroup; + } + + public boolean getRequired() { + return required; + } + + public PropertySubgroup getSgroup() { + return sgroup; + } + + public void setDatatype(final Type datatype) { + this.datatype = datatype; + } + + public void setDefaultValue(final String defaultValue) { + this.defaultValue = defaultValue; + } + + public void setDisplayName(final String displayName) { + this.displayName = displayName; + } + + public void setEnumValues(final ArrayList<String> enumValues) { + this.enumValues = enumValues; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setName(final String name) { + this.name = name; + } + + public void setPgroup(final PropertyGroup pgroup) { + this.pgroup = pgroup; + } + + public void setRequired(final boolean required) { + this.required = required; + } + + public void setSgroup(final PropertySubgroup sgroup) { + this.sgroup = sgroup; + } +} Copied: trunk/src/main/java/cc/kune/domain/PropertyGroup.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/PropertyGroup.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/PropertyGroup.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/PropertyGroup.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,94 @@ +package cc.kune.domain; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "property_group") +public class PropertyGroup implements HasId { + + @Id + @GeneratedValue + private Long id; + + @OneToMany(mappedBy = "pgroup") + @OnDelete(action = OnDeleteAction.CASCADE) + private List<Property> propertyList; + + @OneToMany(mappedBy = "pgroup") + @OnDelete(action = OnDeleteAction.CASCADE) + private List<Properties> propertiesList; + + @NotNull + @Column(unique = true) + private String name; + + public PropertyGroup() { + this(null); + } + + public PropertyGroup(final String name) { + this.name = name; + propertyList = new ArrayList<Property>(); + propertiesList = new ArrayList<Properties>(); + } + + @Finder(query = "FROM PropertyGroup pg WHERE pg.name = :groupname") + public PropertyGroup find(@Named("groupname") final String groupName) { + return null; + } + + @Finder(query = "FROM PropertyGroup") + public List<PropertyGroup> getAll() { + return null; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public List<Properties> getPropertiesList() { + return propertiesList; + } + + public List<Property> getPropertyList() { + return propertyList; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setName(final String name) { + this.name = name; + } + + public void setPropertiesList(final List<Properties> propertiesList) { + this.propertiesList = propertiesList; + } + + public void setPropertyList(final List<Property> propertyList) { + this.propertyList = propertyList; + } + +} Copied: trunk/src/main/java/cc/kune/domain/PropertySetted.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/PropertySetted.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/PropertySetted.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/PropertySetted.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,97 @@ +package cc.kune.domain; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +import cc.kune.domain.Property.Type; +import cc.kune.domain.utils.HasId; + +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "property_setted") +public class PropertySetted implements HasId { + + @Id + @GeneratedValue + private Long id; + + private String value; + + @NotNull + @ManyToOne + private final Property property; + + public PropertySetted() { + this(null, null); + } + + public PropertySetted(final Property property, final String value) { + this.value = value; + this.property = property; + } + + @Finder(query = "FROM PropertySetted") + public List<PropertySetted> getAll() { + return null; + } + + public Type getDatatype() { + return property.getDatatype(); + } + + public String getDefaultValue() { + return property.getDefaultValue(); + } + + public String getDisplayName() { + return property.getDisplayName(); + } + + public ArrayList<String> getEnumValues() { + return property.getEnumValues(); + } + + public Long getId() { + return id; + } + + public String getName() { + return property.getName(); + } + + public PropertyGroup getPgroup() { + return property.getPgroup(); + } + + public Property getProperty() { + return property; + } + + public boolean getRequired() { + return property.getRequired(); + } + + public PropertySubgroup getSgroup() { + return property.getSgroup(); + } + + public String getValue() { + return value; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setValue(final String value) { + this.value = value; + } +} Copied: trunk/src/main/java/cc/kune/domain/PropertySubgroup.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/PropertySubgroup.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/PropertySubgroup.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/PropertySubgroup.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,74 @@ +package cc.kune.domain; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; + +import cc.kune.domain.utils.HasId; + +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "property_subgroup") +public class PropertySubgroup implements HasId { + + @Id + @GeneratedValue + private Long id; + + @NotNull + @Column(unique = true) + private String name; + + @OneToMany(mappedBy = "sgroup") + @OnDelete(action = OnDeleteAction.CASCADE) + private List<Property> properties; + + public PropertySubgroup() { + this.name = null; + this.properties = new ArrayList<Property>(); + } + + public PropertySubgroup(final String name) { + this.name = name; + } + + @Finder(query = "FROM PropertySubgroup") + public List<PropertySubgroup> getAll() { + return null; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public List<Property> getProperties() { + return properties; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setName(final String name) { + this.name = name; + } + + public void setProperties(final List<Property> properties) { + this.properties = properties; + } +} Copied: trunk/src/main/java/cc/kune/domain/Rate.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Rate.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Rate.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Rate.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,120 @@ +/* + * + * 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.domain; + +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + +import org.hibernate.validator.constraints.Range; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Table(name = "rates", uniqueConstraints = { @UniqueConstraint(columnNames = { "content_id", "rater_id" }) }) +public class Rate { + @Id + @GeneratedValue + Long id; + + @ManyToOne + Content content; + + @ManyToOne + User rater; + + @Range(min = 0, max = 5) + Double value; + + @Basic(optional = false) + private final Long createdOn; + + public Rate() { + this(null, null, null); + } + + public Rate(final User rater, final Content content, final Double value) { + this.rater = rater; + this.content = content; + this.value = value; + this.createdOn = System.currentTimeMillis(); + } + + @Finder(query = "SELECT AVG(r.value) FROM Rate r WHERE r.content = :content") + public Double calculateRate(@Named("content") final Content content) { + return null; + } + + @Finder(query = "SELECT count(*) FROM Rate r WHERE r.content = :content") + public Long calculateRateNumberOfUsers(@Named("content") final Content content) { + return null; + } + + @Finder(query = "SELECT r FROM Rate r WHERE r.rater = :user AND r.content = :content") + public Rate find(@Named("user") final User user, @Named("content") final Content content) { + return null; + } + + public Content getContent() { + return content; + } + + public Long getCreatedOn() { + return createdOn; + } + + public Long getId() { + return id; + } + + public User getRater() { + return rater; + } + + public Double getValue() { + return value; + } + + public void setContent(final Content content) { + this.content = content; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setRater(final User rater) { + this.rater = rater; + } + + public void setValue(final Double value) { + this.value = value; + } + + @Override + public String toString() { + return "Rate[" + getRater() + " to " + content.getStateTokenEncoded() + "rated: " + getValue() + "]"; + } +} Copied: trunk/src/main/java/cc/kune/domain/Revision.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Revision.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Revision.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Revision.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,161 @@ +/* + * + * 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.domain; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.Lob; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; + +import org.hibernate.search.annotations.ContainedIn; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.FieldBridge; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Store; + +import cc.kune.domain.utils.DataFieldBridge; + +@Entity +@Table(name = "revisions") +@Indexed +public class Revision { + @Id + @GeneratedValue + @DocumentId + private Long id; + + @Field(index = Index.TOKENIZED, store = Store.NO) + String title; + + // http://www.hibernate.org/112.html + @Lob + @Column(length = 2147483647) + @Field(index = Index.TOKENIZED, store = Store.NO) + @FieldBridge(impl = DataFieldBridge.class) + char[] body; + + @OneToOne + private User editor; + + @Basic(optional = false) + private Long createdOn; + + @Version + private int version; + + @ContainedIn + @ManyToOne + @JoinColumn + private Content content; + + @OneToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + private Revision previous; + + public Revision() { + this(null); + } + + public Revision(final Content content) { + this.content = content; + createdOn = System.currentTimeMillis(); + } + + public Long getId() { + return id; + } + + public void setId(final Long id) { + this.id = id; + } + + public User getEditor() { + return editor; + } + + public void setEditor(final User editor) { + this.editor = editor; + } + + public Long getCreatedOn() { + return createdOn; + } + + public void setCreatedOn(final Long modifiedOn) { + this.createdOn = modifiedOn; + } + + public int getVersion() { + return version; + } + + public void setVersion(final int version) { + this.version = version; + } + + public Revision getPrevious() { + return previous; + } + + public void setPrevious(final Revision previous) { + this.previous = previous; + } + + public Content getContent() { + return content; + } + + public void setContent(final Content content) { + this.content = content; + } + + public String getTitle() { + return title; + } + + public void setTitle(final String title) { + this.title = title; + } + + public char[] getBody() { + return body; + } + + public void setBody(final String body) { + this.body = body.toCharArray(); + } + + @Transient + public boolean isLast() { + return content.getLastRevision().equals(this); + } + +} Copied: trunk/src/main/java/cc/kune/domain/SocialNetwork.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetwork.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/SocialNetwork.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/SocialNetwork.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,144 @@ +/* + * + * 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.domain; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +import cc.kune.core.shared.domain.SocialNetworkVisibility; + +@Entity +@Table(name = "social_networks") +public class SocialNetwork { + public static final SocialNetwork EMPTY = new SocialNetwork(SocialNetworkVisibility.onlyadmins); + + @Id + @GeneratedValue + Long id; + + @OneToOne(cascade = CascadeType.ALL) + AccessLists accessLists; + + @OneToOne(cascade = CascadeType.ALL) + GroupList pendingCollaborators; + + SocialNetworkVisibility visibility; + + public SocialNetwork() { + accessLists = new AccessLists(); + pendingCollaborators = new GroupList(); + visibility = SocialNetworkVisibility.anyone; + } + + public SocialNetwork(SocialNetworkVisibility visibility) { + accessLists = new AccessLists(); + pendingCollaborators = new GroupList(); + this.visibility = visibility; + } + + public void addAdmin(final Group group) { + accessLists.addAdmin(group); + } + + public void addCollaborator(final Group group) { + accessLists.addEditor(group); + } + + public void addPendingCollaborator(final Group group) { + pendingCollaborators.add(group); + } + + public void addViewer(final Group group) { + accessLists.addViewer(group); + } + + public AccessLists getAccessLists() { + return accessLists; + } + + public Long getId() { + return id; + } + + public GroupList getPendingCollaborators() { + return pendingCollaborators; + } + + public SocialNetworkVisibility getVisibility() { + return visibility; + } + + public boolean isAdmin(final Group group) { + return accessLists.getAdmins().includes(group); + } + + public boolean isCollab(final Group group) { + return accessLists.getEditors().includes(group); + } + + public boolean isPendingCollab(final Group group) { + return pendingCollaborators.getList().contains(group); + } + + public boolean isViewer(final Group group) { + return accessLists.getViewers().includes(group); + } + + public void removeAdmin(final Group group) { + accessLists.removeAdmin(group); + } + + public void removeCollaborator(final Group group) { + accessLists.removeEditor(group); + } + + public void removePendingCollaborator(final Group group) { + pendingCollaborators.getList().remove(group); + } + + public void removeViewer(final Group group) { + accessLists.removeViewer(group); + } + + public void setAccessLists(final AccessLists accessList) { + this.accessLists = accessList; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setPendingCollaborators(final GroupList pendingCollaborators) { + this.pendingCollaborators = pendingCollaborators; + } + + public void setVisibility(SocialNetworkVisibility visibility) { + this.visibility = visibility; + } + + @Override + public String toString() { + return "SocialNetwork[accessList: " + accessLists + "; pendingsCollabs: " + pendingCollaborators + "]"; + } +} Copied: trunk/src/main/java/cc/kune/domain/Tag.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/Tag.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/Tag.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/Tag.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,96 @@ +/* + * + * 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.domain; + +import javax.persistence.Basic; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Store; + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Indexed +@Table(name = "tags") +public class Tag implements HasId { + + @Id + @GeneratedValue + @DocumentId + private Long id; + + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(unique = true) + private String name; + + @Basic(optional = false) + private final Long createdOn; + + public Tag() { + this(null); + } + + public Tag(final String name) { + this.name = name; + this.createdOn = System.currentTimeMillis(); + } + + @Finder(query = "FROM Tag g WHERE g.name = :name") + public Tag findByTagName(@Named("name") final String tag) { + return null; + } + + public Long getCreatedOn() { + return createdOn; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setName(final String name) { + this.name = name; + } + + @Override + public String toString() { + return "Tag[" + getName() + "]"; + } + +} Copied: trunk/src/main/java/cc/kune/domain/TagUserContent.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/TagUserContent.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/TagUserContent.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/TagUserContent.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,120 @@ +package cc.kune.domain; + +import java.util.List; + +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.IndexedEmbedded; + +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +//See: +//http://openjpa.apache.org/docs/latest/manual/manual.html#jpa_langref_resulttype +@NamedQueries({ + @NamedQuery(name = "tagsgrouped", query = "SELECT NEW cc.kune.core.shared.domain.TagCount(t.name, COUNT(tuc.content.id)) " + + "FROM TagUserContent tuc JOIN tuc.tag t WHERE tuc.content.container.owner = :group " + + "GROUP BY t.name ORDER BY t.name"), + @NamedQuery(name = "tagsmaxgrouped", query = "SELECT Count(tuc.content.id) FROM TagUserContent tuc JOIN tuc.tag t WHERE tuc.content.container.owner = :group GROUP BY t.name ORDER BY count(*) DESC LIMIT 0,1"), + @NamedQuery(name = "tagsmingrouped", query = "SELECT Count(tuc.content.id) FROM TagUserContent tuc JOIN tuc.tag t WHERE tuc.content.container.owner = :group GROUP BY t.name ORDER BY count(*) ASC LIMIT 0,1") }) +@Entity +@Indexed +@Table(name = "tag_user_content") +public class TagUserContent implements HasId { + public static final String TAGSGROUPED = "tagsgrouped"; + public static final String TAGSMINGROUPED = "tagsmingrouped"; + public static final String TAGSMAXGROUPED = "tagsmaxgrouped"; + + @Id + @GeneratedValue + @DocumentId + private Long id; + + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private Tag tag; + + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private Content content; + + @IndexedEmbedded + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + private User user; + + @Basic(optional = false) + private final Long createdOn; + + public TagUserContent() { + this(null, null, null); + } + + public TagUserContent(final Tag tag, final User user, final Content content) { + this.tag = tag; + this.user = user; + this.content = content; + this.createdOn = System.currentTimeMillis(); + } + + @Finder(query = "FROM TagUserContent t WHERE t.user = :user AND t.content = :content") + public List<TagUserContent> find(@Named("user") final User user, @Named("content") final Content content) { + return null; + } + + @Finder(query = "SELECT t.tag FROM TagUserContent t WHERE t.user = :user AND t.content = :content") + public List<Tag> findTags(@Named("user") final User user, @Named("content") final Content content) { + return null; + } + + public Content getContent() { + return content; + } + + public Long getCreatedOn() { + return createdOn; + } + + public Long getId() { + return id; + } + + public Tag getTag() { + return tag; + } + + public User getUser() { + return user; + } + + public void setContent(final Content content) { + this.content = content; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setTag(final Tag tag) { + this.tag = tag; + } + + public void setUser(final User user) { + this.user = user; + } +} Copied: trunk/src/main/java/cc/kune/domain/ToolConfiguration.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/ToolConfiguration.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/ToolConfiguration.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/ToolConfiguration.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,70 @@ +/* + * + * 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.domain; + +import javax.persistence.CascadeType; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +@Entity +@Table(name = "tool_configurations") +public class ToolConfiguration { + + @Id + @GeneratedValue + private Long id; + private boolean enabled; + + @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST }) + private Container root; + + public ToolConfiguration() { + enabled = true; + } + + public Long getId() { + return id; + } + + public Container getRoot() { + return root; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(final boolean enabled) { + this.enabled = enabled; + } + + public void setId(final Long id) { + this.id = id; + } + + public Container setRoot(final Container root) { + this.root = root; + return root; + } + +} Copied: trunk/src/main/java/cc/kune/domain/User.java (from rev 1164, trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/User.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/User.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,289 @@ +/* + * + * 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.domain; + +import java.util.List; +import java.util.TimeZone; + +import javax.persistence.Basic; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +import org.hibernate.annotations.OnDelete; +import org.hibernate.annotations.OnDeleteAction; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Store; +import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constraints.Length; + +import cc.kune.core.shared.domain.UserBuddiesVisibility; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.utils.HasId; + +import com.google.inject.name.Named; +import com.wideplay.warp.persist.dao.Finder; + +@Entity +@Indexed +@Table(name = "kusers") +public class User implements HasId { + + // see: http://docs.codehaus.org/display/PICO/Good+Citizen: + // Never expect or return null + public static final User UNKNOWN_USER = new User(); + public static final String PROPS_ID = "userprops"; + + public static boolean isKnownUser(final User user) { + return !user.equals(UNKNOWN_USER); + } + + @Id + @DocumentId + @GeneratedValue + private Long id; + + @Column(unique = true, nullable = false) + @Email + @Length(min = 1) + private String email; + + @Column(nullable = false) + @Length(min = 6, max = 40) + private String password; + + @OneToOne(cascade = CascadeType.REMOVE) + private Group userGroup; + + @Field(index = Index.TOKENIZED, store = Store.NO) + @Column(nullable = false) + @Length(min = 3, max = 50) + private String name; + + @Field(index = Index.UN_TOKENIZED, store = Store.NO) + @Column(unique = true) + // http://www.hibernate.org/hib_docs/validator/reference/en/html/validator-def… + @Length(min = 3, max = 15) + @Pattern(regexp = "^[a-z0-9_\\-]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes") + private String shortName; + + @ManyToOne + @NotNull + private I18nLanguage language; + + @ManyToOne + @NotNull + private I18nCountry country; + + @NotNull + private TimeZone timezone; + + @OneToOne(cascade = CascadeType.REMOVE) + private final CustomProperties customProperties; + + private UserBuddiesVisibility buddiesVisibility; + + @Basic(optional = false) + private final Long createdOn; + + @Basic + private Long lastLogin; + + @OneToOne + @OnDelete(action = OnDeleteAction.CASCADE) + private Properties properties; + + public User() { + this(null, null, null, null, null, null, null, null); + } + + public User(final String shortName, final String longName, final String email, final String passwd, + final I18nLanguage language, final I18nCountry country, final TimeZone timezone) { + this(shortName, longName, email, passwd, language, country, timezone, null); + } + + public User(final String shortName, final String longName, final String email, final String passwd, + final I18nLanguage language, final I18nCountry country, final TimeZone timezone, final Properties properties) { + this.shortName = shortName; + this.name = longName; + this.email = email; + this.password = passwd; + this.userGroup = null; + this.language = language; + this.country = country; + this.timezone = timezone; + customProperties = new CustomProperties(); + buddiesVisibility = UserBuddiesVisibility.anyone; + this.createdOn = System.currentTimeMillis(); + this.lastLogin = null; + this.properties = properties; + } + + @Finder(query = "from User") + public List<User> getAll() { + return null; + } + + public UserBuddiesVisibility getBuddiesVisibility() { + return buddiesVisibility; + } + + @Finder(query = "from User where email = :email") + public User getByEmail(@Named("email") final String email) { + return null; + } + + @Finder(query = "from User where shortName = :shortName") + public User getByShortName(@Named("shortName") final String shortName) { + return null; + } + + public I18nCountry getCountry() { + return country; + } + + public Long getCreatedOn() { + return createdOn; + } + + public CustomProperties getCustomProperties() { + return customProperties; + } + + public String getEmail() { + return email; + } + + public boolean getHasLogo() { + return hasLogo(); + } + + public Long getId() { + return id; + } + + public I18nLanguage getLanguage() { + return language; + } + + public Long getLastLogin() { + return lastLogin; + } + + public String getName() { + return name; + } + + public String getPassword() { + return password; + } + + public Properties getProperties() { + return properties; + } + + public String getShortName() { + return shortName; + } + + @Transient + public StateToken getStateToken() { + return userGroup.getStateToken(); + } + + public TimeZone getTimezone() { + return timezone; + } + + public Group getUserGroup() { + return userGroup; + } + + @Transient + public boolean hasLogo() { + return getUserGroup().hasLogo(); + } + + public void setBuddiesVisibility(final UserBuddiesVisibility buddiesVisibility) { + this.buddiesVisibility = buddiesVisibility; + } + + public void setCountry(final I18nCountry country) { + this.country = country; + } + + public void setEmail(final String email) { + this.email = email; + } + + public void setId(final Long id) { + this.id = id; + } + + public void setLanguage(final I18nLanguage language) { + this.language = language; + } + + public void setLastLogin(final Long lastLogin) { + this.lastLogin = lastLogin; + } + + public void setName(final String name) { + this.name = name; + } + + public void setPassword(final String password) { + this.password = password; + // http://www.dynamic.net.au/christos/crypt/ + // Use UnixCrypt (jetty) + } + + public void setProperties(final Properties properties) { + this.properties = properties; + } + + public void setShortName(final String shortName) { + this.shortName = shortName; + } + + public void setTimezone(final TimeZone timezone) { + this.timezone = timezone; + } + + public void setUserGroup(final Group userGroup) { + this.userGroup = userGroup; + } + + @Override + public String toString() { + return "User[" + shortName + "]"; + } +} Copied: trunk/src/main/java/cc/kune/domain/utils/DataFieldBridge.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/DataFieldBridge.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/DataFieldBridge.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/DataFieldBridge.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,32 @@ +/* + * + * 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.domain.utils; + +import org.hibernate.search.bridge.builtin.StringBridge; + +public class DataFieldBridge extends StringBridge { + public String objectToString(final Object object) { + if (object != null) { + return new String((char[]) object); + } else { + return null; + } + } +} Copied: trunk/src/main/java/cc/kune/domain/utils/HasId.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasId.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/HasId.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/HasId.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,26 @@ +/* + * + * 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.domain.utils; + +public interface HasId { + Long getId(); + + void setId(Long id); +} Copied: trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java (from rev 1163, trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/HasStateToken.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,28 @@ +/* + * + * 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.domain.utils; + +import cc.kune.core.shared.dto.StateToken; + +public interface HasStateToken { + + StateToken getStateToken(); + +} Copied: trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/server/domain/SocialNetworkData.java) =================================================================== --- trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java (rev 0) +++ trunk/src/main/java/cc/kune/domain/utils/SocialNetworkData.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -0,0 +1,137 @@ +/* + * + * 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.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.domain.SocialNetwork; + +public class SocialNetworkData { + private SocialNetworkVisibility socialNetworkVisibility; + private SocialNetwork groupMembers; + private ParticipationData userParticipation; + private UserBuddiesVisibility userBuddiesVisibility; + private UserBuddiesData userBuddies; + private AccessRights groupRights; + private boolean isBuddiesVisible; + private boolean isMembersVisible; + + public SocialNetworkData() { + this(null, null, null, null, null, null, false, false); + } + + public SocialNetworkData(SocialNetworkVisibility socialNetworkVisibility, SocialNetwork groupMembers, + ParticipationData userParticipation, UserBuddiesVisibility userBuddiesVisibility, + UserBuddiesData userBuddies, AccessRights groupRights, boolean isBuddiesVisible, boolean isMembersVisible) { + this.socialNetworkVisibility = socialNetworkVisibility; + this.groupMembers = groupMembers; + this.userParticipation = userParticipation; + this.userBuddiesVisibility = userBuddiesVisibility; + this.userBuddies = userBuddies; + this.groupRights = groupRights; + this.isBuddiesVisible = isBuddiesVisible; + this.isMembersVisible = isMembersVisible; + } + + public SocialNetwork getGroupMembers() { + return groupMembers; + } + + public AccessRights getGroupRights() { + return groupRights; + } + + public boolean getIsBuddiesVisible() { + return isBuddiesVisible; + } + + public boolean getIsMembersVisible() { + return isMembersVisible; + } + + public SocialNetworkVisibility getSocialNetworkVisibility() { + return socialNetworkVisibility; + } + + public UserBuddiesData getUserBuddies() { + return userBuddies; + } + + public UserBuddiesVisibility getUserBuddiesVisibility() { + return userBuddiesVisibility; + } + + public ParticipationData getUserParticipation() { + return userParticipation; + } + + public boolean isBuddiesVisible() { + return isBuddiesVisible; + } + + public boolean isMembersVisible() { + return isMembersVisible; + } + + public void setBuddiesVisible(boolean isBuddiesVisible) { + this.isBuddiesVisible = isBuddiesVisible; + } + + public void setGroupMembers(SocialNetwork groupMembers) { + this.groupMembers = groupMembers; + } + + public void setGroupRights(AccessRights groupRights) { + this.groupRights = groupRights; + } + + public void setIsBuddiesVisible(boolean isBuddiesVisible) { + setBuddiesVisible(isBuddiesVisible); + } + + public void setIsMembersVisible(boolean isMembersVisible) { + setMembersVisible(isMembersVisible); + } + + public void setMembersVisible(boolean isMembersVisible) { + this.isMembersVisible = isMembersVisible; + } + + public void setSocialNetworkVisibility(SocialNetworkVisibility socialNetworkVisibility) { + this.socialNetworkVisibility = socialNetworkVisibility; + } + + public void setUserBuddies(UserBuddiesData userBuddies) { + this.userBuddies = userBuddies; + } + + public void setUserBuddiesVisibility(UserBuddiesVisibility userBuddiesVisibility) { + this.userBuddiesVisibility = userBuddiesVisibility; + } + + public void setUserParticipation(ParticipationData userParticipation) { + this.userParticipation = userParticipation; + } + +} Modified: trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,13 +21,6 @@ import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; @@ -35,7 +28,14 @@ import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.ToolConfiguration; +import cc.kune.domain.User; import com.google.inject.Inject; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -34,8 +34,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.dto.AccessRolDTO; -import cc.kune.core.shared.dto.ContentStatusDTO; import cc.kune.core.shared.dto.StateToken; import com.calclab.suco.client.events.Listener; @@ -72,7 +72,7 @@ public void onEvent(final StateToken token) { deferredWrapper.get().addCommand(new Listener0() { public void onEvent() { - String subject = i18n.t("Chat about: [%s]", session.getContentState().getTitle()); + final String subject = i18n.t("Chat about: [%s]", session.getContentState().getTitle()); chatEngineProvider.get().joinRoom(token.toString().replaceAll("\\.", "-"), subject, session.getCurrentUserInfo().getShortName()); chatEngineProvider.get().show(); @@ -86,10 +86,10 @@ chatAbout.setLeftSeparator(ActionToolbarButtonSeparator.fill); chatAbout.setEnableCondition(notDeleted()); - ActionToolbarButtonDescriptor<StateToken> joinRoom = new ActionToolbarButtonDescriptor<StateToken>( + final ActionToolbarButtonDescriptor<StateToken> joinRoom = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Viewer, AbstractFoldableContentActions.CONTENT_TOPBAR, new Listener<StateToken>() { public void onEvent(final StateToken token) { - ChatEngine chatEngine = chatEngineProvider.get(); + final ChatEngine chatEngine = chatEngineProvider.get(); chatEngine.joinRoom(session.getContainerState().getContainer().getName(), session.getCurrentUserInfo().getShortName()); chatEngine.show(); @@ -99,7 +99,7 @@ joinRoom.setToolTip(i18n.t("Enter in this chat room")); joinRoom.setMustBeAuthenticated(true); - ActionToolbarButtonDescriptor<StateToken> addRoom = new ActionToolbarButtonDescriptor<StateToken>( + final ActionToolbarButtonDescriptor<StateToken> addRoom = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Administrator, AbstractFoldableContentActions.CONTEXT_TOPBAR, new Listener<StateToken>() { public void onEvent(final StateToken token) { addRoomProvider.get().show(); @@ -125,7 +125,7 @@ return new ActionEnableCondition<StateToken>() { public boolean mustBeEnabled(final StateToken token) { final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( - ContentStatusDTO.inTheDustbin)); + ContentStatus.inTheDustbin)); return isNotDeleted; } }; Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,17 +21,17 @@ import org.ourproject.kune.chat.client.ChatClientTool; import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.tool.ServerToolTarget; import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; +import cc.kune.domain.User; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -23,12 +23,6 @@ import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; @@ -36,7 +30,13 @@ import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; +import cc.kune.domain.User; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -20,11 +20,6 @@ package org.ourproject.kune.gallery.server; import org.ourproject.kune.platf.server.content.ContainerManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; @@ -33,6 +28,11 @@ import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; +import cc.kune.domain.User; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/InitData.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,13 +22,14 @@ import java.util.ArrayList; import java.util.List; -import org.ourproject.kune.platf.server.domain.ExtMediaDescrip; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.License; import org.ourproject.kune.platf.server.tool.ToolSimple; import org.ourproject.kune.platf.server.users.UserInfo; +import cc.kune.domain.ExtMediaDescrip; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.License; + public class InitData { private String siteUrl; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/UserSession.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.platf.server; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.UserManager; +import cc.kune.domain.User; + import com.google.inject.Inject; import com.google.inject.servlet.SessionScoped; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.AccessLists; +import cc.kune.domain.User; public interface AccessRightsService { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessRightsServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,12 +22,13 @@ import java.util.ArrayList; import java.util.HashSet; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.GroupList; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Group; +import cc.kune.domain.GroupList; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; + import com.google.inject.Singleton; @Singleton 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,11 +19,11 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.User; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.User; public interface AccessService { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,13 +19,13 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.User; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Singleton; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.server.domain.Comment; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.Rate; -import org.ourproject.kune.platf.server.domain.User; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.Comment; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Rate; +import cc.kune.domain.User; public interface FinderService { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -25,12 +25,6 @@ import org.ourproject.kune.platf.server.content.CommentManager; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Comment; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.Rate; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.RateManager; @@ -40,6 +34,12 @@ import cc.kune.core.client.errors.NoDefaultContentException; import cc.kune.core.client.errors.ToolNotFoundException; import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.Comment; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Rate; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Singleton; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -29,14 +29,14 @@ 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.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.User; 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.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,11 +19,11 @@ \*/ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.server.domain.Comment; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.Manager; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.Comment; +import cc.kune.domain.User; public interface CommentManager extends Manager<Comment, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,13 +22,13 @@ import javax.persistence.EntityManager; import org.ourproject.kune.platf.server.access.FinderService; -import org.ourproject.kune.platf.server.domain.Comment; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.DefaultManager; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.Comment; +import cc.kune.domain.Content; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,14 +19,14 @@ */ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.manager.Manager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Group; +import cc.kune.domain.I18nLanguage; public interface ContainerManager extends Manager<Container, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -28,11 +28,6 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.manager.file.FileUtils; import org.ourproject.kune.platf.server.manager.impl.DefaultManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; @@ -41,6 +36,11 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.NameInUseException; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.I18nLanguage; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,16 +21,16 @@ import java.util.Date; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.RateResult; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.Manager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.RateResult; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.User; public interface ContentManager extends Manager<Content, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -29,14 +29,6 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; import org.ourproject.kune.platf.server.access.FinderService; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.Rate; -import org.ourproject.kune.platf.server.domain.RateResult; -import org.ourproject.kune.platf.server.domain.Revision; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.TagUserContentManager; import org.ourproject.kune.platf.server.manager.file.FileUtils; import org.ourproject.kune.platf.server.manager.impl.DefaultManager; @@ -48,6 +40,14 @@ import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.client.errors.UserNotFoundException; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.RateResult; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.Rate; +import cc.kune.domain.Revision; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.User; + public interface CreationService { Content createContent(String title, String body, User user, Container container, String typeId); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CreationServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.User; + import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -20,11 +20,11 @@ package org.ourproject.kune.platf.server.i18n; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import cc.kune.core.client.utils.TextUtils; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -6,17 +6,6 @@ import javax.persistence.NoResultException; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.I18nTranslation; -import org.ourproject.kune.platf.server.domain.License; -import org.ourproject.kune.platf.server.domain.Property; -import org.ourproject.kune.platf.server.domain.PropertyGroup; -import org.ourproject.kune.platf.server.domain.PropertySubgroup; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.I18nCountryManager; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; @@ -29,7 +18,18 @@ import org.ourproject.kune.platf.server.properties.DatabaseProperties; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.GroupType; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.I18nTranslation; +import cc.kune.domain.License; +import cc.kune.domain.Property; +import cc.kune.domain.PropertyGroup; +import cc.kune.domain.PropertySubgroup; +import cc.kune.domain.User; import com.calclab.emiteuimodule.client.SubscriptionMode; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ExtMediaDescripManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.ExtMediaDescrip; +import cc.kune.domain.ExtMediaDescrip; public interface ExtMediaDescripManager extends Manager<ExtMediaDescrip, Long> { List<ExtMediaDescrip> getAll(); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,15 +21,15 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; public interface GroupManager extends Manager<Group, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nCountryManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.I18nCountry; +import cc.kune.domain.I18nCountry; public interface I18nCountryManager extends Manager<I18nCountry, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nLanguageManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.I18nLanguage; +import cc.kune.domain.I18nLanguage; public interface I18nLanguageManager extends Manager<I18nLanguage, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,10 +22,10 @@ import java.util.HashMap; import java.util.List; -import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.I18nTranslation; public interface I18nTranslationManager extends Manager<I18nTranslation, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/LicenseManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.License; +import cc.kune.domain.License; public interface LicenseManager { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertiesManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertiesManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertiesManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,8 +2,8 @@ import java.util.HashMap; -import org.ourproject.kune.platf.server.domain.Properties; -import org.ourproject.kune.platf.server.domain.PropertySetted; +import cc.kune.domain.Properties; +import cc.kune.domain.PropertySetted; public interface PropertiesManager extends Manager<Properties, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyGroupManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyGroupManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyGroupManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.PropertyGroup; +import cc.kune.domain.PropertyGroup; public interface PropertyGroupManager extends Manager<PropertyGroup, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertyManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.Property; +import cc.kune.domain.Property; public interface PropertyManager extends Manager<Property, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySettedManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySettedManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySettedManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.PropertySetted; +import cc.kune.domain.PropertySetted; public interface PropertySettedManager extends Manager<PropertySetted, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySubgroupManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySubgroupManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/PropertySubgroupManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.PropertySubgroup; +import cc.kune.domain.PropertySubgroup; public interface PropertySubgroupManager extends Manager<PropertySubgroup, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/RateManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Rate; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.Content; +import cc.kune.domain.Rate; +import cc.kune.domain.User; + public interface RateManager extends Manager<Rate, Long> { Rate find(User user, Content content); 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.SocialNetworkData; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.domain.Group; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; +import cc.kune.domain.utils.SocialNetworkData; public interface SocialNetworkManager extends Manager<SocialNetwork, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.Tag; +import cc.kune.domain.Tag; public interface TagManager extends Manager<Tag, Long> { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,13 +2,14 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.Tag; -import org.ourproject.kune.platf.server.domain.TagCloudResult; -import org.ourproject.kune.platf.server.domain.TagUserContent; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Tag; +import cc.kune.domain.TagUserContent; +import cc.kune.domain.User; + public interface TagUserContentManager extends Manager<TagUserContent, Long> { List<Tag> find(User user, Content content); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -7,16 +7,16 @@ import javax.persistence.NoResultException; import javax.persistence.Query; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.Tag; -import org.ourproject.kune.platf.server.domain.TagCloudResult; -import org.ourproject.kune.platf.server.domain.TagCount; -import org.ourproject.kune.platf.server.domain.TagUserContent; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.DefaultManager; import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.TagCount; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Tag; +import cc.kune.domain.TagUserContent; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/ToolConfigurationManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; +import cc.kune.domain.ToolConfiguration; public interface ToolConfigurationManager extends Manager<ToolConfiguration, Long> { ToolConfiguration persist(ToolConfiguration config); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,11 +19,11 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.sn.UserBuddiesData; import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.domain.User; public interface UserManager { /** 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -28,10 +28,10 @@ import javax.servlet.http.HttpServletResponse; import org.ourproject.kune.platf.client.ui.download.FileConstants; -import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; import cc.kune.core.shared.dto.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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -34,12 +34,12 @@ 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.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.Group; import com.google.inject.Inject; import com.wideplay.warp.persist.TransactionType; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -39,12 +39,12 @@ import org.ourproject.kune.platf.server.auth.Authorizated; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.Content; 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.domain.BasicMimeType; +import cc.kune.domain.Content; import com.google.inject.Inject; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -35,16 +35,16 @@ import org.ourproject.kune.platf.server.auth.Authorizated; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.FileManager; 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.i18n.I18nTranslationService; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.servlet.RequestScoped; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ExtMediaDescripManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -4,9 +4,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.ExtMediaDescrip; import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; +import cc.kune.domain.ExtMediaDescrip; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -31,15 +31,6 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; import org.hibernate.exception.ConstraintViolationException; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.AdmissionType; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.GroupListMode; -import org.ourproject.kune.platf.server.domain.License; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.LicenseManager; import org.ourproject.kune.platf.server.properties.DatabaseProperties; @@ -52,7 +43,16 @@ import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.dto.GroupType; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.License; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.ToolConfiguration; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nCountryManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nCountryManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nCountryManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -23,9 +23,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.I18nCountry; import org.ourproject.kune.platf.server.manager.I18nCountryManager; +import cc.kune.domain.I18nCountry; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nLanguageManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nLanguageManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nLanguageManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -23,9 +23,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; +import cc.kune.domain.I18nLanguage; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -25,13 +25,13 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.utils.TextUtils; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/LicenseManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -23,10 +23,11 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.License; import org.ourproject.kune.platf.server.manager.LicenseManager; import org.ourproject.kune.platf.server.properties.DatabaseProperties; +import cc.kune.domain.License; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -6,12 +6,12 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.Properties; -import org.ourproject.kune.platf.server.domain.Property; -import org.ourproject.kune.platf.server.domain.PropertySetted; import org.ourproject.kune.platf.server.manager.PropertiesManager; import cc.kune.core.client.errors.UnknownPropertyException; +import cc.kune.domain.Properties; +import cc.kune.domain.Property; +import cc.kune.domain.PropertySetted; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyGroupManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyGroupManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyGroupManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,11 +2,12 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.Properties; -import org.ourproject.kune.platf.server.domain.PropertyGroup; import org.ourproject.kune.platf.server.manager.PropertiesManager; import org.ourproject.kune.platf.server.manager.PropertyGroupManager; +import cc.kune.domain.Properties; +import cc.kune.domain.PropertyGroup; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertyManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,9 +2,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.Property; import org.ourproject.kune.platf.server.manager.PropertyManager; +import cc.kune.domain.Property; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,9 +2,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.PropertySetted; import org.ourproject.kune.platf.server.manager.PropertySettedManager; +import cc.kune.domain.PropertySetted; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySubgroupManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySubgroupManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertySubgroupManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,9 +2,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.PropertySubgroup; import org.ourproject.kune.platf.server.manager.PropertySubgroupManager; +import cc.kune.domain.PropertySubgroup; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/RateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/RateManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/RateManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,11 +22,12 @@ import javax.persistence.EntityManager; import javax.persistence.NoResultException; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Rate; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.RateManager; +import cc.kune.domain.Content; +import cc.kune.domain.Rate; +import cc.kune.domain.User; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -26,14 +26,6 @@ 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.domain.AdmissionType; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.GroupListMode; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.SocialNetworkData; -import org.ourproject.kune.platf.server.domain.SocialNetworkVisibility; -import org.ourproject.kune.platf.server.domain.User; -import org.ourproject.kune.platf.server.domain.UserBuddiesVisibility; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.sn.ParticipationData; @@ -45,8 +37,16 @@ import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.errors.LastAdminInGroupException; import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.domain.AdmissionType; +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.dto.GroupType; import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.domain.Group; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; +import cc.kune.domain.utils.SocialNetworkData; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/TagManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/TagManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/TagManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,9 +21,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.Tag; import org.ourproject.kune.platf.server.manager.TagManager; +import cc.kune.domain.Tag; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/ToolConfigurationManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,9 +21,10 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; +import cc.kune.domain.ToolConfiguration; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -34,11 +34,6 @@ import org.jivesoftware.smack.packet.RosterPacket.ItemType; import org.ourproject.kune.chat.server.managers.ChatConnection; import org.ourproject.kune.chat.server.managers.XmppManager; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.Properties; -import org.ourproject.kune.platf.server.domain.PropertyGroup; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.I18nCountryManager; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.PropertiesManager; @@ -49,6 +44,11 @@ import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.Properties; +import cc.kune.domain.PropertyGroup; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -25,7 +25,7 @@ import net.sf.dozer.util.mapping.MappingException; import net.sf.dozer.util.mapping.converters.CustomConverter; -import org.ourproject.kune.platf.server.domain.GroupListMode; +import cc.kune.core.shared.domain.GroupListMode; public class GroupListModeConverter implements CustomConverter { private final HashMap<String, GroupListMode> stringToEnum; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,14 +22,14 @@ import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SearchResultDTO; +import cc.kune.domain.Container; +import cc.kune.domain.Content; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.rest; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -28,6 +27,7 @@ import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SearchResultDTO; +import cc.kune.domain.Group; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,7 +22,6 @@ import java.util.List; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -30,6 +29,7 @@ import cc.kune.core.shared.dto.I18nTranslationDTO; import cc.kune.core.shared.dto.SearchResultDTO; +import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -20,7 +20,6 @@ package org.ourproject.kune.platf.server.rest; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -28,6 +27,7 @@ import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SearchResultDTO; +import cc.kune.domain.User; import com.google.inject.Inject; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -39,15 +39,6 @@ import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.content.ContentUtils; import org.ourproject.kune.platf.server.content.CreationService; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Comment; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.RateResult; -import org.ourproject.kune.platf.server.domain.TagCloudResult; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.TagUserContentManager; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -62,19 +53,24 @@ 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.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.dto.CommentDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.ContentStatusDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; -import cc.kune.core.shared.dto.RateResultDTO; 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; -import cc.kune.core.shared.dto.TagCloudResultDTO; -import cc.kune.core.shared.dto.TagCountDTO; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Comment; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; @@ -244,7 +240,7 @@ @Authenticated(mandatory = false) @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_ONLY) - public TagCloudResultDTO getSummaryTags(final String userHash, final StateToken groupToken) { + public TagCloudResult getSummaryTags(final String userHash, final StateToken groupToken) { final Group group = groupManager.findByShortName(groupToken.getGroup()); return getSummaryTags(group); } @@ -263,14 +259,13 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer) @Transactional(type = TransactionType.READ_WRITE) - public RateResultDTO rateContent(final String userHash, final StateToken token, final Double value) + public RateResult rateContent(final String userHash, final StateToken token, final Double value) throws DefaultException { final User rater = getCurrentUser(); final Long contentId = ContentUtils.parseId(token.getDocument()); if (isUserLoggedIn()) { - final RateResult result = contentManager.rateContent(rater, contentId, value); - return mapper.map(result, RateResultDTO.class); + return contentManager.rateContent(rater, contentId, value); } else { throw new AccessViolationException(); } @@ -353,9 +348,9 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) - public StateAbstractDTO setStatus(final String userHash, final StateToken token, final ContentStatusDTO status) { - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected) - || status.equals(ContentStatusDTO.inTheDustbin)) { + public StateAbstractDTO setStatus(final String userHash, final StateToken token, final ContentStatus status) { + if (status.equals(ContentStatus.publishedOnline) || status.equals(ContentStatus.rejected) + || status.equals(ContentStatus.inTheDustbin)) { throw new AccessViolationException(); } final Content content = contentManager.setStatus(ContentUtils.parseId(token.getDocument()), @@ -366,8 +361,7 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) - public StateAbstractDTO setStatusAsAdmin(final String userHash, final StateToken token, - final ContentStatusDTO status) { + public StateAbstractDTO setStatusAsAdmin(final String userHash, final StateToken token, final ContentStatus status) { final Content content = contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); return getState(getCurrentUser(), content); @@ -376,7 +370,7 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) - public TagCloudResultDTO setTags(final String userHash, final StateToken token, final String tags) + public TagCloudResult setTags(final String userHash, final StateToken token, final String tags) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); final User user = getCurrentUser(); @@ -443,10 +437,9 @@ return mapState(state, user); } - private TagCloudResultDTO getSummaryTags(final Group group) { + private TagCloudResult getSummaryTags(final Group group) { final TagCloudResult result = tagManager.getTagCloudResultByGroup(group); - return new TagCloudResultDTO(mapper.mapList(result.getTagCountList(), TagCountDTO.class), result.getMaxValue(), - result.getMinValue()); + return result; } private UserSession getUserSession() { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -26,21 +26,19 @@ import org.ourproject.kune.platf.server.auth.Authorizated; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.content.ContentUtils; -import org.ourproject.kune.platf.server.domain.AdmissionType; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.SocialNetworkVisibility; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.mapper.Mapper; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.client.rpcservices.GroupService; -import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.SocialNetworkVisibility; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.LicenseDTO; -import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; @@ -126,7 +124,7 @@ @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) @Transactional(type = TransactionType.READ_WRITE) public void setGroupNewMembersJoiningPolicy(final String userHash, final StateToken token, - final AdmissionTypeDTO admissionPolicy) { + final AdmissionType admissionPolicy) { final Group group = groupManager.findByShortName(token.getGroup()); group.setAdmissionType(AdmissionType.valueOf(admissionPolicy.toString())); } @@ -135,7 +133,7 @@ @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) @Transactional(type = TransactionType.READ_WRITE) public void setSocialNetworkVisibility(final String userHash, final StateToken token, - final SocialNetworkVisibilityDTO visibility) { + final SocialNetworkVisibility visibility) { final Group group = groupManager.findByShortName(token.getGroup()); group.getSocialNetwork().setVisibility(SocialNetworkVisibility.valueOf(visibility.toString())); } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -26,8 +26,6 @@ import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.auth.Authenticated; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -36,6 +34,8 @@ import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.rpcservices.I18nService; import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; import com.google.inject.Provider; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -24,8 +24,6 @@ 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.domain.Group; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -35,6 +33,8 @@ 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; import com.google.inject.Inject; import com.google.inject.Provider; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -28,9 +28,6 @@ import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.auth.Authorizated; import org.ourproject.kune.platf.server.auth.SessionService; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.User; -import org.ourproject.kune.platf.server.domain.UserBuddiesVisibility; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.mapper.Mapper; @@ -41,10 +38,12 @@ 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.UserBuddiesVisibility; import cc.kune.core.shared.dto.StateToken; -import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Provider; @@ -135,7 +134,7 @@ @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.group) @Transactional(type = TransactionType.READ_WRITE) public void setBuddiesVisibility(final String userHash, final StateToken groupToken, - final UserBuddiesVisibilityDTO visibility) { + final UserBuddiesVisibility visibility) { final UserSession userSession = getUserSession(); final User user = userSession.getUser(); if (!groupToken.getGroup().equals(user.getShortName())) { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/ParticipationData.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.Group; +import cc.kune.domain.Group; public class ParticipationData { private List<Group> groupsIsAdmin; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/sn/UserBuddiesData.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.List; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.User; public class UserBuddiesData { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,13 +22,13 @@ import java.util.List; import org.ourproject.kune.platf.server.access.AccessRights; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.SocialNetworkData; 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.domain.Group; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.utils.SocialNetworkData; public abstract class StateAbstract { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContainer.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -20,12 +20,13 @@ package org.ourproject.kune.platf.server.state; import org.ourproject.kune.platf.server.access.AccessRights; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.License; -import org.ourproject.kune.platf.server.domain.TagCloudResult; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.License; + public class StateContainer extends StateAbstract { private I18nLanguage language; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateContent.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -23,10 +23,12 @@ import java.util.List; import org.ourproject.kune.platf.server.access.AccessRights; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.User; + + public class StateContent extends StateContainer { private String documentId; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.platf.server.state; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.User; + public interface StateService { StateContainer create(User userLogged, Container container); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,17 +21,17 @@ import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.License; -import org.ourproject.kune.platf.server.domain.Revision; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.TagUserContentManager; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.License; +import cc.kune.domain.Revision; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/tool/ServerTool.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.platf.server.tool; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; + /** * * Tools must have a corresponding module and must be marked asEagerSingleton. Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/Link.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/Link.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/Link.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.Tag; +import cc.kune.domain.Tag; public class Link { private String shortName; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,10 +21,10 @@ import java.util.List; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.Group; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.User; public class UserInfo { private User user; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,9 +19,9 @@ */ package org.ourproject.kune.platf.server.users; -import org.ourproject.kune.platf.server.domain.User; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.User; public interface UserInfoService { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,14 +19,14 @@ */ package org.ourproject.kune.platf.server.users; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.sn.ParticipationData; import cc.kune.core.client.errors.DefaultException; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -23,14 +23,6 @@ import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.ContentStatus; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.GroupListMode; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.ToolConfigurationManager; import org.ourproject.kune.platf.server.tool.ServerTool; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; @@ -38,7 +30,15 @@ import cc.kune.core.client.errors.ContainerNotPermittedException; import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; +import cc.kune.domain.User; import com.google.inject.Inject; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -54,9 +54,9 @@ 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.ContentStatus; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.ContentSimpleDTO; -import cc.kune.core.shared.dto.ContentStatusDTO; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -145,15 +145,14 @@ protected abstract void createActions(); protected void createContentModeratedActions(final String parentMenuTitle, final String... contentsModerated) { - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatusDTO.publishedOnline, + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Published online"), ContentStatus.publishedOnline, contentsModerated); - createSetStatusAction(AccessRolDTO.Editor, i18n.t("Editing in progress"), ContentStatusDTO.editingInProgress, + createSetStatusAction(AccessRolDTO.Editor, i18n.t("Editing in progress"), ContentStatus.editingInProgress, contentsModerated); - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatusDTO.rejected, - contentsModerated); + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("Rejected"), ContentStatus.rejected, contentsModerated); createSetStatusAction(AccessRolDTO.Editor, i18n.t("Submitted for publish"), - ContentStatusDTO.submittedForEvaluation, contentsModerated); - createSetStatusAction(AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), ContentStatusDTO.inTheDustbin, + ContentStatus.submittedForEvaluation, contentsModerated); + createSetStatusAction(AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), ContentStatus.inTheDustbin, contentsModerated); } @@ -493,7 +492,7 @@ } protected void createSetStatusAction(final AccessRolDTO rol, final String textDescription, - final ContentStatusDTO status, final String[] contentsModerated) { + final ContentStatus status, final String[] contentsModerated) { final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( rol, CONTENT_TOPBAR, new Listener<StateToken>() { public void onEvent(final StateToken stateToken) { @@ -502,7 +501,7 @@ }, "ContentRadioStatus", new RadioMustBeChecked() { public boolean mustBeChecked() { if (session.getContainerState() instanceof StateContentDTO) { - final ContentStatusDTO currentStatus = session.getContentState().getStatus(); + final ContentStatus currentStatus = session.getContentState().getStatus(); return status.equals(currentStatus); } return false; @@ -521,7 +520,7 @@ final boolean mustShow = !session.getCurrentUserInfo().getShowDeletedContent(); session.getCurrentUserInfo().setShowDeletedContent(mustShow); if (!mustShow && session.isCurrentStateAContent() - && session.getContentState().getStatus().equals(ContentStatusDTO.inTheDustbin)) { + && session.getContentState().getStatus().equals(ContentStatus.inTheDustbin)) { stateManager.gotoToken(session.getCurrentStateToken().getGroup()); } contextNavigator.clear(); @@ -622,7 +621,7 @@ return new ActionEnableCondition<StateToken>() { public boolean mustBeEnabled(final StateToken token) { final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( - ContentStatusDTO.inTheDustbin)); + ContentStatus.inTheDustbin)); return isNotDeleted; } }; @@ -637,7 +636,7 @@ } } - private void setContentStatus(final ContentStatusDTO status, final StateToken stateToken) { + private void setContentStatus(final ContentStatus status, final StateToken stateToken) { final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { public void onSuccess(final StateAbstractDTO state) { if (session.inSameToken(stateToken)) { @@ -648,8 +647,8 @@ contextNavigator.setItemStatus(stateToken, status); } }; - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected) - || status.equals(ContentStatusDTO.inTheDustbin)) { + if (status.equals(ContentStatus.publishedOnline) || status.equals(ContentStatus.rejected) + || status.equals(ContentStatus.inTheDustbin)) { contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); } else { contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; -import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateToken; @@ -45,7 +45,7 @@ void setEditOnNextStateChange(boolean edit); - void setItemStatus(StateToken stateToken, ContentStatusDTO status); + void setItemStatus(StateToken stateToken, ContentStatus status); void setState(StateContainerDTO state, boolean selectItem); } 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.StateToken; public class ContextNavigatorItem { @@ -30,21 +30,21 @@ private final String iconUrl; private final String text; private final String tooltip; - private final ContentStatusDTO contentStatusDTO; + private final ContentStatus contentStatus; private final StateToken token; private final ActionItemCollection<StateToken> actionCollection; private final boolean allowDrag; private final boolean allowDrop; public ContextNavigatorItem(final String id, final String parentId, final String iconUrl, final String text, - final String tooltip, final ContentStatusDTO contentStatusDTO, final StateToken token, - final boolean allowDrag, final boolean allowDrop, final ActionItemCollection<StateToken> actionCollection) { + final String tooltip, final ContentStatus contentStatus, final StateToken token, final boolean allowDrag, + final boolean allowDrop, final ActionItemCollection<StateToken> actionCollection) { this.id = id; this.parentId = parentId; this.iconUrl = iconUrl; this.text = text; this.tooltip = tooltip; - this.contentStatusDTO = contentStatusDTO; + this.contentStatus = contentStatus; this.token = token; this.allowDrag = allowDrag; this.allowDrop = allowDrop; @@ -55,8 +55,8 @@ return actionCollection; } - public ContentStatusDTO getContentStatus() { - return contentStatusDTO; + public ContentStatus getContentStatus() { + return contentStatus; } public String getIconUrl() { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.StateToken; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -200,7 +200,7 @@ this.isEditable = editable; } - public void setItemStatus(final String id, final ContentStatusDTO status) { + public void setItemStatus(final String id, final ContentStatus status) { setNodeStatus(getNode(id), status); } @@ -316,7 +316,7 @@ this.mustFireOnTextChange = fireOnTextChange; } - private void setNodeStatus(final TreeNode node, final ContentStatusDTO status) { + private void setNodeStatus(final TreeNode node, final ContentStatus status) { switch (status) { case publishedOnline: node.setCls("k-ctn-status-normal"); 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -38,12 +38,12 @@ 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.dto.BasicMimeTypeDTO; 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.ContentStatusDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; @@ -159,7 +159,7 @@ editOnNextStateChange = edit; } - public void setItemStatus(final StateToken stateToken, final ContentStatusDTO status) { + public void setItemStatus(final StateToken stateToken, final ContentStatus status) { clear(); refreshState(); } @@ -177,7 +177,7 @@ } private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId, - final BasicMimeTypeDTO mimeType, final ContentStatusDTO status, final StateToken stateToken, + final BasicMimeTypeDTO mimeType, final ContentStatus status, final StateToken stateToken, final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) { final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, true); @@ -189,7 +189,7 @@ && rights.isAdministrable(), capabilitiesRegistry.isDropable(contentTypeId) && rights.isAdministrable(), actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, false)); - if (status.equals(ContentStatusDTO.inTheDustbin) && !session.getShowDeletedContent()) { + if (status.equals(ContentStatus.inTheDustbin) && !session.getShowDeletedContent()) { // Don't show } else { view.addItem(item); @@ -227,9 +227,10 @@ private void createChildItems(final ContainerDTO container, final AccessRightsDTO containerRights) { for (final ContainerSimpleDTO siblingFolder : container.getChilds()) { - addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatusDTO.publishedOnline, - siblingFolder.getStateToken(), siblingFolder.getStateToken().copy().setFolder( - siblingFolder.getParentFolderId()), containerRights, false); + addItem(siblingFolder.getName(), siblingFolder.getTypeId(), null, ContentStatus.publishedOnline, + siblingFolder.getStateToken(), + siblingFolder.getStateToken().copy().setFolder(siblingFolder.getParentFolderId()), containerRights, + false); } for (final ContentSimpleDTO content : container.getContents()) { addItem(content.getTitle(), content.getTypeId(), content.getMimeType(), content.getStatus(), @@ -244,7 +245,7 @@ final StateToken parentStateToken = state.copy().clearDocument().setFolder(folder.getParentFolderId()); if (folder.getParentFolderId() != null) { - addItem(folder.getName(), folder.getTypeId(), null, ContentStatusDTO.publishedOnline, folderStateToken, + addItem(folder.getName(), folder.getTypeId(), null, ContentStatus.publishedOnline, folderStateToken, parentStateToken, rights, false); } else { // Root must be already created @@ -268,8 +269,8 @@ private String getTooltip(final StateToken token, final BasicMimeTypeDTO mimeType) { if (mimeType != null && (mimeType.isImage() || mimeType.isPdf())) { - return KuneUiUtils.genQuickTipWithImage(downloadUtilsProvider.get().getImageResizedUrl(token, - ImageSize.thumb), session.getImgCropsize()); + return KuneUiUtils.genQuickTipWithImage( + downloadUtilsProvider.get().getImageResizedUrl(token, ImageSize.thumb), session.getImgCropsize()); } else { return null; } @@ -325,7 +326,7 @@ } else { rights = containerRights; final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), - container.getTypeId(), null, ContentStatusDTO.publishedOnline, container.getStateToken(), + container.getTypeId(), null, ContentStatus.publishedOnline, container.getStateToken(), container.getStateToken().copy().setFolder(container.getParentFolderId()), containerRights, false); actionItems.addAll(containerActions); } 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.View; -import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.StateToken; public interface ContextNavigatorView extends View { @@ -42,7 +42,7 @@ void setEditable(boolean editable); - void setItemStatus(String id, ContentStatusDTO status); + void setItemStatus(String id, ContentStatus status); void setItemText(String id, String text); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -31,11 +31,11 @@ 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.TagCloudResult; import cc.kune.core.shared.dto.AccessListsDTO; import cc.kune.core.shared.dto.I18nLanguageDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.core.shared.dto.TagCloudResultDTO; import cc.kune.core.shared.dto.UserSimpleDTO; import com.calclab.suco.client.ioc.Provider; @@ -182,8 +182,8 @@ NotifyUser.showProgressProcessing(); final StateContainerDTO currentState = session.getContentState(); contentServiceProvider.get().setTags(session.getUserHash(), currentState.getStateToken(), tagsString, - new AsyncCallbackSimple<TagCloudResultDTO>() { - public void onSuccess(final TagCloudResultDTO result) { + new AsyncCallbackSimple<TagCloudResult>() { + public void onSuccess(final TagCloudResult result) { tagsSummaryProvider.get().setGroupTags(result); NotifyUser.hideProgress(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -26,7 +26,7 @@ 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.dto.RateResultDTO; +import cc.kune.core.shared.domain.RateResult; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -97,8 +97,8 @@ NotifyUser.showProgressProcessing(); final StateAbstractDTO currentState = session.getCurrentState(); contentServiceProvider.get().rateContent(session.getUserHash(), currentState.getStateToken(), newValue, - new AsyncCallbackSimple<RateResultDTO>() { - public void onSuccess(final RateResultDTO result) { + new AsyncCallbackSimple<RateResult>() { + public void onSuccess(final RateResult result) { NotifyUser.hideProgress(); // NotifyUser.info(i18n.t("Content rated")); if (currentState.getStateToken().equals(session.getCurrentStateToken())) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.RateResultDTO; +import cc.kune.core.shared.domain.RateResult; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContentDTO; @@ -33,7 +33,7 @@ private RateView view; private final ContentCapabilitiesRegistry capabilitiesRegistry; - public RatePresenter(final StateManager stateManager, ContentCapabilitiesRegistry capabilitiesRegistry) { + public RatePresenter(final StateManager stateManager, final ContentCapabilitiesRegistry capabilitiesRegistry) { this.capabilitiesRegistry = capabilitiesRegistry; stateManager.onStateChanged(new Listener<StateAbstractDTO>() { public void onEvent(final StateAbstractDTO state) { @@ -50,7 +50,7 @@ this.view = view; } - public void setRate(RateResultDTO result) { + public void setRate(final RateResult result) { setRate(result.getRateByUsers(), result.getRate()); } @@ -58,15 +58,15 @@ view.setVisible(visible); } - private void setRate(Integer rateByUsers, Double rate) { + private void setRate(final Integer rateByUsers, final Double rate) { view.setVisible(true); view.setRate(rate); view.setByUsers(rateByUsers); } private void setState(final StateContentDTO state) { - Integer rateByUsers = state.getRateByUsers(); - Double rate = state.getRate(); + final Integer rateByUsers = state.getRateByUsers(); + final Double rate = state.getRate(); if (capabilitiesRegistry.isRateable(state.getTypeId())) { setRate(rateByUsers, rate); } else { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.View; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.GroupListDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; @@ -61,8 +61,8 @@ final String publicUrl = stateTokenUtils.getPublicUrl(token); view.setContentGotoPublicUrl(publicUrl); if (state instanceof StateContentDTO) { - StateContentDTO content = (StateContentDTO) state; - if (content.getStatus().equals(ContentStatusDTO.publishedOnline)) { + final StateContentDTO content = (StateContentDTO) state; + if (content.getStatus().equals(ContentStatus.publishedOnline)) { view.setContentPublic(true); } else { view.setContentPublic(false); 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -41,12 +41,12 @@ 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.UserBuddiesVisibility; import cc.kune.core.shared.dto.AccessRightsDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.UserBuddiesDataDTO; -import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; import cc.kune.core.shared.dto.UserSimpleDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -138,8 +138,9 @@ } } toolbar.disableMenusAndClearButtons(); - toolbar.addActions(actionRegistry.getCurrentActions(session.getCurrentUser(), session.isLogged(), - state.getGroupRights(), true), ActionToolbar.IN_ANY); + toolbar.addActions( + actionRegistry.getCurrentActions(session.getCurrentUser(), session.isLogged(), + state.getGroupRights(), true), ActionToolbar.IN_ANY); toolbar.attach(); view.show(); } else { @@ -164,8 +165,7 @@ actionRegistry.addAction(addNewBuddiesAction); } - private void createSetBuddiesVisibilityAction(final String textDescription, - final UserBuddiesVisibilityDTO visibility) { + private void createSetBuddiesVisibilityAction(final String textDescription, final UserBuddiesVisibility visibility) { final ActionToolbarMenuRadioDescriptor<UserSimpleDTO> buddiesVisibilityAction = new ActionToolbarMenuRadioDescriptor<UserSimpleDTO>( AccessRolDTO.Administrator, buddiesBottom, new Listener<UserSimpleDTO>() { public void onEvent(final UserSimpleDTO parameter) { @@ -222,9 +222,9 @@ actionRegistry.addAction(go); createAddNewBuddiesAction(); - createSetBuddiesVisibilityAction(i18n.t("anyone"), UserBuddiesVisibilityDTO.anyone); - createSetBuddiesVisibilityAction(i18n.t("only your buddies"), UserBuddiesVisibilityDTO.yourbuddies); - createSetBuddiesVisibilityAction(i18n.t("only you"), UserBuddiesVisibilityDTO.onlyyou); + createSetBuddiesVisibilityAction(i18n.t("anyone"), UserBuddiesVisibility.anyone); + createSetBuddiesVisibilityAction(i18n.t("only your buddies"), UserBuddiesVisibility.yourbuddies); + createSetBuddiesVisibilityAction(i18n.t("only you"), UserBuddiesVisibility.onlyyou); } } 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -43,16 +43,16 @@ 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.AdmissionType; +import cc.kune.core.shared.domain.SocialNetworkVisibility; 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.AdmissionTypeDTO; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SocialNetworkDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateToken; @@ -173,14 +173,14 @@ // groupActionRegistry.addAction(unJoin); // groupActionRegistry.addAction(participate); - createSetMembersVisibilityAction(i18n.t("anyone"), SocialNetworkVisibilityDTO.anyone); - createSetMembersVisibilityAction(i18n.t("only members"), SocialNetworkVisibilityDTO.onlymembers); - createSetMembersVisibilityAction(i18n.t("only admins"), SocialNetworkVisibilityDTO.onlyadmins); - createNewMembersPolicyAction(i18n.t("moderate request to join"), AdmissionTypeDTO.Moderated); - createNewMembersPolicyAction(i18n.t("auto accept request to join"), AdmissionTypeDTO.Open); + createSetMembersVisibilityAction(i18n.t("anyone"), SocialNetworkVisibility.anyone); + createSetMembersVisibilityAction(i18n.t("only members"), SocialNetworkVisibility.onlymembers); + createSetMembersVisibilityAction(i18n.t("only admins"), SocialNetworkVisibility.onlyadmins); + createNewMembersPolicyAction(i18n.t("moderate request to join"), AdmissionType.Moderated); + createNewMembersPolicyAction(i18n.t("auto accept request to join"), AdmissionType.Open); } - private void createNewMembersPolicyAction(final String textDescription, final AdmissionTypeDTO admissionPolicy) { + private void createNewMembersPolicyAction(final String textDescription, final AdmissionType admissionPolicy) { final ActionToolbarMenuRadioDescriptor<StateToken> newMembersPolicy = new ActionToolbarMenuRadioDescriptor<StateToken>( AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { public void onEvent(final StateToken parameter) { @@ -204,8 +204,7 @@ groupActionRegistry.addAction(newMembersPolicy); } - private void createSetMembersVisibilityAction(final String textDescription, - final SocialNetworkVisibilityDTO visibility) { + private void createSetMembersVisibilityAction(final String textDescription, final SocialNetworkVisibility visibility) { final ActionToolbarMenuRadioDescriptor<StateToken> showMembers = new ActionToolbarMenuRadioDescriptor<StateToken>( AccessRolDTO.Administrator, membersBottom, new Listener<StateToken>() { public void onEvent(final StateToken parameter) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -19,10 +19,10 @@ */ package org.ourproject.kune.workspace.client.tags; -import cc.kune.core.shared.dto.TagCloudResultDTO; +import cc.kune.core.shared.domain.TagCloudResult; public interface TagsSummary { - void setGroupTags(TagCloudResultDTO tagCloud); + void setGroupTags(TagCloudResult tagCloud); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -25,10 +25,10 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.TagCount; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.TagCloudResultDTO; -import cc.kune.core.shared.dto.TagCountDTO; import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener; @@ -72,7 +72,7 @@ this.view = view; } - public void setGroupTags(final TagCloudResultDTO tagCloud) { + public void setGroupTags(final TagCloudResult tagCloud) { setCloud(tagCloud); view.expand(); } @@ -87,14 +87,14 @@ } } - private void setCloud(final TagCloudResultDTO tagCloudResult) { + private void setCloud(final TagCloudResult tagCloudResult) { // Inspired in snippet http://www.bytemycode.com/snippets/snippet/415/ view.clear(); final int max = tagCloudResult.getMaxValue(); final int min = tagCloudResult.getMinValue(); final int diff = max - min; final int step = (MAXSIZE - MINSIZE) / (diff == 0 ? 1 : diff); - for (final TagCountDTO tagCount : tagCloudResult.getTagCountList()) { + for (final TagCount tagCount : tagCloudResult.getTagCountList()) { final int size = Math.round((MINSIZE + (tagCount.getCount().floatValue() - min) * step)); view.addTag(tagCount.getName(), tagCount.getCount(), "kune-ft" + size + "px"); } Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-16 02:20:33 UTC (rev 1167) @@ -14,23 +14,23 @@ <a>licenses</a> <b>licenses</b> <a-hint> cc.kune.core.shared.dto.LicenseDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.License </b-hint> + <b-hint> cc.kune.domain.License </b-hint> </field> <field> <a>languages</a> <b>languages</b> <a-hint> cc.kune.core.shared.dto.I18nLanguageSimpleDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.I18nLanguage </b-hint> + <b-hint> cc.kune.domain.I18nLanguage </b-hint> </field> <field> <a>countries</a> <b>countries</b> <a-hint> cc.kune.core.shared.dto.I18nCountryDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.I18nCountry </b-hint> + <b-hint> cc.kune.domain.I18nCountry </b-hint> </field> </mapping> <mapping> - <class-a>org.ourproject.kune.platf.server.domain.Group</class-a> + <class-a>cc.kune.domain.Group</class-a> <class-b>cc.kune.core.shared.dto.GroupDTO</class-b> <field type="one-way"> <a>hasLogo</a> @@ -39,12 +39,12 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.GroupListDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.GroupList </class-b> + <class-b> cc.kune.domain.GroupList </class-b> <field> <a>list</a> <b>list</b> <a-hint> cc.kune.core.shared.dto.GroupDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.Group </b-hint> + <b-hint> cc.kune.domain.Group </b-hint> </field> <field custom-converter="org.ourproject.kune.platf.server.mapper.GroupListModeConverter"> @@ -54,24 +54,24 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.AccessListsDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.AccessLists </class-b> + <class-b> cc.kune.domain.AccessLists </class-b> <field> <a>admins</a> <b>admins</b> <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint> + <b-hint> cc.kune.domain.GroupList </b-hint> </field> <field> <a>editors</a> <b>editors</b> <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint> + <b-hint> cc.kune.domain.GroupList </b-hint> </field> <field> <a>viewers</a> <b>viewers</b> <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint> + <b-hint> cc.kune.domain.GroupList </b-hint> </field> </mapping> <mapping> @@ -85,18 +85,12 @@ <a>authors</a> <b>authors</b> <a-hint> cc.kune.core.shared.dto.UserSimpleDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.User </b-hint> + <b-hint> cc.kune.domain.User </b-hint> </field> </mapping> <mapping> <class-a>cc.kune.core.shared.dto.StateContainerDTO</class-a> <class-b>org.ourproject.kune.platf.server.state.StateContainer</class-b> - <field> - <a>tagCloudResult</a> - <b>tagCloudResult</b> - <a-hint> cc.kune.core.shared.dto.TagCloudResultDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.TagCloudResult </b-hint> - </field> </mapping> <mapping> <class-a>cc.kune.core.shared.dto.StateAbstractDTO</class-a> @@ -112,15 +106,15 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.BasicMimeTypeDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.BasicMimeType </class-b> + <class-b> cc.kune.domain.BasicMimeType </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.LicenseDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.License </class-b> + <class-b> cc.kune.domain.License </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ContainerSimpleDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.Container </class-b> + <class-b> cc.kune.domain.Container </class-b> <field> <a get-method="getStateToken">stateToken</a> <b>stateToken</b> @@ -128,7 +122,7 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ContentSimpleDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.Content </class-b> + <class-b> cc.kune.domain.Content </class-b> <field> <a>title</a> <b>lastRevision.title</b> @@ -139,7 +133,7 @@ </field> </mapping> <mapping type="one-way"> - <class-a> org.ourproject.kune.platf.server.domain.Content </class-a> + <class-a> cc.kune.domain.Content </class-a> <class-b>cc.kune.core.shared.dto.LinkDTO</class-b> <field> <a>lastRevision.title</a> @@ -156,24 +150,24 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.ContainerDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.Container </class-b> + <class-b> cc.kune.domain.Container </class-b> <field> <a>contents</a> <b>contents</b> <a-hint> cc.kune.core.shared.dto.ContentSimpleDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.Content </b-hint> + <b-hint> cc.kune.domain.Content </b-hint> </field> <field> <a>absolutePath</a> <b>absolutePath</b> <a-hint> cc.kune.core.shared.dto.ContainerSimpleDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.Container </b-hint> + <b-hint> cc.kune.domain.Container </b-hint> </field> <field> <a>childs</a> <b>childs</b> <a-hint> cc.kune.core.shared.dto.ContainerSimpleDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.Container </b-hint> + <b-hint> cc.kune.domain.Container </b-hint> </field> <field> <a get-method="getStateToken">stateToken</a> @@ -187,7 +181,7 @@ <a>user</a> <b>user</b> <a-hint> cc.kune.core.shared.dto.UserSimpleDTO </a-hint> - <b-hint> org.ourproject.kune.platf.server.domain.User </b-hint> + <b-hint> cc.kune.domain.User </b-hint> </field> </mapping> <mapping> @@ -196,14 +190,14 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.I18nLanguageDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.I18nLanguage </class-b> + <class-b> cc.kune.domain.I18nLanguage </class-b> </mapping> <mapping> <class-a> cc.kune.core.shared.dto.I18nCountryDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.I18nCountry </class-b> + <class-b> cc.kune.domain.I18nCountry </class-b> </mapping> <mapping> - <class-a>org.ourproject.kune.platf.server.domain.User</class-a> + <class-a>cc.kune.domain.User</class-a> <class-b>cc.kune.core.shared.dto.UserSimpleDTO</class-b> <field type="one-way"> <a>hasLogo</a> @@ -216,33 +210,21 @@ </mapping> <mapping> <class-a>cc.kune.core.shared.dto.TagDTO</class-a> - <class-b>org.ourproject.kune.platf.server.domain.Tag</class-b> + <class-b>cc.kune.domain.Tag</class-b> </mapping> <mapping> - <class-a> cc.kune.core.shared.dto.TagCloudResultDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.TagCloudResult </class-b> - </mapping> - <mapping> - <class-a> cc.kune.core.shared.dto.TagCountDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.TagCount </class-b> - </mapping> - <mapping> - <class-a> cc.kune.core.shared.dto.RateResultDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.RateResult </class-b> - </mapping> - <mapping> - <class-a> org.ourproject.kune.platf.server.domain.Comment </class-a> + <class-a> cc.kune.domain.Comment </class-a> <class-b> cc.kune.core.shared.dto.CommentDTO </class-b> <field> <a>author</a> <b>author</b> - <a-hint> org.ourproject.kune.platf.server.domain.User </a-hint> + <a-hint> cc.kune.domain.User </a-hint> <b-hint> cc.kune.core.shared.dto.UserSimpleDTO </b-hint> </field> <field> <a>childs</a> <b>childs</b> - <a-hint> org.ourproject.kune.platf.server.domain.Comment </a-hint> + <a-hint> cc.kune.domain.Comment </a-hint> <b-hint> cc.kune.core.shared.dto.CommentDTO </b-hint> </field> <field type="one-way"> @@ -260,35 +242,13 @@ </mapping> <mapping> <class-a>cc.kune.core.shared.dto.LinkDTO</class-a> - <class-b>org.ourproject.kune.platf.server.domain.User</class-b> + <class-b>cc.kune.domain.User</class-b> <field> <a>longName</a> <b>name</b> </field> </mapping> <mapping> - <class-a> cc.kune.core.shared.dto.ChatUserParamsDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.ChatUserParams </class-b> - </mapping> - <mapping> - <class-a> cc.kune.core.shared.dto.SocialNetworkVisibilityDTO </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.SocialNetworkVisibility </class-b> - </mapping> - <mapping> - <class-a> cc.kune.core.shared.dto.AdmissionTypeDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.AdmissionType </class-b> - </mapping> - <mapping> - <class-a> cc.kune.core.shared.dto.UserBuddiesVisibilityDTO </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.UserBuddiesVisibility </class-b> - </mapping> - <mapping> - <class-a> cc.kune.core.shared.dto.ContentStatusDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.ContentStatus </class-b> - </mapping> - <mapping> <class-a> cc.kune.core.shared.dto.AccessRolDTO </class-a> <class-b> org.ourproject.kune.platf.server.access.AccessRol </class-b> </mapping> @@ -302,6 +262,6 @@ </mapping> <mapping> <class-a> cc.kune.core.shared.dto.SocialNetworkDataDTO </class-a> - <class-b> org.ourproject.kune.platf.server.domain.SocialNetworkData </class-b> + <class-b> cc.kune.domain.utils.SocialNetworkData </class-b> </mapping> </mappings> \ No newline at end of file Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/main/resources/log4j.properties 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,5 +1,17 @@ -log4j.rootLogger=ERROR, stdout +log4j.rootLogger=error, stdout log4j.logger.org.ourproject=DEBUG; log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p - %m%n \ No newline at end of file + +# Print the date in ISO 8601 format +log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n + +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=application.log + +log4j.appender.R.MaxFileSize=100KB +# Keep one backup file +log4j.appender.R.MaxBackupIndex=1 + +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/DatabaseInitializationTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -12,16 +12,17 @@ import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.I18nCountryManager; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import org.ourproject.kune.platf.server.manager.LicenseManager; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; + import com.google.inject.Inject; import com.wideplay.warp.persist.Transactional; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,9 +1,6 @@ package org.ourproject.kune.platf.integration.content; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.List; @@ -15,14 +12,14 @@ import org.ourproject.kune.platf.integration.IntegrationTestHelper; 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.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.TagCloudResultDTO; -import cc.kune.core.shared.dto.TagCountDTO; import cc.kune.core.shared.dto.UserSimpleDTO; public class ContentServiceVariousTest extends ContentServiceIntegrationTest { @@ -151,9 +148,8 @@ @Test public void setTagsAndResults() throws Exception { contentService.setTags(getHash(), defaultContent.getStateToken(), "bfoo cfoa afoo2"); - final TagCloudResultDTO cloudResultDTO = contentService.getSummaryTags(getHash(), - defaultContent.getStateToken()); - checkResult(cloudResultDTO); + final TagCloudResult cloudResult = contentService.getSummaryTags(getHash(), defaultContent.getStateToken()); + checkResult(cloudResult); checkResult(((StateContentDTO) contentService.getContent(getHash(), defaultContent.getStateToken())).getTagCloudResult()); } @@ -207,22 +203,22 @@ assertEquals(newTitle, folderAgain.getContainer().getName()); } - private void checkResult(final TagCloudResultDTO cloudResultDTO) { - assertNotNull(cloudResultDTO.getTagCountList()); - final List<TagCountDTO> summaryTags = cloudResultDTO.getTagCountList(); + private void checkResult(final TagCloudResult cloudResult) { + assertNotNull(cloudResult.getTagCountList()); + final List<TagCount> summaryTags = cloudResult.getTagCountList(); assertEquals(3, summaryTags.size()); - TagCountDTO tagResultDTO = summaryTags.get(0); - assertEquals("afoo2", tagResultDTO.getName()); - assertEquals(1, (long) tagResultDTO.getCount()); + TagCount tagResult = summaryTags.get(0); + assertEquals("afoo2", tagResult.getName()); + assertEquals(1, (long) tagResult.getCount()); - tagResultDTO = summaryTags.get(1); - assertEquals("bfoo", tagResultDTO.getName()); - assertEquals(1, (long) tagResultDTO.getCount()); + tagResult = summaryTags.get(1); + assertEquals("bfoo", tagResult.getName()); + assertEquals(1, (long) tagResult.getCount()); - tagResultDTO = summaryTags.get(2); - assertEquals("cfoa", tagResultDTO.getName()); - assertEquals(1, (long) tagResultDTO.getCount()); + tagResult = summaryTags.get(2); + assertEquals("cfoa", tagResult.getName()); + assertEquals(1, (long) tagResult.getCount()); } } Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -7,14 +7,14 @@ import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.domain.AdmissionType; -import org.ourproject.kune.platf.server.domain.Group; import cc.kune.core.client.errors.UserMustBeLoggedException; import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.GroupType; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.domain.Group; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -11,12 +11,12 @@ import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import cc.kune.core.client.rpcservices.SiteService; import cc.kune.core.shared.dto.InitDataDTO; import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.domain.Group; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -8,7 +8,6 @@ import org.junit.Test; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.platf.server.properties.DatabaseProperties; @@ -26,6 +25,7 @@ import cc.kune.core.shared.dto.TimeZoneDTO; import cc.kune.core.shared.dto.UserDTO; import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.domain.Group; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkMembersTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -9,10 +9,11 @@ import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.UserSession; -import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.SocialNetworkManager; +import cc.kune.domain.Group; + import com.google.inject.Inject; import com.wideplay.warp.persist.Transactional; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/PersistencePreLoadedDataTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -9,14 +9,6 @@ import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.License; -import org.ourproject.kune.platf.server.domain.PropertyGroup; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.I18nCountryManager; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; @@ -24,6 +16,15 @@ import org.ourproject.kune.platf.server.manager.PropertyGroupManager; import org.ourproject.kune.platf.server.manager.UserManager; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.License; +import cc.kune.domain.PropertyGroup; +import cc.kune.domain.User; + import com.google.inject.Inject; public abstract class PersistencePreLoadedDataTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/TestDomainHelper.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -2,15 +2,16 @@ import java.util.TimeZone; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.AdmissionType; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.Revision; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.Revision; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; + public abstract class TestDomainHelper { public static AccessLists createAccessLists(final Group groupAdmin, final Group groupEditor, final Group groupViewer) { 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/access/AccessRightsServiceTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -6,11 +6,12 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.TestDomainHelper; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.SocialNetwork; import org.ourproject.kune.testhelper.ctx.DomainContext; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Group; +import cc.kune.domain.SocialNetwork; + public class AccessRightsServiceTest { private AccessRightsServiceDefault accessRightsManager; private Group group1; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -10,15 +10,15 @@ import org.ourproject.kune.platf.server.content.CommentManager; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.ToolConfiguration; import org.ourproject.kune.platf.server.manager.GroupManager; 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.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.ToolConfiguration; public class FinderTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/domain/GroupListTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -6,6 +6,10 @@ import org.junit.Before; import org.junit.Test; +import cc.kune.core.shared.domain.GroupListMode; +import cc.kune.domain.Group; +import cc.kune.domain.GroupList; + public class GroupListTest { private GroupList list; private Group includedGroup; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/finders/GroupFinderTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -6,8 +6,9 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.domain.Group; +import cc.kune.domain.Group; + import com.google.inject.Inject; public class GroupFinderTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/finders/LicenseFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/LicenseFinderTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/finders/LicenseFinderTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -9,9 +9,10 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.domain.License; import org.ourproject.kune.platf.server.properties.DatabaseProperties; +import cc.kune.domain.License; + import com.google.inject.Inject; public class LicenseFinderTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/finders/RateFinderTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -10,10 +10,11 @@ import org.junit.Test; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; import org.ourproject.kune.platf.server.TestDomainHelper; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Rate; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.Content; +import cc.kune.domain.Rate; +import cc.kune.domain.User; + import com.google.inject.Inject; public class RateFinderTest extends PersistencePreLoadedDataTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/finders/UserFinderTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/finders/UserFinderTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/finders/UserFinderTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -9,8 +9,9 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.domain.User; +import cc.kune.domain.User; + import com.google.inject.Inject; public class UserFinderTest extends PersistencePreLoadedDataTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/ContentManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -5,10 +5,12 @@ import org.junit.Test; import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.Content; + + public class ContentManagerTest extends PersistencePreLoadedDataTest { private static final String MIMETYPE = "image"; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -8,16 +8,16 @@ import org.apache.lucene.queryParser.ParseException; import org.junit.Test; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.EmailAddressInUseException; import cc.kune.core.client.errors.GroupNameInUseException; import cc.kune.core.client.errors.I18nNotFoundException; import cc.kune.core.shared.dto.GroupType; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Group; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; public class GroupManagerTest extends PersistencePreLoadedDataTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -10,11 +10,11 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.I18nTranslation; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.I18nTranslation; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/LicenseManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -7,8 +7,9 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.domain.License; +import cc.kune.domain.License; + import com.google.inject.Inject; public class LicenseManagerTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -7,8 +7,9 @@ import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; import org.ourproject.kune.platf.server.content.ContentManager; -import org.ourproject.kune.platf.server.domain.Tag; +import cc.kune.domain.Tag; + import com.google.inject.Inject; public class TagManagerTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/TagUserContentTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -8,9 +8,10 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.domain.Tag; -import org.ourproject.kune.platf.server.domain.TagUserContent; +import cc.kune.domain.Tag; +import cc.kune.domain.TagUserContent; + import com.google.inject.Inject; public class TagUserContentTest extends PersistencePreLoadedDataTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,22 +1,20 @@ package org.ourproject.kune.platf.server.manager; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; import java.util.TimeZone; import javax.persistence.EntityExistsException; +import javax.validation.ValidationException; import org.apache.lucene.queryParser.ParseException; -import org.hibernate.validator.InvalidStateException; import org.junit.Test; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; @@ -30,13 +28,13 @@ persist(user); } - @Test(expected = InvalidStateException.class) + @Test(expected = ValidationException.class) public void emailEmpty() { - user = new User("test1", "test1 name", "", "some passwd", english, gb, getTimeZone()); + user = new User("test1", "test1 name", null, "some passwd", english, gb, getTimeZone()); persist(user); } - @Test(expected = InvalidStateException.class) + @Test(expected = ValidationException.class) public void emailIncorrect() { user = new User("test1", "test1 name", "falseEmail@", "some passwd", english, gb, getTimeZone()); persist(user); @@ -60,7 +58,7 @@ assertNotNull(result.getId()); } - @Test(expected = InvalidStateException.class) + @Test(expected = ValidationException.class) public void passwdLengthIncorrect() { user = new User("test1", "test1 name", "test(a)example.com", "pass", english, gb, getTimeZone()); persist(user); @@ -80,7 +78,7 @@ persist(user2); } - @Test(expected = InvalidStateException.class) + @Test(expected = ValidationException.class) public void userNameLengthIncorrect() { user = new User("test1", "te", "test(a)example.com", "some passwd", english, gb, getTimeZone()); persist(user); @@ -95,7 +93,7 @@ rollbackTransaction(); } - @Test(expected = InvalidStateException.class) + @Test(expected = ValidationException.class) public void userShortNameIncorrect() { user = new User("test1A", "test1 name", "test(a)example.com", "some passwd", english, gb, getTimeZone()); persist(user); 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -13,11 +13,11 @@ import org.mockito.Mockito; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.integration.IntegrationTestHelper; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.properties.KuneProperties; import cc.kune.core.shared.dto.StateToken; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.Content; import com.google.inject.Inject; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefaultTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefaultTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/PropertySettedManagerDefaultTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -9,16 +9,17 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.domain.Properties; -import org.ourproject.kune.platf.server.domain.Property; -import org.ourproject.kune.platf.server.domain.PropertyGroup; -import org.ourproject.kune.platf.server.domain.PropertySetted; -import org.ourproject.kune.platf.server.domain.PropertySubgroup; import org.ourproject.kune.platf.server.manager.PropertiesManager; import org.ourproject.kune.platf.server.manager.PropertyGroupManager; import org.ourproject.kune.platf.server.manager.PropertyManager; import org.ourproject.kune.platf.server.manager.PropertySubgroupManager; +import cc.kune.domain.Properties; +import cc.kune.domain.Property; +import cc.kune.domain.PropertyGroup; +import cc.kune.domain.PropertySetted; +import cc.kune.domain.PropertySubgroup; + import com.google.inject.Inject; public class PropertySettedManagerDefaultTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -8,18 +8,18 @@ import org.junit.Before; import org.junit.Test; import org.ourproject.kune.platf.server.PersistenceTest; -import org.ourproject.kune.platf.server.domain.AdmissionType; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.GroupListMode; -import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.testhelper.ctx.DomainContext; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.AlreadyGroupMemberException; import cc.kune.core.client.errors.LastAdminInGroupException; +import cc.kune.core.shared.domain.AdmissionType; +import cc.kune.core.shared.domain.GroupListMode; import cc.kune.core.shared.dto.GroupType; import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.domain.Group; +import cc.kune.domain.User; import com.google.inject.Inject; import com.wideplay.warp.persist.Transactional; 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-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,9 +1,6 @@ package org.ourproject.kune.platf.server.mapper; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; @@ -13,25 +10,14 @@ import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.platf.server.TestHelper; import org.ourproject.kune.platf.server.access.AccessRights; -import org.ourproject.kune.platf.server.domain.BasicMimeType; -import org.ourproject.kune.platf.server.domain.Comment; -import org.ourproject.kune.platf.server.domain.Container; -import org.ourproject.kune.platf.server.domain.Content; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.GroupList; -import org.ourproject.kune.platf.server.domain.GroupListMode; -import org.ourproject.kune.platf.server.domain.License; -import org.ourproject.kune.platf.server.domain.Revision; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.SocialNetworkData; -import org.ourproject.kune.platf.server.domain.SocialNetworkVisibility; -import org.ourproject.kune.platf.server.domain.User; -import org.ourproject.kune.platf.server.domain.UserBuddiesVisibility; import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.platf.server.sn.UserBuddiesData; import org.ourproject.kune.platf.server.state.StateContent; +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.dto.CommentDTO; import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.ContainerSimpleDTO; @@ -41,10 +27,19 @@ import cc.kune.core.shared.dto.LicenseDTO; import cc.kune.core.shared.dto.LinkDTO; import cc.kune.core.shared.dto.SocialNetworkDataDTO; -import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.StateToken; -import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; +import cc.kune.domain.BasicMimeType; +import cc.kune.domain.Comment; +import cc.kune.domain.Container; +import cc.kune.domain.Content; +import cc.kune.domain.Group; +import cc.kune.domain.GroupList; +import cc.kune.domain.License; +import cc.kune.domain.Revision; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; +import cc.kune.domain.utils.SocialNetworkData; import com.google.inject.Inject; @@ -257,8 +252,8 @@ UserBuddiesVisibility.onlyyou, budData, new AccessRights(false, false, true), true, true); final SocialNetworkDataDTO map = mapper.map(snResult, SocialNetworkDataDTO.class); assertNotNull(map); - assertEquals(SocialNetworkVisibilityDTO.onlymembers, map.getSocialNetworkVisibility()); - assertEquals(UserBuddiesVisibilityDTO.onlyyou, map.getUserBuddiesVisibility()); + assertEquals(SocialNetworkVisibility.onlymembers, map.getSocialNetworkVisibility()); + assertEquals(UserBuddiesVisibility.onlyyou, map.getUserBuddiesVisibility()); assertEquals("test", map.getGroupMembers().getAccessLists().getAdmins().getList().get(0).getShortName()); assertEquals("test", map.getUserParticipation().getGroupsIsAdmin().get(0).getShortName()); assertEquals("usertest", map.getUserBuddies().getBuddies().get(0).getShortName()); Modified: trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -3,14 +3,14 @@ import java.util.HashMap; import java.util.TimeZone; -import org.ourproject.kune.platf.server.domain.AccessLists; -import org.ourproject.kune.platf.server.domain.Group; -import org.ourproject.kune.platf.server.domain.I18nCountry; -import org.ourproject.kune.platf.server.domain.I18nLanguage; -import org.ourproject.kune.platf.server.domain.SocialNetwork; -import org.ourproject.kune.platf.server.domain.User; import cc.kune.core.shared.dto.GroupType; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Group; +import cc.kune.domain.I18nCountry; +import cc.kune.domain.I18nLanguage; +import cc.kune.domain.SocialNetwork; +import cc.kune.domain.User; public class DomainContext { private final HashMap<String, User> users; Modified: trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/SocialNetworkOperator.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -1,6 +1,6 @@ package org.ourproject.kune.testhelper.ctx; -import org.ourproject.kune.platf.server.domain.SocialNetwork; +import cc.kune.domain.SocialNetwork; public class SocialNetworkOperator { private final DomainContext ctx; Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2010-12-15 02:40:31 UTC (rev 1166) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2010-12-16 02:20:33 UTC (rev 1167) @@ -9,9 +9,9 @@ import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.TagCount; import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.core.shared.dto.TagCloudResultDTO; -import cc.kune.core.shared.dto.TagCountDTO; import com.calclab.suco.client.ioc.Provider; @@ -43,8 +43,8 @@ @Test public void withTagsViewFalse() { final StateContainerDTO state = new StateContainerDTO(); - final ArrayList<TagCountDTO> list = new ArrayList<TagCountDTO>(); - state.setTagCloudResult(new TagCloudResultDTO(list, 0, 0)); + final ArrayList<TagCount> list = new ArrayList<TagCount>(); + state.setTagCloudResult(new TagCloudResult(list, 0, 0)); tagsSummaryPresenter.setState(state); Mockito.verify(view).setVisible(false); } @@ -52,9 +52,9 @@ @Test public void withTagsViewVisible() { final StateContainerDTO state = new StateContainerDTO(); - final ArrayList<TagCountDTO> list = new ArrayList<TagCountDTO>(); - list.add(new TagCountDTO("abc", 1L)); - state.setTagCloudResult(new TagCloudResultDTO(list, 0, 0)); + final ArrayList<TagCount> list = new ArrayList<TagCount>(); + list.add(new TagCount("abc", 1L)); + state.setTagCloudResult(new TagCloudResult(list, 0, 0)); tagsSummaryPresenter.setState(state); Mockito.verify(view).setVisible(true); }

1 0

r1166 - in kune-ws-armor/trunk: . src/org/ourproject/kune/ws/armor/client
by Vicente J. Ruiz Jurado 15 Dec '10

15 Dec '10

Author: vjrj_ Date: 2010-12-15 03:40:31 +0100 (Wed, 15 Dec 2010) New Revision: 1166 Removed: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.java kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/IBody.java kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java kune-ws-armor/trunk/target/ Log: Incomplete - task : Startup cleanup and gwtp integration CLOSED - # 8: Startup cleanup and gwtp integration http://kune.ourproject.org/issues/ticket/8 Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.java =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.java 2010-12-15 02:38:20 UTC (rev 1165) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.java 2010-12-15 02:40:31 UTC (rev 1166) @@ -1,99 +0,0 @@ -package org.ourproject.kune.ws.armor.client; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.DockLayoutPanel; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HasWidgets; -import com.google.gwt.user.client.ui.SplitLayoutPanel; -import com.google.gwt.user.client.ui.VerticalPanel; -import com.google.gwt.user.client.ui.Widget; - -public class Body extends Composite implements IBody { - - interface BodyUiBinder extends UiBinder<Widget, Body> { - } - - private static BodyUiBinder uiBinder = GWT.create(BodyUiBinder.class); - - @UiField - DockLayoutPanel mainpanel; - @UiField - FlowPanel sitebar; - @UiField - SplitLayoutPanel split; - @UiField - DockLayoutPanel splitCenter; - @UiField - DockLayoutPanel splitEast; - @UiField - VerticalPanel entityToolsSouth; - @UiField - VerticalPanel entityToolsNorth; - @UiField - VerticalPanel entityToolsCenter; - @UiField - FlowPanel entityHeader; - @UiField - FlowPanel entityFooter; - @UiField - FlowPanel docHeader; - @UiField - FlowPanel docSubheader; - @UiField - FlowPanel docFooter; - - public Body() { - initWidget(uiBinder.createAndBindUi(this)); - split.setWidgetMinSize(splitEast, 150); - // split.setWidgetMinSize(splitCenter, 200); - } - - @Override - public HasWidgets getDocFooter() { - return docFooter; - } - - @Override - public HasWidgets getDocHeader() { - return docHeader; - } - - @Override - public HasWidgets getDocSubheader() { - return docSubheader; - } - - @Override - public HasWidgets getEntityFooter() { - return entityFooter; - } - - @Override - public HasWidgets getEntityHeader() { - return entityHeader; - } - - @Override - public HasWidgets getEntityToolsCenter() { - return entityToolsCenter; - } - - @Override - public HasWidgets getEntityToolsNorth() { - return entityToolsNorth; - } - - @Override - public HasWidgets getEntityToolsSouth() { - return entityToolsSouth; - } - - @Override - public HasWidgets getSitebar() { - return sitebar; - } - -} Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-15 02:38:20 UTC (rev 1165) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-15 02:40:31 UTC (rev 1166) @@ -1,84 +0,0 @@ -<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> -<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" - xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:with field='res' - type='org.ourproject.kune.ws.armor.client.resources.WsArmorResources' /> - <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' - unit="PX"> - <g:north size="20"> - <g:FlowPanel ui:field="sitebar" height="20px" styleName='{res.style.siteBar}'> - </g:FlowPanel> - </g:north> - <g:center> - <g:SplitLayoutPanel width="100%" height="100%" ui:field="split"> - <g:center size="1.0"> - <g:DockLayoutPanel unit="PX" ui:field="splitCenter"> - <g:north size="168"> - <g:VerticalPanel width="100%" height="168px"> - <g:FlowPanel height="70px" width="100%" - styleName="{res.style.entityHeader}" ui:field="entityHeader"> -  - </g:FlowPanel> - <g:FlowPanel width="100%" height="38px" - styleName="{res.style.docHeader}" ui:field="docHeader"> - - </g:FlowPanel> - <g:FlowPanel width="100%" height="60px" - styleName="{res.style.docSubheader}" ui:field="docSubheader"> - <g:Image resource='{res.defThemeDocArrowDown}' styleName='{res.style.docHeaderArrow}'/> - </g:FlowPanel> - </g:VerticalPanel> - </g:north> - <g:center> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.docEditorMargin}"> - <g:west size="10"> - <g:HTMLPanel /> - </g:west> - <g:east size="15"> - <g:HTMLPanel /> - </g:east> - <g:center> - <g:ScrollPanel styleName="{res.style.docEditor}"> - <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> - </g:ScrollPanel> - </g:center> - <g:south size="33.0"> - <g:VerticalPanel height="33px" width="100%" - styleName="{res.style.docFooter}"> - <g:FlowPanel width="100%" - height="33" ui:field="docFooter"> - </g:FlowPanel> - </g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:south size="36"> - <g:FlowPanel height="36px" width="100%" - styleName="{res.style.entityFooter}" ui:field="entityFooter"> - </g:FlowPanel> - </g:south> - </g:DockLayoutPanel> - </g:center> - <g:east size="200.0"> - <g:DockLayoutPanel unit="PX" - styleName="{res.style.entityTools}" ui:field="splitEast"> - <g:north size="190"> - <g:VerticalPanel width="100%" ui:field="entityToolsNorth" - styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> - </g:north> - <g:center> - <g:VerticalPanel width="100%" ui:field="entityToolsCenter" - styleName="{res.style.entityToolsCenter}"> - </g:VerticalPanel> - </g:center> - <g:south size="98"> - <g:VerticalPanel width="100%" - styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> - </g:south> - </g:DockLayoutPanel> - </g:east> - </g:SplitLayoutPanel> - </g:center> - </g:DockLayoutPanel> -</ui:UiBinder> \ No newline at end of file Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/IBody.java =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/IBody.java 2010-12-15 02:38:20 UTC (rev 1165) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/IBody.java 2010-12-15 02:40:31 UTC (rev 1166) @@ -1,24 +0,0 @@ -package org.ourproject.kune.ws.armor.client; - -import com.google.gwt.user.client.ui.HasWidgets; - -public interface IBody { - - HasWidgets getDocFooter(); - - HasWidgets getDocHeader(); - - HasWidgets getDocSubheader(); - - HasWidgets getEntityFooter(); - - HasWidgets getEntityHeader(); - - HasWidgets getEntityToolsCenter(); - - HasWidgets getEntityToolsNorth(); - - HasWidgets getEntityToolsSouth(); - - HasWidgets getSitebar(); -} \ No newline at end of file Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java 2010-12-15 02:38:20 UTC (rev 1165) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java 2010-12-15 02:40:31 UTC (rev 1166) @@ -1,42 +0,0 @@ -package org.ourproject.kune.ws.armor.client; - -import org.ourproject.kune.ws.armor.client.resources.WsArmorResources; - -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.user.client.ui.InlineLabel; -import com.google.gwt.user.client.ui.RootLayoutPanel; - -/** - * Entry point classes define <code>onModuleLoad()</code>. - */ -public class WsArmor implements EntryPoint { - public void onModuleLoad() { - final WsArmorResources resources = WsArmorResources.INSTANCE; - resources.style().ensureInjected(); - - final RootLayoutPanel rootPanel = RootLayoutPanel.get(); - final Body armor = new Body(); - final InlineLabel icons = new InlineLabel("Icons"); - final InlineLabel login = new InlineLabel("Login"); - final InlineLabel logo = new InlineLabel("Logo"); - icons.setStyleName(resources.style().floatLeft()); - login.setStyleName(resources.style().floatRight()); - logo.setStyleName(resources.style().floatRight()); - armor.getSitebar().add(icons); - armor.getSitebar().add(logo); - armor.getSitebar().add(login); - armor.getEntityToolsNorth().add(new InlineLabel("Group members")); - armor.getEntityToolsCenter().add(new InlineLabel("Documents")); - armor.getEntityToolsSouth().add(new InlineLabel("Group tags")); - armor.getEntityHeader().add(new InlineLabel("Name of the Initiative")); - armor.getDocHeader().add(new InlineLabel("Some doc title")); - final InlineLabel editors = new InlineLabel("Editors:"); - editors.addStyleName(resources.style().docSubheaderLeft()); - armor.getDocSubheader().add(editors); - armor.getDocFooter().add(new InlineLabel("Tags:")); - armor.getEntityFooter().add(new InlineLabel("Rate it:")); - rootPanel.add(armor); - - } - -}

1 0

r1165 - in kune-ws-armor/trunk: . src src/cc src/cc/kune src/cc/kune/core src/cc/kune/core/ws src/cc/kune/core/ws/armor src/cc/kune/core/ws/armor/client src/cc/kune/core/ws/armor/client/resources src/org/ourproject/kune/ws/armor src/org/ourproject/kune/ws/armor/client war war/WEB-INF
by Vicente J. Ruiz Jurado 15 Dec '10

15 Dec '10

Author: vjrj_ Date: 2010-12-15 03:38:20 +0100 (Wed, 15 Dec 2010) New Revision: 1165 Added: kune-ws-armor/trunk/src/cc/ kune-ws-armor/trunk/src/cc/kune/ kune-ws-armor/trunk/src/cc/kune/core/ kune-ws-armor/trunk/src/cc/kune/core/ws/ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/entitytools/ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java kune-ws-armor/trunk/src/cc/kune/core/ws/armor/public/ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/server/ Removed: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/entitytools/ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/public/ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/server/ Modified: kune-ws-armor/trunk/ kune-ws-armor/trunk/pom.xml kune-ws-armor/trunk/war/ kune-ws-armor/trunk/war/WEB-INF/web.xml kune-ws-armor/trunk/war/WsArmor.html Log: Incomplete - task : Startup cleanup and gwtp integration CLOSED - # 8: Startup cleanup and gwtp integration http://kune.ourproject.org/issues/ticket/8 Property changes on: kune-ws-armor/trunk ___________________________________________________________________ Name: svn:ignore - .gwt + .gwt target Modified: kune-ws-armor/trunk/pom.xml =================================================================== --- kune-ws-armor/trunk/pom.xml 2010-12-15 02:26:32 UTC (rev 1164) +++ kune-ws-armor/trunk/pom.xml 2010-12-15 02:38:20 UTC (rev 1165) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>kune-ws-armor</groupId> <artifactId>kune-ws-armor</artifactId> - <version>0.0.4</version> + <version>0.0.5</version> <name>Kune Armor Main Layout</name> <description>The current armor of Kune Workspace</description> <properties> Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml (from rev 1161, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/WsArmor.gwt.xml 2010-12-15 02:38:20 UTC (rev 1165) @@ -0,0 +1,12 @@ +<!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/…"> +<module> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.google.gwt.user.theme.standard.Standard" /> + <entry-point class="cc.kune.core.ws.armor.client.WsArmor" /> + <public path="public" /> + <source path="client" /> +  +  +  + <set-property name="user.agent" value="safari" /> +</module> \ No newline at end of file Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.java 2010-12-15 02:38:20 UTC (rev 1165) @@ -0,0 +1,99 @@ +package cc.kune.core.ws.armor.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.DockLayoutPanel; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HasWidgets; +import com.google.gwt.user.client.ui.SplitLayoutPanel; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; + +public class Body extends Composite implements IBody { + + interface BodyUiBinder extends UiBinder<Widget, Body> { + } + + private static BodyUiBinder uiBinder = GWT.create(BodyUiBinder.class); + + @UiField + DockLayoutPanel mainpanel; + @UiField + FlowPanel sitebar; + @UiField + SplitLayoutPanel split; + @UiField + DockLayoutPanel splitCenter; + @UiField + DockLayoutPanel splitEast; + @UiField + VerticalPanel entityToolsSouth; + @UiField + VerticalPanel entityToolsNorth; + @UiField + VerticalPanel entityToolsCenter; + @UiField + FlowPanel entityHeader; + @UiField + FlowPanel entityFooter; + @UiField + FlowPanel docHeader; + @UiField + FlowPanel docSubheader; + @UiField + FlowPanel docFooter; + + public Body() { + initWidget(uiBinder.createAndBindUi(this)); + split.setWidgetMinSize(splitEast, 150); + // split.setWidgetMinSize(splitCenter, 200); + } + + @Override + public HasWidgets getDocFooter() { + return docFooter; + } + + @Override + public HasWidgets getDocHeader() { + return docHeader; + } + + @Override + public HasWidgets getDocSubheader() { + return docSubheader; + } + + @Override + public HasWidgets getEntityFooter() { + return entityFooter; + } + + @Override + public HasWidgets getEntityHeader() { + return entityHeader; + } + + @Override + public HasWidgets getEntityToolsCenter() { + return entityToolsCenter; + } + + @Override + public HasWidgets getEntityToolsNorth() { + return entityToolsNorth; + } + + @Override + public HasWidgets getEntityToolsSouth() { + return entityToolsSouth; + } + + @Override + public HasWidgets getSitebar() { + return sitebar; + } + +} Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml (from rev 1161, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/Body.ui.xml 2010-12-15 02:38:20 UTC (rev 1165) @@ -0,0 +1,86 @@ +<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> +<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='res' + type='cc.kune.core.ws.armor.client.resources.WsArmorResources' /> + <g:DockLayoutPanel ui:field="mainpanel" styleName='{res.style.mainPanel}' + unit="PX"> + <g:north size="20"> + <g:FlowPanel ui:field="sitebar" height="20px" + styleName='{res.style.siteBar}'> + </g:FlowPanel> + </g:north> + <g:center> + <g:SplitLayoutPanel width="100%" height="100%" + ui:field="split"> + <g:center size="1.0"> + <g:DockLayoutPanel unit="PX" ui:field="splitCenter"> + <g:north size="168"> + <g:VerticalPanel width="100%" height="168px"> + <g:FlowPanel height="70px" width="100%" + styleName="{res.style.entityHeader}" ui:field="entityHeader"> +  + </g:FlowPanel> + <g:FlowPanel width="100%" height="38px" + styleName="{res.style.docHeader}" ui:field="docHeader"> + </g:FlowPanel> + <g:FlowPanel width="100%" height="60px" + styleName="{res.style.docSubheader}" ui:field="docSubheader"> + <g:Image resource='{res.defThemeDocArrowDown}' + styleName='{res.style.docHeaderArrow}' /> + </g:FlowPanel> + </g:VerticalPanel> + </g:north> + <g:center> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.docEditorMargin}"> + <g:west size="10"> + <g:HTMLPanel /> + </g:west> + <g:east size="15"> + <g:HTMLPanel /> + </g:east> + <g:center> + <g:ScrollPanel styleName="{res.style.docEditor}"> + <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> + </g:ScrollPanel> + </g:center> + <g:south size="33.0"> + <g:VerticalPanel height="33px" width="100%" + styleName="{res.style.docFooter}"> + <g:FlowPanel width="100%" height="33" + ui:field="docFooter"> + </g:FlowPanel> + </g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:south size="36"> + <g:FlowPanel height="36px" width="100%" + styleName="{res.style.entityFooter}" ui:field="entityFooter"> + </g:FlowPanel> + </g:south> + </g:DockLayoutPanel> + </g:center> + <g:east size="200.0"> + <g:DockLayoutPanel unit="PX" + styleName="{res.style.entityTools}" ui:field="splitEast"> + <g:north size="190"> + <g:VerticalPanel width="100%" ui:field="entityToolsNorth" + styleName="{res.style.entityToolsNorth}"></g:VerticalPanel> + </g:north> + <g:center> + <g:VerticalPanel width="100%" ui:field="entityToolsCenter" + styleName="{res.style.entityToolsCenter}"> + </g:VerticalPanel> + </g:center> + <g:south size="98"> + <g:VerticalPanel width="100%" + styleName="{res.style.entityToolsSouth}" ui:field="entityToolsSouth"></g:VerticalPanel> + </g:south> + </g:DockLayoutPanel> + </g:east> + </g:SplitLayoutPanel> + </g:center> + </g:DockLayoutPanel> +</ui:UiBinder> \ No newline at end of file Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/IBody.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java 2010-12-15 02:38:20 UTC (rev 1165) @@ -0,0 +1,24 @@ +package cc.kune.core.ws.armor.client; + +import com.google.gwt.user.client.ui.HasWidgets; + +public interface IBody { + + HasWidgets getDocFooter(); + + HasWidgets getDocHeader(); + + HasWidgets getDocSubheader(); + + HasWidgets getEntityFooter(); + + HasWidgets getEntityHeader(); + + HasWidgets getEntityToolsCenter(); + + HasWidgets getEntityToolsNorth(); + + HasWidgets getEntityToolsSouth(); + + HasWidgets getSitebar(); +} \ No newline at end of file Property changes on: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/IBody.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java (from rev 1156, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/WsArmor.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/WsArmor.java 2010-12-15 02:38:20 UTC (rev 1165) @@ -0,0 +1,43 @@ +package cc.kune.core.ws.armor.client; + + +import cc.kune.core.ws.armor.client.resources.WsArmorResources; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.RootLayoutPanel; + +/** + * Entry point classes define <code>onModuleLoad()</code>. + */ +public class WsArmor implements EntryPoint { + public void onModuleLoad() { + final WsArmorResources resources = WsArmorResources.INSTANCE; + resources.style().ensureInjected(); + + final RootLayoutPanel rootPanel = RootLayoutPanel.get(); + final Body armor = new Body(); + final InlineLabel icons = new InlineLabel("Icons"); + final InlineLabel login = new InlineLabel("Login"); + final InlineLabel logo = new InlineLabel("Logo"); + icons.setStyleName(resources.style().floatLeft()); + login.setStyleName(resources.style().floatRight()); + logo.setStyleName(resources.style().floatRight()); + armor.getSitebar().add(icons); + armor.getSitebar().add(logo); + armor.getSitebar().add(login); + armor.getEntityToolsNorth().add(new InlineLabel("Group members")); + armor.getEntityToolsCenter().add(new InlineLabel("Documents")); + armor.getEntityToolsSouth().add(new InlineLabel("Group tags")); + armor.getEntityHeader().add(new InlineLabel("Name of the Initiative")); + armor.getDocHeader().add(new InlineLabel("Some doc title")); + final InlineLabel editors = new InlineLabel("Editors:"); + editors.addStyleName(resources.style().docSubheaderLeft()); + armor.getDocSubheader().add(editors); + armor.getDocFooter().add(new InlineLabel("Tags:")); + armor.getEntityFooter().add(new InlineLabel("Rate it:")); + rootPanel.add(armor); + + } + +} Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/entitytools (from rev 1155, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/entitytools) Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources (from rev 1156, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources) Deleted: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java 2010-12-06 20:15:56 UTC (rev 1156) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-15 02:38:20 UTC (rev 1165) @@ -1,56 +0,0 @@ -package org.ourproject.kune.ws.armor.client.resources; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.resources.client.ClientBundle; -import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; - -public interface WsArmorResources extends ClientBundle { - public interface Style extends CssResource { - - String docEditor(); - - String docEditorMargin(); - - String docFooter(); - - String docHeader(); - - String docHeaderArrow(); - - String docSubheader(); - - String docSubheaderLeft(); - - String entityFooter(); - - String entityHeader(); - - String entityTools(); - - String entityToolsCenter(); - - String entityToolsNorth(); - - String entityToolsSouth(); - - String floatLeft(); - - String floatRight(); - - String mainPanel(); - - String siteBar(); - } - - public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class); - - @Source("def-theme-doc-arrow-down.png") - ImageResource defThemeDocArrowDown(); - - @Source("def-theme-tools-arrow-left.png") - ImageResource defThemeToolsArrowLeft(); - - @Source("DefaultStyle.css") - Style style(); -} \ No newline at end of file Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java (from rev 1161, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java) =================================================================== --- kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java (rev 0) +++ kune-ws-armor/trunk/src/cc/kune/core/ws/armor/client/resources/WsArmorResources.java 2010-12-15 02:38:20 UTC (rev 1165) @@ -0,0 +1,57 @@ +package cc.kune.core.ws.armor.client.resources; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.resources.client.ImageResource; + +public interface WsArmorResources extends ClientBundle { + public interface Style extends CssResource { + + String docEditor(); + + String docEditorMargin(); + + String docFooter(); + + String docHeader(); + + String docHeaderArrow(); + + String docSubheader(); + + String docSubheaderLeft(); + + String entityFooter(); + + String entityHeader(); + + String entityTools(); + + String entityToolsCenter(); + + String entityToolsNorth(); + + String entityToolsSouth(); + + String floatLeft(); + + String floatRight(); + + String mainPanel(); + + String siteBar(); + } + + @Deprecated + public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class); + + @Source("def-theme-doc-arrow-down.png") + ImageResource defThemeDocArrowDown(); + + @Source("def-theme-tools-arrow-left.png") + ImageResource defThemeToolsArrowLeft(); + + @Source("DefaultStyle.css") + Style style(); +} \ No newline at end of file Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/public (from rev 1152, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/public) Copied: kune-ws-armor/trunk/src/cc/kune/core/ws/armor/server (from rev 1152, kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/server) Deleted: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml 2010-12-15 02:26:32 UTC (rev 1164) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml 2010-12-15 02:38:20 UTC (rev 1165) @@ -1,8 +0,0 @@ -<!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/…"> -<module> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.user.theme.standard.Standard" /> -  - <public path="public" /> - <source path="client" /> -</module> \ No newline at end of file Property changes on: kune-ws-armor/trunk/war ___________________________________________________________________ Name: svn:ignore - org.ourproject.kune.ws.armor.WsArmor + cc.kune.core.ws.armor.WsArmor Modified: kune-ws-armor/trunk/war/WEB-INF/web.xml =================================================================== --- kune-ws-armor/trunk/war/WEB-INF/web.xml 2010-12-15 02:26:32 UTC (rev 1164) +++ kune-ws-armor/trunk/war/WEB-INF/web.xml 2010-12-15 02:38:20 UTC (rev 1165) @@ -2,12 +2,9 @@ <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> - <web-app> - -  - <welcome-file-list> - <welcome-file>WsArmor.html</welcome-file> - </welcome-file-list> - -</web-app> +  + <welcome-file-list> + <welcome-file>WsArmor.html</welcome-file> + </welcome-file-list> +</web-app> \ No newline at end of file Modified: kune-ws-armor/trunk/war/WsArmor.html =================================================================== --- kune-ws-armor/trunk/war/WsArmor.html 2010-12-15 02:26:32 UTC (rev 1164) +++ kune-ws-armor/trunk/war/WsArmor.html 2010-12-15 02:38:20 UTC (rev 1165) @@ -6,7 +6,7 @@    - <link rel="stylesheet" href="org.ourproject.kune.ws.armor.WsArmor/fontface/stylesheet.css" type="text/css" charset="utf-8"> + <link rel="stylesheet" href="cc.kune.core.ws.armor.WsArmor/fontface/stylesheet.css" type="text/css" charset="utf-8"> <link type="text/css" rel="stylesheet" href="WsArmor.css"> @@ -20,7 +20,7 @@    - <script language="javascript" src="org.ourproject.kune.ws.armor.WsArmor/org.ourproject.kune.ws.armor.WsArmor.nocache.js"></script> + <script language="javascript" src="cc.kune.core.ws.armor.WsArmor/cc.kune.core.ws.armor.WsArmor.nocache.js"></script> </head>

1 0

15 Dec '10

Author: vjrj_ Date: 2010-12-15 03:26:32 +0100 (Wed, 15 Dec 2010) New Revision: 1164 Added: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java trunk/src/main/java/cc/kune/core/client/notify/UserNotifierViewImpl.java trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java Removed: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java trunk/src/main/java/cc/kune/core/client/ws/CoreView.java Modified: trunk/TROUBLESHOOT trunk/pom.xml trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreEventBus.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java trunk/src/main/java/cc/kune/core/client/state/SessionDefault.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/public/ws.css trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/AdmissionType.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java Log: Incomplete - task : Startup cleanup and gwtp integration CLOSED - # 8: Startup cleanup and gwtp integration http://kune.ourproject.org/issues/ticket/8 Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/TROUBLESHOOT 2010-12-15 02:26:32 UTC (rev 1164) @@ -69,3 +69,5 @@ Error: method should override method xxx (or similar) Fix: Project --> Properties --> Java Compiler ---> Unenable project specific settings + Error: Running Web application seems that are running an old GWT code + Fix: Open Run > Run configurations and remove a recreate your launch configuration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/pom.xml 2010-12-15 02:26:32 UTC (rev 1164) @@ -39,7 +39,7 @@ <dependency> <groupId>com.googlecode.gwt.inject</groupId> <artifactId>gin</artifactId> - <version>1.0</version> + <version>r137</version> </dependency> <dependency> <groupId>com.google.code.guice</groupId> @@ -47,16 +47,6 @@ <version>2.0.1</version> </dependency> <dependency> - <groupId>com.googlecode.mvp4g</groupId> - <artifactId>mvp4g</artifactId> - <version>1.2.0</version> - </dependency> - <dependency> - <groupId>com.googlecode.mvc4g</groupId> - <artifactId>mvc4g</artifactId> - <version>1.0.0-jboss</version> - </dependency> - <dependency> <groupId>org.ourproject.common</groupId> <artifactId>gwt-common</artifactId> <version>0.0.3</version> @@ -74,10 +64,15 @@ <version>1.3.1</version> </dependency> <dependency> - <groupId>org.ourproject.kune.ws.armor</groupId> + <groupId>cc.kune.core.ws.armor</groupId> <artifactId>ws-armor</artifactId> - <version>0.0.4</version> + <version>0.0.5</version> </dependency> + <dependency> + <groupId>com.gwtplatform</groupId> + <artifactId>gwtp</artifactId> + <version>0.4</version> + </dependency>  <dependency> <groupId>com.gwtext</groupId> @@ -497,6 +492,11 @@ <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>  <repository> <id>dyndns-repo</id> @@ -868,4 +868,4 @@ </dependencies> </profile> </profiles> -</project> +</project> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-15 02:26:32 UTC (rev 1164) @@ -10,16 +10,21 @@ <public path="public" />  <inherits name="com.google.gwt.user.User" /> - <inherits name='com.mvp4g.Mvp4gModule' /> - <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> +  + <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" />  <stylesheet src="ws.css" /> <stylesheet src="fontface/stylesheet.css" />  - <entry-point class="cc.kune.core.client.KuneEntryPoint" /> +     Modified: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -1,63 +1,49 @@ package cc.kune.core.client; -import org.ourproject.common.client.CommonGinModule; -import org.ourproject.common.client.notify.ConfirmationAsk; -import org.ourproject.common.client.notify.NotifyLevel; - -import cc.kune.core.client.cookies.CookiesManager; -import cc.kune.core.client.notify.UserNotifierPresenter; -import cc.kune.core.client.ws.CorePresenter; -import cc.kune.core.client.ws.CoreView; - -import com.mvp4g.client.annotation.Debug; -import com.mvp4g.client.annotation.Debug.LogLevel; -import com.mvp4g.client.annotation.Event; -import com.mvp4g.client.annotation.Events; -import com.mvp4g.client.annotation.Start; -import com.mvp4g.client.event.EventBus; - -/** - * 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(); - +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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -1,24 +1,40 @@ package cc.kune.core.client; -import org.ourproject.kune.ws.armor.client.Body; -import org.ourproject.kune.ws.armor.client.IBody; - +import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.client.notify.SpinerViewImpl; +import cc.kune.core.client.notify.UserNotifierPresenter; +import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierProxy; +import cc.kune.core.client.notify.UserNotifierViewImpl; import cc.kune.core.client.state.ContentProvider; import cc.kune.core.client.state.ContentProviderDefault; import cc.kune.core.client.state.HistoryWrapper; import cc.kune.core.client.state.HistoryWrapperDefault; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SessionDefault; +import cc.kune.core.client.ws.CorePlaceManager; +import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.CoreViewImpl; import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.core.ws.armor.client.Body; +import cc.kune.core.ws.armor.client.IBody; -import com.google.gwt.inject.client.AbstractGinModule; import com.google.inject.Singleton; +import com.gwtplatform.mvp.client.DefaultEventBus; +import com.gwtplatform.mvp.client.DefaultProxyFailureHandler; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.RootPresenter; +import com.gwtplatform.mvp.client.gin.AbstractPresenterModule; +import com.gwtplatform.mvp.client.proxy.ParameterTokenFormatter; +import com.gwtplatform.mvp.client.proxy.PlaceManager; +import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; +import com.gwtplatform.mvp.client.proxy.TokenFormatter; /** * The Class Core GinModule. */ -public class CoreGinModule extends AbstractGinModule { +public class CoreGinModule extends AbstractPresenterModule { /* * (non-Javadoc) @@ -27,10 +43,24 @@ */ @Override protected void configure() { + bind(EventBus.class).to(DefaultEventBus.class).in(Singleton.class); + bind(PlaceManager.class).to(CorePlaceManager.class).in(Singleton.class); + bind(TokenFormatter.class).to(ParameterTokenFormatter.class).in(Singleton.class); + bind(RootPresenter.class).asEagerSingleton(); + bind(ProxyFailureHandler.class).to(DefaultProxyFailureHandler.class).in(Singleton.class); + + // Presenters + bindPresenter(CorePresenter.class, CorePresenter.CoreView.class, CoreViewImpl.class, + CorePresenter.CoreProxy.class); + bindPresenter(SpinerPresenter.class, SpinerPresenter.SpinerView.class, SpinerViewImpl.class, + SpinerPresenter.SpinerProxy.class); + bindPresenter(UserNotifierPresenter.class, UserNotifierPresenter.UserNotifierView.class, + UserNotifierViewImpl.class, UserNotifierProxy.class); + bind(IBody.class).to(Body.class).in(Singleton.class); 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(ErrorHandler.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); Added: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinjector.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreGinjector.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,29 @@ +package cc.kune.core.client; + +import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.client.notify.UserNotifierPresenter; +import cc.kune.core.client.ws.CorePresenter; + +import com.google.gwt.inject.client.AsyncProvider; +import com.google.gwt.inject.client.GinModules; +import com.google.gwt.inject.client.Ginjector; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.proxy.PlaceManager; +import com.gwtplatform.mvp.client.proxy.ProxyFailureHandler; + +@GinModules({ CoreGinModule.class }) +public interface CoreGinjector extends Ginjector { + + AsyncProvider<CorePresenter> getCorePresenter(); + + EventBus getEventBus(); + + PlaceManager getPlaceManager(); + + ProxyFailureHandler getProxyFailureHandler(); + + AsyncProvider<SpinerPresenter> getSpinerPresenter(); + + AsyncProvider<UserNotifierPresenter> getUserNotifierPresenter(); + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/CoreGinjector.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -5,14 +5,13 @@ import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.user.client.ui.RootLayoutPanel; -import com.google.gwt.user.client.ui.Widget; -import com.mvp4g.client.Mvp4gModule; +import com.gwtplatform.mvp.client.DelayedBindRegistry; /** * The Class KuneEntryPoint. */ public class KuneEntryPoint implements EntryPoint { + public final CoreGinjector ginjector = GWT.create(CoreGinjector.class); /* * (non-Javadoc) @@ -39,9 +38,9 @@ * On module load cont. */ public void onModuleLoadCont() { - final Mvp4gModule module = (Mvp4gModule) GWT.create(Mvp4gModule.class); - module.createAndStartModule(); - RootLayoutPanel.get().add((Widget) module.getStartView()); + DelayedBindRegistry.bind(ginjector); + + ginjector.getPlaceManager().revealCurrentPlace(); } } Modified: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -1,16 +1,11 @@ package cc.kune.core.client.cookies; -import cc.kune.core.client.CoreEventBus; -import cc.kune.core.client.cookies.CookiesManager.ICookiesView; import cc.kune.core.client.state.Session; import com.google.gwt.user.client.Cookies; import com.google.inject.Inject; -import com.mvp4g.client.annotation.Presenter; -import com.mvp4g.client.presenter.BasePresenter; -@Presenter(view = CookiesView.class) -public class CookiesManager extends BasePresenter<ICookiesView, CoreEventBus> { +public class CookiesManager { public interface ICookiesView { String getCurrentCookie(); } 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -21,7 +21,8 @@ import org.ourproject.common.client.notify.NotifyLevel; -import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.notify.SpinerPresenter; +import cc.kune.core.client.notify.UserNotifierPresenter; import cc.kune.core.client.state.Session; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -31,23 +32,30 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; import com.google.inject.Inject; -import com.mvp4g.client.event.BaseEventHandler; +import com.gwtplatform.mvp.client.proxy.PlaceManager; -public class ErrorHandler extends BaseEventHandler<CoreEventBus> { +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; @Inject - public ErrorHandler(final Session session, final I18nTranslationService i18n) { + public ErrorHandler(final Session session, final I18nTranslationService i18n, final UserNotifierPresenter notifier, + final SpinerPresenter spiner, final PlaceManager placeManager) { this.session = session; this.i18n = i18n; + this.notifier = notifier; + this.spiner = spiner; + this.placeManager = placeManager; this.onSessionExpired = new Event0("onSessionExpired"); } public void doSessionExpired() { onSessionExpired.fire(); - eventBus.notify(NotifyLevel.info, "Your session has expired. Please log in again."); + notifier.notify(NotifyLevel.info, "Your session has expired. Please log in again."); } public void onSessionExpired(final Listener0 listener) { @@ -55,10 +63,10 @@ } public void process(final Throwable caught) { - eventBus.hideSpin(); + spiner.fade(); if (caught instanceof AccessViolationException) { logException(caught); - eventBus.notify(NotifyLevel.error, i18n.t("You do not have rights to perform that action")); + notifier.notify(NotifyLevel.error, i18n.t("You do not have rights to perform that action")); } else if (caught instanceof SessionExpiredException) { logException(caught); doSessionExpired(); @@ -67,45 +75,48 @@ if (session.isLogged()) { doSessionExpired(); } else { - eventBus.notify(NotifyLevel.important, i18n.t("Please sign in or register to collaborate")); + notifier.notify(NotifyLevel.important, i18n.t("Please sign in or register to collaborate")); } } else if (caught instanceof GroupNotFoundException) { logException(caught); - - eventBus.notify(NotifyLevel.veryImportant, i18n.t("Group not found")); - eventBus.gotoToken(""); + notifier.notify(NotifyLevel.veryImportant, i18n.t("Group not found")); + goHome(); } else if (caught instanceof IncompatibleRemoteServiceException) { - eventBus.notify(NotifyLevel.error, + notifier.notify(NotifyLevel.error, i18n.t("Your browser is outdated with the server software. Please reload this page.")); } else if (caught instanceof ContentNotFoundException) { logException(caught); - eventBus.notify(NotifyLevel.veryImportant, i18n.t("Content not found")); - eventBus.gotoToken(""); + notifier.notify(NotifyLevel.veryImportant, i18n.t("Content not found")); + goHome(); } else if (caught instanceof ContentNotPermittedException) { logException(caught); - eventBus.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); - eventBus.gotoToken(""); + notifier.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); + goHome(); } else if (caught instanceof ContainerNotPermittedException) { logException(caught); - eventBus.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); - eventBus.gotoToken(""); + notifier.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); + goHome(); } else if (caught instanceof LastAdminInGroupException) { logException(caught); - eventBus.alert(i18n.t("Warning"), i18n.t("Sorry, you are the last admin of this group." + 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.")); } else if (caught instanceof AlreadyGroupMemberException) { logException(caught); - eventBus.notify(NotifyLevel.error, i18n.t("This group is already a group member")); + notifier.notify(NotifyLevel.error, i18n.t("This group is already a group member")); } else if (caught instanceof AlreadyUserMemberException) { logException(caught); - eventBus.notify(NotifyLevel.error, i18n.t("This user is already a group member")); + notifier.notify(NotifyLevel.error, i18n.t("This user is already a group member")); } else { logException(caught, true); - eventBus.notify(NotifyLevel.error, i18n.t("Error performing operation")); + notifier.notify(NotifyLevel.error, i18n.t("Error performing operation")); GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught); } } + private void goHome() { + placeManager.revealDefaultPlace(); + } + private void logException(final Throwable caught) { logException(caught, false); } Added: trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,32 @@ +package cc.kune.core.client.i18n; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; + +public class I18nReadyEvent extends GwtEvent<I18nReadyEvent.I18nReadyHandler> { + + public interface I18nReadyHandler extends EventHandler { + + void fire(I18nReadyEvent event); + } + + public static final GwtEvent.Type<I18nReadyHandler> TYPE = new GwtEvent.Type<I18nReadyHandler>(); + + public static Type<I18nReadyHandler> getType() { + return TYPE; + } + + public I18nReadyEvent() { + } + + @Override + public com.google.gwt.event.shared.GwtEvent.Type<I18nReadyHandler> getAssociatedType() { + return TYPE; + } + + @Override + protected void dispatch(final I18nReadyHandler handler) { + handler.fire(this); + } + +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/i18n/I18nReadyEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,45 @@ +package cc.kune.core.client.notify; + +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.proxy.RevealRootContentEvent; + +public class SpinerPresenter extends Presenter<SpinerPresenter.SpinerView, SpinerPresenter.SpinerProxy> { + + public interface SpinerProxy extends ProxyPlace<SpinerPresenter> { + } + + public interface SpinerView extends View { + + void fade(); + + void show(String message); + + void showLoading(); + } + + @Inject + public SpinerPresenter(final EventBus eventBus, final SpinerView view, final SpinerProxy proxy) { + super(eventBus, view, proxy); + } + + public void fade() { + getView().fade(); + } + + public void show(final String message) { + getView().show(message); + } + + public void showLoading() { + getView().showLoading(); + } + + @Override + protected void revealInParent() { + RevealRootContentEvent.fire(this, this); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/SpinerPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,38 @@ +package cc.kune.core.client.notify; + +import cc.kune.core.client.notify.SpinerPresenter.SpinerView; + +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Widget; +import com.gwtplatform.mvp.client.ViewImpl; + +public class SpinerViewImpl extends ViewImpl implements SpinerView { + + private final Label label; + + public SpinerViewImpl() { + label = new Label(); + } + + @Override + public Widget asWidget() { + return label; + } + + @Override + public void fade() { + // TODO Auto-generated method stub + + } + + @Override + public void show(final String message) { + label.setText(message); + } + + @Override + public void showLoading() { + label.setText("FIXME"); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/SpinerViewImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -3,45 +3,47 @@ import org.ourproject.common.client.notify.ConfirmationAsk; import org.ourproject.common.client.notify.NotifyLevel; -import cc.kune.core.client.CoreEventBus; -import cc.kune.core.client.notify.UserNotifierPresenter.IUserNotifierView; +import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierProxy; +import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierView; -import com.mvp4g.client.annotation.Presenter; -import com.mvp4g.client.presenter.LazyPresenter; -import com.mvp4g.client.view.LazyView; +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; -@Presenter(view = UserNotifierView.class) -public class UserNotifierPresenter extends LazyPresenter<IUserNotifierView, CoreEventBus> { +public class UserNotifierPresenter extends Presenter<UserNotifierView, UserNotifierProxy> { - public interface IUserNotifierView extends LazyView { + public interface UserNotifierProxy extends ProxyPlace<UserNotifierPresenter> { + } + + public interface UserNotifierView extends View { public void alert(String title, String message); public void confirmationAsk(ConfirmationAsk<?> ask); - public void hideSpin(); - public void notify(NotifyLevel level, String message); + } - public void showSpin(String message); + @Inject + public UserNotifierPresenter(final EventBus eventBus, final UserNotifierView view, final UserNotifierProxy proxy) { + super(eventBus, view, proxy); } - public void onAlert(final String title, final String message) { - view.alert(title, message); + public void notify(final NotifyLevel level, final String message) { + getView().notify(level, message); } - public void onConfirmationAsk(final ConfirmationAsk<?> ask) { - view.confirmationAsk(ask); + public void alert(final String title, final String message) { + getView().alert(title, message); }; - public void onHideSpin() { - view.hideSpin(); + public void onConfirmationAsk(final ConfirmationAsk<?> ask) { + getView().confirmationAsk(ask); } - public void onNotify(final NotifyLevel level, final String message) { - view.notify(level, message); + @Override + protected void revealInParent() { } - public void onShowSpin(final String message) { - view.showSpin(message); - } } \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -1,49 +0,0 @@ -package cc.kune.core.client.notify; - -import org.ourproject.common.client.notify.ConfirmationAsk; -import org.ourproject.common.client.notify.NotifyLevel; - -import cc.kune.core.client.notify.UserNotifierPresenter.IUserNotifierView; - -import com.google.gwt.user.client.Window; - -public class UserNotifierView implements IUserNotifierView { - - @Override - public void alert(final String title, final String message) { - message(title, message); - } - - @Override - public void confirmationAsk(final ConfirmationAsk<?> ask) { - // TODO Auto-generated method stub - - } - - @Override - public void createView() { - // TODO Auto-generated method stub - } - - @Override - public void hideSpin() { - // TODO Auto-generated method stub - - } - - @Override - public void notify(final NotifyLevel level, final String message) { - message("", message); - } - - @Override - public void showSpin(final String message) { - // TODO Auto-generated method stub - - } - - private void message(final String title, final String message) { - Window.alert(title + " " + message); - } - -} Copied: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierViewImpl.java (from rev 1163, trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierViewImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierViewImpl.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,43 @@ +package cc.kune.core.client.notify; + +import org.ourproject.common.client.notify.ConfirmationAsk; +import org.ourproject.common.client.notify.NotifyLevel; + +import cc.kune.core.client.notify.UserNotifierPresenter.UserNotifierView; + +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +public class UserNotifierViewImpl extends ViewImpl implements UserNotifierView { + @Inject + public UserNotifierViewImpl() { + } + + @Override + public void alert(final String title, final String message) { + message(title, message); + } + + @Override + public Widget asWidget() { + return null; + } + + @Override + public void confirmationAsk(final ConfirmationAsk<?> ask) { + // TODO Auto-generated method stub + + } + + @Override + public void notify(final NotifyLevel level, final String message) { + message("", message); + } + + private void message(final String title, final String message) { + Window.alert(title + " " + message); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierViewImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -21,23 +21,23 @@ import java.util.HashMap; -import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.client.rpcservices.ContentServiceAsync; 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; -import com.mvp4g.client.event.BaseEventHandler; -public class ContentProviderDefault extends BaseEventHandler<CoreEventBus> implements ContentProvider { - +public class ContentProviderDefault implements ContentProvider { private final ContentServiceAsync server; private final HashMap<StateToken, StateAbstractDTO> cache; + private final SpinerPresenter spiner; @Inject - public ContentProviderDefault(final ContentServiceAsync server) { + public ContentProviderDefault(final ContentServiceAsync server, final SpinerPresenter spiner) { this.server = server; + this.spiner = spiner; this.cache = new HashMap<StateToken, StateAbstractDTO>(); } @@ -46,7 +46,7 @@ } public void getContent(final String user, final StateToken newState, final AsyncCallback<StateAbstractDTO> callback) { - eventBus.showSpinLoading(); + spiner.showLoading(); final StateAbstractDTO catched = getCached(newState); if (catched != null) { callback.onSuccess(catched); 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -22,8 +22,8 @@ import java.util.Collection; import java.util.List; -import cc.kune.core.client.CoreEventBus; import cc.kune.core.client.cookies.CookiesManager; +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.dto.I18nCountryDTO; @@ -47,9 +47,9 @@ import com.google.gwt.core.client.GWT; import com.google.inject.Inject; import com.google.inject.Provider; -import com.mvp4g.client.event.BaseEventHandler; +import com.gwtplatform.mvp.client.EventBus; -public class SessionDefault extends BaseEventHandler<CoreEventBus> implements Session { +public class SessionDefault implements Session { private String userHash; private InitDataDTO initData; private UserInfoDTO currentUserInfo; @@ -64,6 +64,9 @@ private final Provider<UserServiceAsync> userServiceProvider; @Inject + private static EventBus eventBus; + + @Inject public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) { this.userHash = cookieManager.getCurrentCookie(); this.userHash = userHash == null || userHash.equals("null") ? null : userHash; @@ -241,7 +244,7 @@ public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { this.currentLanguage = currentLanguage; - eventBus.i18nReady(); + eventBus.fireEvent(new I18nReadyEvent()); } public void setCurrentState(final StateAbstractDTO currentState) { 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -21,9 +21,9 @@ import java.util.HashMap; -import cc.kune.core.client.CoreEventBus; import cc.kune.core.client.actions.BeforeActionCollection; 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.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.StateAbstractDTO; @@ -40,10 +40,8 @@ import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.user.client.History; import com.google.inject.Inject; -import com.mvp4g.client.event.BaseEventHandler; -public class StateManagerDefault extends BaseEventHandler<CoreEventBus> implements StateManager, - ValueChangeHandler<String> { +public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { private final ContentProvider contentProvider; private StateToken previousToken; /** @@ -59,10 +57,12 @@ private final Event2<String, String> onToolChanged; private final Event2<String, String> onGroupChanged; private final BeforeActionCollection beforeStateChangeCollection; + private final SpinerPresenter spiner; @Inject public StateManagerDefault(final ContentProvider contentProvider, final Session session, - final HistoryWrapper history) { + final HistoryWrapper history, final SpinerPresenter spinner) { + this.spiner = spinner; // Put this outside here History.addValueChangeHandler(this); this.contentProvider = contentProvider; @@ -201,7 +201,7 @@ void setState(final StateAbstractDTO newState) { session.setCurrentState(newState); onStateChanged.fire(newState); - eventBus.hideSpin(); + spiner.fade(); checkGroupAndToolChange(newState); previousToken = newState.getStateToken(); Added: trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,20 @@ +package cc.kune.core.client.ws; + +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.proxy.PlaceManagerImpl; +import com.gwtplatform.mvp.client.proxy.PlaceRequest; +import com.gwtplatform.mvp.client.proxy.TokenFormatter; + +public class CorePlaceManager extends PlaceManagerImpl { + + @Inject + public CorePlaceManager(final EventBus eventBus, final TokenFormatter tokenFormatter) { + super(eventBus, tokenFormatter); + } + + @Override + public void revealDefaultPlace() { + revealPlace(new PlaceRequest("home")); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/CorePlaceManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -1,32 +1,37 @@ package cc.kune.core.client.ws; -import cc.kune.core.client.CoreEventBus; -import cc.kune.core.client.ws.CorePresenter.ICoreView; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.inject.Inject; -import com.mvp4g.client.annotation.Presenter; -import com.mvp4g.client.presenter.BasePresenter; +import com.gwtplatform.mvp.client.EventBus; +import com.gwtplatform.mvp.client.Presenter; +import com.gwtplatform.mvp.client.View; +import com.gwtplatform.mvp.client.annotations.NameToken; +import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; +import com.gwtplatform.mvp.client.proxy.ProxyPlace; +import com.gwtplatform.mvp.client.proxy.RevealRootLayoutContentEvent; /** * The Class CorePresenter. */ -@Presenter(view = CoreView.class) -public class CorePresenter extends BasePresenter<ICoreView, CoreEventBus> { +public class CorePresenter extends Presenter<CorePresenter.CoreView, CorePresenter.CoreProxy> { + @ProxyCodeSplit + @NameToken("home") + public interface CoreProxy extends ProxyPlace<CorePresenter> { + } - /** - * The Interface ICoreView. - */ - public interface ICoreView { + public interface CoreView extends View { } @Inject - public CorePresenter(final I18nTranslationService i18n) { + public CorePresenter(final EventBus eventBus, final CoreView view, final CoreProxy proxy, + final I18nTranslationService i18n) { + super(eventBus, view, proxy); } - /** - * On start. - */ - public void onStart() { + @Override + protected void revealInParent() { + RevealRootLayoutContentEvent.fire(eventBus, this); } + } Deleted: trunk/src/main/java/cc/kune/core/client/ws/CoreView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreView.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreView.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -1,31 +0,0 @@ -package cc.kune.core.client.ws; - -import org.ourproject.kune.ws.armor.client.Body; -import org.ourproject.kune.ws.armor.client.resources.WsArmorResources; - -import cc.kune.core.client.ws.CorePresenter.ICoreView; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.InlineLabel; -import com.google.inject.Inject; - -/** - * The Class CoreView is where the general armor of Kune it created/attached. - */ -public class CoreView extends Composite implements ICoreView { - - /** - * Instantiates a new core view. - * - * @param body - * the body - */ - @Inject - public CoreView(final Body body) { - GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); - initWidget(body); - body.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); - body.getDocHeader().add(new InlineLabel("doc title")); - } -} Copied: trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java (from rev 1162, trunk/src/main/java/cc/kune/core/client/ws/CoreView.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -0,0 +1,37 @@ +package cc.kune.core.client.ws; + +import cc.kune.core.ws.armor.client.Body; +import cc.kune.core.ws.armor.client.resources.WsArmorResources; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.InlineLabel; +import com.google.gwt.user.client.ui.Widget; +import com.google.inject.Inject; +import com.gwtplatform.mvp.client.ViewImpl; + +/** + * The Class CoreView is where the general armor of Kune it created/attached. + */ +public class CoreViewImpl extends ViewImpl implements CorePresenter.CoreView { + + private final Body body; + + /** + * Instantiates a new core view. + * + * @param body + * the body + */ + @Inject + public CoreViewImpl(final Body body) { + this.body = body; + GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); + body.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); + body.getDocHeader().add(new InlineLabel("doc title")); + } + + @Override + public Widget asWidget() { + return body; + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/CoreViewImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-15 02:26:32 UTC (rev 1164) @@ -8,6 +8,10 @@ margin: 5px; } +* { + font-family: 'Droid Sans', Arial; +} + body.fontface {font: 'Droid Sans', Arial;} a { Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -21,9 +21,10 @@ import org.ourproject.kune.platf.client.services.Loader; import org.ourproject.kune.platf.client.services.PlatformModule; -import org.ourproject.kune.ws.armor.client.Body; -import org.ourproject.kune.ws.armor.client.resources.WsArmorResources; +import cc.kune.core.ws.armor.client.Body; +import cc.kune.core.ws.armor.client.resources.WsArmorResources; + import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/AdmissionType.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/AdmissionType.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/AdmissionType.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -19,6 +19,8 @@ */ package org.ourproject.kune.platf.server.domain; -public enum AdmissionType { +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum AdmissionType implements IsSerializable { Moderated, Open, Closed } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2010-12-09 16:03:51 UTC (rev 1163) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -78,7 +78,7 @@ @Length(min = 6, max = 40) private String password; - @OneToOne(cascade = CascadeType.ALL) + @OneToOne(cascade = CascadeType.REMOVE) private Group userGroup; @Field(index = Index.TOKENIZED, store = Store.NO) @@ -104,7 +104,7 @@ @NotNull private TimeZone timezone; - @OneToOne(cascade = CascadeType.ALL) + @OneToOne(cascade = CascadeType.REMOVE) private final CustomProperties customProperties; private UserBuddiesVisibility buddiesVisibility; 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-09 16:03:51 UTC (rev 1163) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-15 02:26:32 UTC (rev 1164) @@ -9,6 +9,7 @@ import org.ourproject.kune.workspace.client.site.SiteToken; import cc.kune.core.client.actions.BeforeActionListener; +import cc.kune.core.client.notify.SpinerPresenter; import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.core.shared.dto.StateToken; @@ -36,7 +37,8 @@ contentProvider = Mockito.mock(ContentProvider.class); session = Mockito.mock(Session.class); history = Mockito.mock(HistoryWrapper.class); - stateManager = new StateManagerDefault(contentProvider, session, history); + final SpinerPresenter spiner = Mockito.mock(SpinerPresenter.class); + stateManager = new StateManagerDefault(contentProvider, session, history, spiner); Mockito.when(session.getUserHash()).thenReturn(HASH); state = Mockito.mock(StateAbstractDTO.class); stateChangeListener = new MockedListener<StateAbstractDTO>();

1 0

09 Dec '10

Author: vjrj_ Date: 2010-12-09 17:03:51 +0100 (Thu, 09 Dec 2010) New Revision: 1163 Added: trunk/src/main/java/cc/kune/core/client/actions/ trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java trunk/src/main/java/cc/kune/core/client/cookies/ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java trunk/src/main/java/cc/kune/core/client/errors/ trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java trunk/src/main/java/cc/kune/core/client/errors/UIException.java trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java trunk/src/main/java/cc/kune/core/client/i18n/ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java trunk/src/main/java/cc/kune/core/client/notify/ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java trunk/src/main/java/cc/kune/core/client/rpcservices/ trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.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/I18nService.java trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.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/ 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/HistoryWrapper.java trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.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/utils/ trunk/src/main/java/cc/kune/core/client/utils/Location.java trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java trunk/src/main/java/cc/kune/core/shared/ trunk/src/main/java/cc/kune/core/shared/dto/ trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java trunk/src/main/java/cc/kune/core/shared/i18n/ trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java trunk/src/test/java/cc/ trunk/src/test/java/cc/kune/ trunk/src/test/java/cc/kune/core/ trunk/src/test/java/cc/kune/core/client/ trunk/src/test/java/cc/kune/core/client/state/ Removed: trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java trunk/src/test/java/org/ourproject/kune/platf/client/state/ Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreEventBus.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java trunk/src/main/java/cc/kune/core/shared/dto/AccessRolDTO.java trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java trunk/src/main/java/cc/kune/core/shared/dto/BasicMimeTypeDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java trunk/src/main/java/cc/kune/core/shared/dto/CommentDTO.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/ContentStatusDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ExtMediaDescripDTO.java trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java trunk/src/main/java/cc/kune/core/shared/dto/GroupType.java trunk/src/main/java/cc/kune/core/shared/dto/I18nCountryDTO.java trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageSimpleDTO.java trunk/src/main/java/cc/kune/core/shared/dto/I18nTranslationDTO.java trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java trunk/src/main/java/cc/kune/core/shared/dto/LinkDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ParticipationDataDTO.java trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java trunk/src/main/java/cc/kune/core/shared/dto/RoomDTO.java trunk/src/main/java/cc/kune/core/shared/dto/SearchResultDTO.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDTO.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkRequestResult.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.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/StateNoContentDTO.java trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java trunk/src/main/java/cc/kune/core/shared/dto/TagDTO.java trunk/src/main/java/cc/kune/core/shared/dto/TimeZoneDTO.java trunk/src/main/java/cc/kune/core/shared/dto/ToolSimpleDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesDataDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.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/gallery/client/cnt/GalleryViewerPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 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/ext/InsertMediaExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.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/AuthenticatedMethodInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.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/FileJsonUploadManagerAbstract.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/GroupManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.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/I18nRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.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/StateServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.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/ContentIconsRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.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/AccessListsPanel.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/cxt/ContextPropEditor.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.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/EntityHeaderPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.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/EntityOptionsDefLicenseView.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/logo/EntityOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.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/pscape/GroupOptionsPublicSpaceConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.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/EntityOptionsToolsConfView.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/rate/RateItPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.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/GroupMembersSummaryView.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.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/ParticipationSummaryView.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/UserActionRegistry.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.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/tags/TagsSummary.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.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/themes/WsThemeSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.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/FoldableAbstractClientTool.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.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/WaveInsertPanel.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/blogs/server/BlogServerToolTest.java trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.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/ContentServiceSaveTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.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 trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java Log: CLOSED - # 6: Common Actions integration http://kune.ourproject.org/issues/ticket/6 Incomplete - task : Startup cleanup Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,13 +6,15 @@ 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" />  <inherits name="com.google.gwt.user.User" /> - <inherits name='com.mvp4g.Mvp4gModule' /> + <inherits name='com.mvp4g.Mvp4gModule' /> <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> <inherits name="org.ourproject.common.Common" /> <inherits name="com.extjs.gxt.ui.GXT" /> + <inherits name="com.calclab.suco.Suco" />  <stylesheet src="ws.css" /> <stylesheet src="fontface/stylesheet.css" /> Modified: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,11 +1,16 @@ package cc.kune.core.client; import org.ourproject.common.client.CommonGinModule; +import org.ourproject.common.client.notify.ConfirmationAsk; +import org.ourproject.common.client.notify.NotifyLevel; +import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.notify.UserNotifierPresenter; import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreView; import com.mvp4g.client.annotation.Debug; +import com.mvp4g.client.annotation.Debug.LogLevel; import com.mvp4g.client.annotation.Event; import com.mvp4g.client.annotation.Events; import com.mvp4g.client.annotation.Start; @@ -15,14 +20,44 @@ * The Kune Core EventBus. */ @Events(startView = CoreView.class, ginModules = { CoreGinModule.class, CommonGinModule.class }) -@Debug +@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) + @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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -3,6 +3,15 @@ import org.ourproject.kune.ws.armor.client.Body; import org.ourproject.kune.ws.armor.client.IBody; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.ContentProvider; +import cc.kune.core.client.state.ContentProviderDefault; +import cc.kune.core.client.state.HistoryWrapper; +import cc.kune.core.client.state.HistoryWrapperDefault; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SessionDefault; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.inject.client.AbstractGinModule; import com.google.inject.Singleton; @@ -19,6 +28,12 @@ @Override protected void configure() { bind(IBody.class).to(Body.class).in(Singleton.class); + 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(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/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -2,10 +2,16 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.RootLayoutPanel; import com.google.gwt.user.client.ui.Widget; import com.mvp4g.client.Mvp4gModule; +/** + * The Class KuneEntryPoint. + */ public class KuneEntryPoint implements EntryPoint { /* @@ -13,8 +19,26 @@ * * @see com.google.gwt.core.client.EntryPoint#onModuleLoad() */ - @Override public void onModuleLoad() { + GWT.setUncaughtExceptionHandler(new UncaughtExceptionHandler() { + @Override + public void onUncaughtException(final Throwable e) { + GWT.log("Error in 'onModuleLoad()' method", e); + e.printStackTrace(); + } + }); + + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + public void execute() { + onModuleLoadCont(); + } + }); + } + + /** + * On module load cont. + */ + public void onModuleLoadCont() { final Mvp4gModule module = (Mvp4gModule) GWT.create(Mvp4gModule.class); module.createAndStartModule(); RootLayoutPanel.get().add((Widget) module.getStartView()); Copied: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,45 @@ +/* + * + * 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.client.actions; + +import java.util.ArrayList; + +/** + * The Class BeforeActionCollection. + */ +public class BeforeActionCollection extends ArrayList<BeforeActionListener> { + + private static final long serialVersionUID = -1508664709628420137L; + + /** + * Check before action listeners. + * + * @return true, if all listener returns true + */ + public boolean checkBeforeAction() { + for (BeforeActionListener listener : this) { + if (!listener.beforeAction()) { + return false; + } + } + return true; + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionCollection.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,31 @@ +/* + * + * 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.client.actions; + +public interface BeforeActionListener { + + /** + * Return false to cancel the action + * + * @return + */ + boolean beforeAction(); + +} Property changes on: trunk/src/main/java/cc/kune/core/client/actions/BeforeActionListener.java ___________________________________________________________________ Name: svn:mergeinfo + Added: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,30 @@ +package cc.kune.core.client.cookies; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.cookies.CookiesManager.ICookiesView; +import cc.kune.core.client.state.Session; + +import com.google.gwt.user.client.Cookies; +import com.google.inject.Inject; +import com.mvp4g.client.annotation.Presenter; +import com.mvp4g.client.presenter.BasePresenter; + +@Presenter(view = CookiesView.class) +public class CookiesManager extends BasePresenter<ICookiesView, CoreEventBus> { + public interface ICookiesView { + String getCurrentCookie(); + } + + @Inject + public CookiesManager() { + } + + public String getCurrentCookie() { + return Cookies.getCookie(Session.USERHASH); + // view.getCurrentCookie(); + } + + public void onDoNothing() { + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManager.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,19 @@ +package cc.kune.core.client.cookies; + +import cc.kune.core.client.cookies.CookiesManager.ICookiesView; +import cc.kune.core.client.state.Session; + +import com.google.gwt.user.client.Cookies; +import com.google.inject.Inject; + +public class CookiesView implements ICookiesView { + + @Inject + public CookiesView() { + } + + public String getCurrentCookie() { + return Cookies.getCookie(Session.USERHASH); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/cookies/CookiesView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/AccessViolationException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class AccessViolationException extends DefaultException { + private static final long serialVersionUID = -3786772632052256999L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyGroupMemberException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class AlreadyGroupMemberException extends DefaultException { + private static final long serialVersionUID = 6663958867752546481L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/AlreadyUserMemberException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class AlreadyUserMemberException extends DefaultException { + private static final long serialVersionUID = -6365615768192330492L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/ContainerNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class ContainerNotPermittedException extends DefaultException { + private static final long serialVersionUID = 6866318170714609691L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class ContentNotFoundException extends DefaultException { + private static final long serialVersionUID = -4641212341448422627L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/ContentNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class ContentNotPermittedException extends DefaultException { + private static final long serialVersionUID = 4771568826852748873L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/DefaultException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,40 @@ +/* + * + * 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.client.errors; + +import com.google.gwt.user.client.rpc.IsSerializable; +import com.google.gwt.user.client.rpc.StatusCodeException; + +public class DefaultException extends StatusCodeException implements IsSerializable { + + private static final long serialVersionUID = -6111471089427505005L; + + public DefaultException() { + this(0, ""); + } + + public DefaultException(final int statusCode, final String message) { + super(statusCode, message); + } + + public DefaultException(final String message) { + this(0, message); + } +} Copied: trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/EmailAddressInUseException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class EmailAddressInUseException extends DefaultException { + private static final long serialVersionUID = 3740509040361715407L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,121 @@ +/* + * + * 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.client.errors; + +import org.ourproject.common.client.notify.NotifyLevel; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener0; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; +import com.google.inject.Inject; +import com.mvp4g.client.event.BaseEventHandler; + +public class ErrorHandler extends BaseEventHandler<CoreEventBus> { + private final Session session; + private final I18nTranslationService i18n; + private final Event0 onSessionExpired; + + @Inject + public ErrorHandler(final Session session, final I18nTranslationService i18n) { + this.session = session; + this.i18n = i18n; + this.onSessionExpired = new Event0("onSessionExpired"); + } + + public void doSessionExpired() { + onSessionExpired.fire(); + eventBus.notify(NotifyLevel.info, "Your session has expired. Please log in again."); + } + + public void onSessionExpired(final Listener0 listener) { + onSessionExpired.add(listener); + } + + public void process(final Throwable caught) { + eventBus.hideSpin(); + if (caught instanceof AccessViolationException) { + logException(caught); + eventBus.notify(NotifyLevel.error, i18n.t("You do not have rights to perform that action")); + } else if (caught instanceof SessionExpiredException) { + logException(caught); + doSessionExpired(); + } else if (caught instanceof UserMustBeLoggedException) { + logException(caught); + if (session.isLogged()) { + doSessionExpired(); + } else { + eventBus.notify(NotifyLevel.important, i18n.t("Please sign in or register to collaborate")); + } + } else if (caught instanceof GroupNotFoundException) { + logException(caught); + + eventBus.notify(NotifyLevel.veryImportant, i18n.t("Group not found")); + eventBus.gotoToken(""); + } else if (caught instanceof IncompatibleRemoteServiceException) { + eventBus.notify(NotifyLevel.error, + i18n.t("Your browser is outdated with the server software. Please reload this page.")); + } else if (caught instanceof ContentNotFoundException) { + logException(caught); + eventBus.notify(NotifyLevel.veryImportant, i18n.t("Content not found")); + eventBus.gotoToken(""); + } else if (caught instanceof ContentNotPermittedException) { + logException(caught); + eventBus.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); + eventBus.gotoToken(""); + } else if (caught instanceof ContainerNotPermittedException) { + logException(caught); + eventBus.notify(NotifyLevel.error, i18n.t("Action not permitted in this location")); + eventBus.gotoToken(""); + } else if (caught instanceof LastAdminInGroupException) { + logException(caught); + eventBus.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.")); + } else if (caught instanceof AlreadyGroupMemberException) { + logException(caught); + eventBus.notify(NotifyLevel.error, i18n.t("This group is already a group member")); + } else if (caught instanceof AlreadyUserMemberException) { + logException(caught); + eventBus.notify(NotifyLevel.error, i18n.t("This user is already a group member")); + } else { + logException(caught, true); + eventBus.notify(NotifyLevel.error, i18n.t("Error performing operation")); + GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught); + } + } + + private void logException(final Throwable caught) { + logException(caught, false); + } + + private void logException(final Throwable caught, final boolean showException) { + if (showException) { + Log.debug("Exception in KuneErrorHandler", caught); + } else { + Log.debug("Exception in KuneErrorHandler: " + caught.getMessage()); + } + } + +} Copied: trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/GroupNameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class GroupNameInUseException extends DefaultException { + private static final long serialVersionUID = -4746775725822225687L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/GroupNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class GroupNotFoundException extends DefaultException { + private static final long serialVersionUID = 2358855015943550817L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/I18nNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class I18nNotFoundException extends DefaultException { + private static final long serialVersionUID = -2400899465805236215L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/LastAdminInGroupException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class LastAdminInGroupException extends DefaultException { + private static final long serialVersionUID = -8727443733339361388L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/NameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class NameInUseException extends DefaultException { + private static final long serialVersionUID = 4890594846432830537L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/NameNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class NameNotPermittedException extends DefaultException { + private static final long serialVersionUID = -8022844560909422614L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/NoDefaultContentException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class NoDefaultContentException extends DefaultException { + private static final long serialVersionUID = 7443824340580555859L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/SessionExpiredException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class SessionExpiredException extends DefaultException { + private static final long serialVersionUID = -1603881986661302041L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/ToolNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class ToolNotFoundException extends DefaultException { + private static final long serialVersionUID = 472511647264356558L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/UIException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UIException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/UIException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,43 @@ +/* + * + * 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.client.errors; + +import com.allen_sauer.gwt.log.client.Log; + +public class UIException extends RuntimeException { + + private static final long serialVersionUID = -1327164226202923181L; + + public UIException(final String text) { + super(text); + Log.error(text); + } + + public UIException(final String text, final Throwable cause) { + super(text, cause); + Log.error(text, cause); + } + + public UIException(final Throwable cause) { + super(cause); + Log.error("UIException", cause); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/UnknownPropertyException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,28 @@ +/* + * + * 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.client.errors; + +public class UnknownPropertyException extends DefaultException { + private static final long serialVersionUID = -5921396887476497824L; + + public UnknownPropertyException(final String message) { + super(message); + } +} Copied: trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/UserAuthException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class UserAuthException extends DefaultException { + private static final long serialVersionUID = -8383513776573054971L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/UserMustBeLoggedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class UserMustBeLoggedException extends DefaultException { + private static final long serialVersionUID = -5091069990899662849L; +} Copied: trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/UserNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; + +public class UserNotFoundException extends DefaultException { + private static final long serialVersionUID = 6207713694613166661L; +} Copied: trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nTranslationServiceMocked.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,31 @@ +/* + * + * 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.client.i18n; + +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + +public class I18nTranslationServiceMocked extends I18nTranslationService { + public String t(final String text) { + String encodeText = TextUtils.escapeHtmlLight(text); + String translation = removeNT(encodeText); + return decodeHtml(translation); + } +} Copied: trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/i18n/I18nUITranslationService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,215 @@ +/* + * + * 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.client.i18n; + +import java.util.Date; +import java.util.HashMap; + +import cc.kune.core.client.rpcservices.I18nServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.utils.Location; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.client.utils.WindowUtils; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Listener0; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.inject.Inject; + +public class I18nUITranslationService extends I18nTranslationService { + private HashMap<String, String> lexicon; + private String currentLanguageCode; + private I18nLanguageDTO currentLang; + private final I18nServiceAsync i18nService; + private final Session session; + + @Inject + public I18nUITranslationService(final Session session, final I18nServiceAsync i18nService) { + this.session = session; + this.i18nService = i18nService; + final Location loc = WindowUtils.getLocation(); + final String locale = loc.getParameter("locale"); + i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { + public void onFailure(final Throwable caught) { + Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); + } + + public void onSuccess(final I18nLanguageDTO result) { + currentLang = result; + currentLanguageCode = currentLang.getCode(); + session.setCurrentLanguage(currentLang); + i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { + public void onFailure(final Throwable caught) { + Log.error("Workspace adaptation to your language failed:" + caught.getMessage()); + } + + public void onSuccess(final HashMap<String, String> result) { + lexicon = result; + session.setCurrentLanguage(currentLang); + } + }); + } + }); + } + + public void changeCurrentLanguage(final String newLanguage) { + if (!newLanguage.equals(this.currentLanguageCode)) { + setCurrentLanguage(newLanguage); + changeLocale(newLanguage); + } + } + + public String formatDateWithLocale(final Date date) { + return formatDateWithLocale(date, false); + } + + public String formatDateWithLocale(final Date date, final boolean shortFormat) { + String dateFormat = shortFormat ? currentLang.getDateFormatShort() : currentLang.getDateFormat(); + + final DateTimeFormat fmt; + if (dateFormat == null) { + fmt = DateTimeFormat.getFormat("M/d/yyyy h:mm a"); + } else { + if (shortFormat) { + fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); + } else { + final String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date); + final String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]"; + dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'"); + fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); + } + } + final String dateFormated = fmt.format(date); + return dateFormated; + } + + public String getCurrentLanguage() { + return currentLanguageCode; + } + + public HashMap<String, String> getLexicon() { + return lexicon; + } + + public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) { + + } + + public void setCurrentLanguage(final String newLanguage) { + this.currentLanguageCode = newLanguage; + } + + public void setLexicon(final HashMap<String, String> lexicon) { + this.lexicon = lexicon; + } + + public void setTranslationAfterSave(final String text, final String translation) { + lexicon.put(text, translation); + } + + /** + * In production, this method uses a hashmap. In development, if the text is + * not in the hashmap, it makes a server petition (that stores the text + * pending for translation in db). + * + * Warning: text is escaped as html before insert in the db. Don't use html + * here (o user this method with params). + * + * @param text + * @return text translated in the current language + */ + @Override + public String t(final String text) { + final String encodeText = TextUtils.escapeHtmlLight(text); + String translation = lexicon.get(encodeText); + if (lexicon.containsKey(encodeText)) { + if (translation == UNTRANSLATED_VALUE) { + // Not translated but in db, return text + translation = removeNT(encodeText); + } + } else { + // Not translated and not in db, make a petition for translation + if (session.isLogged()) { + i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, + new AsyncCallback<String>() { + public void onFailure(final Throwable caught) { + } + + public void onSuccess(final String result) { + } + }); + Log.debug("Registering in db '" + text + "' as pending translation"); + lexicon.put(encodeText, UNTRANSLATED_VALUE); + } + translation = removeNT(encodeText); + } + return decodeHtml(translation); + } + + /** + * + * See in: + * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread + * /5e4e25050d3be984/7035ec39354d06aa?lnk=gst&q=get+locale&rnum=23 + * + * JSNI method to change the locale of the application - it effectively + * parses the existing URL and creates a new one for the chosen locale. + * + * It additionally launches any JavaScript debugger that might be attached + * to the system (Windows only). To disable this functionality just remove + * the "debugger" line. + * + * @param newLocale + * String value of the new locale to go to. + */ + private native void changeLocale(String newLocale) + /*-{ + // Uncomment the "debugger;" line to see how to set debug statements in JSNI code + // When in web mode, if your browser has a JavaScript debugger attached, it will + // launch at this point in the code (when the user changes locale through the menu system). + // debugger; + + // Get the current location + var currLocation = $wnd.location.toString(); + // Get rid of any GWT History tokens that might be present + var noHistoryCurrLocArray = currLocation.split("#"); + var noHistoryCurrLoc = noHistoryCurrLocArray[0]; + var currHistory = noHistoryCurrLocArray[1]; + // Get rid of any locale string + var locArray = noHistoryCurrLoc.split("?"); + // Build the new href location and then send the browser there. + // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; + $wnd.location.href = locArray[0]+"?locale="+newLocale + + // extjs part: + // commented because the error: "Ext is not defined" + // we have to try other way + // var head = document.getElementsByTagName("head")[0]; + // var script = document.createElement('script'); + // script.id = 'localScript'; + // script.type = 'text/javascript'; + // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; + // head.appendChild(script); + }-*/; + +} Added: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,47 @@ +package cc.kune.core.client.notify; + +import org.ourproject.common.client.notify.ConfirmationAsk; +import org.ourproject.common.client.notify.NotifyLevel; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.notify.UserNotifierPresenter.IUserNotifierView; + +import com.mvp4g.client.annotation.Presenter; +import com.mvp4g.client.presenter.LazyPresenter; +import com.mvp4g.client.view.LazyView; + +@Presenter(view = UserNotifierView.class) +public class UserNotifierPresenter extends LazyPresenter<IUserNotifierView, CoreEventBus> { + + public interface IUserNotifierView extends LazyView { + public void alert(String title, String message); + + public void confirmationAsk(ConfirmationAsk<?> ask); + + public void hideSpin(); + + public void notify(NotifyLevel level, String message); + + public void showSpin(String message); + } + + public void onAlert(final String title, final String message) { + view.alert(title, message); + } + + public void onConfirmationAsk(final ConfirmationAsk<?> ask) { + view.confirmationAsk(ask); + }; + + public void onHideSpin() { + view.hideSpin(); + } + + public void onNotify(final NotifyLevel level, final String message) { + view.notify(level, message); + } + + public void onShowSpin(final String message) { + view.showSpin(message); + } +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierPresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,49 @@ +package cc.kune.core.client.notify; + +import org.ourproject.common.client.notify.ConfirmationAsk; +import org.ourproject.common.client.notify.NotifyLevel; + +import cc.kune.core.client.notify.UserNotifierPresenter.IUserNotifierView; + +import com.google.gwt.user.client.Window; + +public class UserNotifierView implements IUserNotifierView { + + @Override + public void alert(final String title, final String message) { + message(title, message); + } + + @Override + public void confirmationAsk(final ConfirmationAsk<?> ask) { + // TODO Auto-generated method stub + + } + + @Override + public void createView() { + // TODO Auto-generated method stub + } + + @Override + public void hideSpin() { + // TODO Auto-generated method stub + + } + + @Override + public void notify(final NotifyLevel level, final String message) { + message("", message); + } + + @Override + public void showSpin(final String message) { + // TODO Auto-generated method stub + + } + + private void message(final String title, final String message) { + Window.alert(title + " " + message); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/notify/UserNotifierView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/AsyncCallbackSimple.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,36 @@ +/* + * + * 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.client.rpcservices; + +import cc.kune.core.client.errors.ErrorHandler; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.google.inject.Inject; + +public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> { + + @Inject + private ErrorHandler errorHandler; + + public void onFailure(final Throwable caught) { + errorHandler.process(caught); + } + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,90 @@ +/* + * + * 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.client.rpcservices; + +import java.util.Date; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.CommentDTO; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.RateResultDTO; +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.TagCloudResultDTO; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +@RemoteServiceRelativePath("ContentService") +public interface ContentService extends RemoteService { + + void addAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; + + CommentDTO addComment(String userHash, StateToken token, Long parentCommentId, String commentText) + throws DefaultException; + + CommentDTO addComment(String userHash, StateToken token, String commentText) throws DefaultException; + + StateContentDTO addContent(String user, StateToken parentToken, String name, String typeId) throws DefaultException; + + StateContainerDTO addFolder(String hash, StateToken parentToken, String typeId, String title) + throws DefaultException; + + StateContainerDTO addRoom(String user, StateToken parentToken, String name) throws DefaultException; + + StateContentDTO addWave(String userHash, StateToken parentToken, String waveFileType, String waveId); + + StateContentDTO delContent(String userHash, StateToken token) throws DefaultException; + + StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException; + + TagCloudResultDTO getSummaryTags(String userHash, StateToken groupToken) throws DefaultException; + + CommentDTO markCommentAsAbuse(String userHash, StateToken token, Long commentId) throws DefaultException; + + RateResultDTO rateContent(String userHash, StateToken token, Double value) throws DefaultException; + + void removeAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; + + StateAbstractDTO renameContainer(String userHash, StateToken token, String newName) throws DefaultException; + + StateAbstractDTO renameContent(String userHash, StateToken token, String newName) throws DefaultException; + + void save(String user, StateToken token, String content) throws DefaultException; + + ContentSimpleDTO setAsDefaultContent(String userHash, StateToken token); + + I18nLanguageDTO setLanguage(String userHash, StateToken token, String languageCode) throws DefaultException; + + void setPublishedOn(String userHash, StateToken token, Date date) throws DefaultException; + + StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatusDTO status); + + StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status); + + TagCloudResultDTO setTags(String userHash, StateToken token, String tags) throws DefaultException; + + CommentDTO voteComment(String userHash, StateToken token, Long commentId, boolean votePositive) + throws DefaultException; +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,94 @@ +/* + * + * 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.client.rpcservices; + +import java.util.Date; + + +import cc.kune.core.shared.dto.CommentDTO; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.RateResultDTO; +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.TagCloudResultDTO; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface ContentServiceAsync { + + void addAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback); + + void addComment(String userHash, StateToken token, Long parentCommentId, String commentText, + AsyncCallback<CommentDTO> asyncCallback); + + void addComment(String userHash, StateToken token, String commentText, AsyncCallback<CommentDTO> asyncCallback); + + void addContent(String user, StateToken parentToken, String name, String typeId, + AsyncCallback<StateContentDTO> callback); + + void addFolder(String hash, StateToken parentToken, String title, String typeId, + AsyncCallback<StateContainerDTO> callback); + + void addRoom(String user, StateToken parentToken, String name, AsyncCallback<StateContainerDTO> callback); + + void addWave(String userHash, StateToken parentToken, String waveFileType, String waveId, + AsyncCallback<StateContentDTO> asyncCallbackSimple); + + void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback); + + void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); + + void getSummaryTags(String userHash, StateToken groupToken, AsyncCallback<TagCloudResultDTO> asyncCallback); + + void markCommentAsAbuse(String userHash, StateToken token, Long commentId, AsyncCallback<CommentDTO> asyncCallback); + + void rateContent(String userHash, StateToken token, Double value, AsyncCallback<RateResultDTO> asyncCallback); + + void removeAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback); + + void renameContainer(String userHash, StateToken token, String newName, + AsyncCallback<StateAbstractDTO> asyncCallback); + + void renameContent(String userHash, StateToken token, String newName, AsyncCallback<StateAbstractDTO> asyncCallback); + + void save(String user, StateToken token, String content, AsyncCallback<Void> asyncCallback); + + void setAsDefaultContent(String userHash, StateToken token, AsyncCallback<ContentSimpleDTO> asyncCallback); + + void setLanguage(String userHash, StateToken token, String languageCode, + AsyncCallback<I18nLanguageDTO> asyncCallback); + + void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<Void> asyncCallback); + + void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status, + AsyncCallback<StateAbstractDTO> asyncCallback); + + void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status, + AsyncCallback<StateAbstractDTO> asyncCallback); + + void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResultDTO> asyncCallback); + + void voteComment(String userHash, StateToken token, Long commentId, boolean votePositive, + AsyncCallback<CommentDTO> asyncCallback); +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,54 @@ +/* + * + * 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.client.rpcservices; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; +import cc.kune.core.shared.dto.StateToken; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +@RemoteServiceRelativePath("GroupService") +public interface GroupService extends RemoteService { + + void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license); + + void changeGroupWsTheme(String userHash, StateToken groupToken, String theme) throws DefaultException; + + GroupDTO clearGroupBackImage(String userHash, StateToken token); + + StateToken createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools) + throws DefaultException; + + GroupDTO getGroup(String userHash, StateToken token); + + GroupDTO setGroupBackImage(String userHash, StateToken token); + + void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy); + + void setSocialNetworkVisibility(String userHash, StateToken groupToken, SocialNetworkVisibilityDTO visibility); + + void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled); + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,56 @@ +/* + * + * 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.client.rpcservices; + + +import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; +import cc.kune.core.shared.dto.StateToken; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface GroupServiceAsync { + + void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license, + AsyncCallback<Void> asyncCallback); + + void changeGroupWsTheme(String userHash, StateToken groupToken, String theme, AsyncCallback<Void> callback); + + void clearGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); + + void createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools, + AsyncCallback<StateToken> callback); + + void getGroup(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); + + void setGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); + + void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy, + AsyncCallback<Void> asyncCallback); + + void setSocialNetworkVisibility(String userHash, StateToken token, SocialNetworkVisibilityDTO visibility, + AsyncCallback<Void> asyncCallback); + + void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled, + AsyncCallback<Void> asyncCallback); + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/I18nService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,41 @@ +/* + * + * 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.client.rpcservices; + +import java.util.HashMap; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.I18nLanguageDTO; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +@RemoteServiceRelativePath("I18nService") +public interface I18nService extends RemoteService { + + I18nLanguageDTO getInitialLanguage(String localeParam); + + HashMap<String, String> getLexicon(String language); + + String getTranslation(String userHash, String language, String text); + + String setTranslation(String userHash, String id, String translation) throws DefaultException; + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/I18nServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,39 @@ +/* + * + * 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.client.rpcservices; + +import java.util.HashMap; + + +import cc.kune.core.shared.dto.I18nLanguageDTO; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface I18nServiceAsync { + + void getLexicon(String language, AsyncCallback<HashMap<String, String>> callback); + + void getTranslation(String userHash, String language, String text, AsyncCallback<String> callback); + + void setTranslation(String userHash, String id, String translation, AsyncCallback<String> asyncCallback); + + void getInitialLanguage(String localeParam, AsyncCallback<I18nLanguageDTO> callback); + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SiteService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,33 @@ +/* + * + * 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.client.rpcservices; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.InitDataDTO; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +@RemoteServiceRelativePath("SiteService") +public interface SiteService extends RemoteService { + + InitDataDTO getInitData(String userHash) throws DefaultException; + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SiteServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,31 @@ +/* + * + * 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.client.rpcservices; + + +import cc.kune.core.shared.dto.InitDataDTO; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface SiteServiceAsync { + + void getInitData(String userHash, AsyncCallback<InitDataDTO> callback); + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,62 @@ +/* + * + * 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.client.rpcservices; + +import cc.kune.core.client.errors.DefaultException; +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; + +@RemoteServiceRelativePath("SocialNetworkService") +public interface SocialNetworkService extends RemoteService { + + SocialNetworkDataDTO acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName) + throws DefaultException; + + SocialNetworkDataDTO addAdminMember(String hash, StateToken groupToken, String groupToAddShortName) + throws DefaultException; + + SocialNetworkDataDTO addCollabMember(String hash, StateToken groupToken, String groupToAddShortName) + throws DefaultException; + + SocialNetworkDataDTO addViewerMember(String hash, StateToken groupToken, String groupToAddShortName) + throws DefaultException; + + SocialNetworkDataDTO deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName) + throws DefaultException; + + SocialNetworkDataDTO denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName) + throws DefaultException; + + SocialNetworkDataDTO getSocialNetwork(String hash, StateToken groupToken) throws DefaultException; + + SocialNetworkRequestResult requestJoinGroup(String hash, StateToken groupToken) throws DefaultException; + + SocialNetworkDataDTO setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName) + throws DefaultException; + + SocialNetworkDataDTO setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName) + throws DefaultException; + + SocialNetworkDataDTO unJoinGroup(String hash, StateToken groupToken) throws DefaultException; +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetworkServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,60 @@ +/* + * + * 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.client.rpcservices; + + +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; + +public interface SocialNetworkServiceAsync { + + void acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void addAdminMember(String hash, StateToken groupToken, String groupToAddShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void addCollabMember(String hash, StateToken groupToken, String groupToAddShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void addViewerMember(String hash, StateToken groupToken, String groupToAddShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void getSocialNetwork(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback); + + void requestJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkRequestResult> callback); + + void setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName, + AsyncCallback<SocialNetworkDataDTO> callback); + + void unJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback); +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,49 @@ +/* + * + * 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.client.rpcservices; + + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; +import cc.kune.core.shared.dto.UserDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +@RemoteServiceRelativePath("UserService") +public interface UserService extends RemoteService { + + UserInfoDTO createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException; + + String getUserAvatarBaser64(String userHash, StateToken userToken) throws DefaultException; + + UserInfoDTO login(String nickOrEmail, String passwd) throws DefaultException; + + void logout(String userHash) throws DefaultException; + + void onlyCheckSession(String userHash) throws DefaultException; + + UserInfoDTO reloadUserInfo(String userHash) throws DefaultException; + + void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility); + +} Added: trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/UserServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,47 @@ +/* + * + * 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.client.rpcservices; + + +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; +import cc.kune.core.shared.dto.UserDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface UserServiceAsync { + + void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<UserInfoDTO> asyncCallback); + + void getUserAvatarBaser64(String userHash, StateToken userToken, AsyncCallback<String> asyncCallback); + + void login(String nickOrEmail, String passwd, AsyncCallback<UserInfoDTO> asyncCallback); + + void logout(String userHash, AsyncCallback<Void> asyncCallback); + + void onlyCheckSession(String userHash, AsyncCallback<Void> asyncCallback); + + void reloadUserInfo(String userHash, AsyncCallback<UserInfoDTO> asyncCallback); + + void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility, + AsyncCallback<Void> asyncCallback); + +} Copied: trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/AccessRightsClientManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,32 @@ +package cc.kune.core.client.state; + + +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; + +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; + +public class AccessRightsClientManager { + private AccessRightsDTO previousRights; + private final Event2<AccessRightsDTO, AccessRightsDTO> onRightsChanged; + + public AccessRightsClientManager(final StateManager stateManager) { + this.previousRights = null; + this.onRightsChanged = new Event2<AccessRightsDTO, AccessRightsDTO>("onRightsChanged"); + stateManager.onStateChanged(new Listener<StateAbstractDTO>() { + public void onEvent(final StateAbstractDTO newState) { + final AccessRightsDTO rights = newState.getGroupRights(); + if (!rights.equals(previousRights)) { + onRightsChanged.fire(previousRights, rights); + previousRights = rights; + } + } + }); + } + + public void onRightsChanged(final Listener2<AccessRightsDTO, AccessRightsDTO> listener) { + onRightsChanged.add(listener); + } +} Copied: trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProvider.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,34 @@ +/* + * + * 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.client.state; + + +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateToken; + +import com.google.gwt.user.client.rpc.AsyncCallback; + +public interface ContentProvider { + + void cache(StateToken encodeState, StateAbstractDTO content); + + void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); + +} Copied: trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/ContentProviderDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,62 @@ +/* + * + * 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.client.state; + +import java.util.HashMap; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +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; +import com.mvp4g.client.event.BaseEventHandler; + +public class ContentProviderDefault extends BaseEventHandler<CoreEventBus> implements ContentProvider { + + private final ContentServiceAsync server; + private final HashMap<StateToken, StateAbstractDTO> cache; + + @Inject + public ContentProviderDefault(final ContentServiceAsync server) { + this.server = server; + this.cache = new HashMap<StateToken, StateAbstractDTO>(); + } + + public void cache(final StateToken encodeState, final StateAbstractDTO content) { + cache.put(encodeState, content); + } + + public void getContent(final String user, final StateToken newState, final AsyncCallback<StateAbstractDTO> callback) { + eventBus.showSpinLoading(); + final StateAbstractDTO catched = getCached(newState); + if (catched != null) { + callback.onSuccess(catched); + } else { + server.getContent(user, newState, callback); + } + } + + private StateAbstractDTO getCached(final StateToken newState) { + return cache.remove(newState); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapper.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,28 @@ +/* + * + * 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.client.state; + +public interface HistoryWrapper { + + String getToken(); + + void newItem(final String historyToken); + +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/HistoryWrapperDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,34 @@ +/* + * + * 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.client.state; + +import com.google.gwt.user.client.History; + +public class HistoryWrapperDefault implements HistoryWrapper { + + public String getToken() { + return History.getToken(); + } + + public void newItem(final String historyToken) { + History.newItem(historyToken); + } + +} Copied: trunk/src/main/java/cc/kune/core/client/state/Session.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,155 @@ +/* + * + * 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/>. + * + */ +/* + * + * This file is part of kune. + * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) + * + * 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.client.state; + +import java.util.Collection; +import java.util.List; + + +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.shared.dto.I18nCountryDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.LicenseDTO; +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; + +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; + +public interface Session { + + /** + * Duration remembering login: 2 weeks + */ + int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; + + String USERHASH = "userHash"; + + void check(AsyncCallbackSimple<Void> callback); + + StateContainerDTO getContainerState(); + + StateContentDTO getContentState(); + + List<I18nCountryDTO> getCountries(); + + Object[][] getCountriesArray(); + + String getCurrentCCversion(); + + String getCurrentGroupShortName(); + + I18nLanguageDTO getCurrentLanguage(); + + StateAbstractDTO getCurrentState(); + + StateToken getCurrentStateToken(); + + UserSimpleDTO getCurrentUser(); + + UserInfoDTO getCurrentUserInfo(); + + LicenseDTO getDefLicense(); + + String getGalleryPermittedExtensions(); + + Collection<ToolSimpleDTO> getGroupTools(); + + int getImgCropsize(); + + int getImgIconsize(); + + int getImgResizewidth(); + + int getImgThumbsize(); + + InitDataDTO getInitData(); + + List<I18nLanguageSimpleDTO> getLanguages(); + + Object[][] getLanguagesArray(); + + List<LicenseDTO> getLicenses(); + + boolean getShowDeletedContent(); + + String getSiteUrl(); + + Object[][] getTimezones(); + + String getUserHash(); + + Collection<ToolSimpleDTO> getUserTools(); + + boolean inSameToken(StateToken token); + + boolean isCurrentStateAContent(); + + boolean isCurrentStateAGroup(); + + boolean isInCurrentUserSpace(); + + boolean isLogged(); + + boolean isNotLogged(); + + void onInitDataReceived(Listener<InitDataDTO> listener); + + void onUserSignIn(Listener<UserInfoDTO> listener); + + void onUserSignOut(Listener0 listener); + + void setCurrentLanguage(final I18nLanguageDTO currentLanguage); + + void setCurrentState(final StateAbstractDTO currentState); + + void setCurrentUserInfo(UserInfoDTO currentUserInfo); + + void setInitData(InitDataDTO initData); + + void setUserHash(String userHash); + +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/SessionDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,299 @@ +/* + * + * 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.client.state; + +import java.util.Collection; +import java.util.List; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.cookies.CookiesManager; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.shared.dto.I18nCountryDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.I18nLanguageSimpleDTO; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.LicenseDTO; +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; + +import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.google.gwt.core.client.GWT; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.mvp4g.client.event.BaseEventHandler; + +public class SessionDefault extends BaseEventHandler<CoreEventBus> implements Session { + private String userHash; + private InitDataDTO initData; + private UserInfoDTO currentUserInfo; + private Object[][] languagesArray; + private Object[][] countriesArray; + private Object[][] timezonesArray; + private StateAbstractDTO currentState; + private I18nLanguageDTO currentLanguage; + private final Event<InitDataDTO> onInitDataReceived; + private final Event<UserInfoDTO> onUserSignIn; + private final Event0 onUserSignOut; + private final Provider<UserServiceAsync> userServiceProvider; + + @Inject + public SessionDefault(final CookiesManager cookieManager, final Provider<UserServiceAsync> userServiceProvider) { + this.userHash = cookieManager.getCurrentCookie(); + this.userHash = userHash == null || userHash.equals("null") ? null : userHash; + this.userServiceProvider = userServiceProvider; + languagesArray = null; + this.onInitDataReceived = new Event<InitDataDTO>("initDataReceived"); + this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn"); + this.onUserSignOut = new Event0("onUserSignOut"); + } + + public void check(final AsyncCallbackSimple<Void> callback) { + Log.debug("Checking session (userhash: " + getUserHash() + ")"); + userServiceProvider.get().onlyCheckSession(getUserHash(), callback); + } + + public StateContainerDTO getContainerState() { + return (StateContainerDTO) currentState; + } + + public StateContentDTO getContentState() { + return (StateContentDTO) currentState; + } + + public List<I18nCountryDTO> getCountries() { + return initData.getCountries(); + } + + public Object[][] getCountriesArray() { + if (countriesArray == null) { + countriesArray = mapCountries(); + } + return countriesArray; + } + + public String getCurrentCCversion() { + return initData.getCurrentCCversion(); + } + + public String getCurrentGroupShortName() { + return currentState == null ? null : currentState.getStateToken().getGroup(); + } + + public I18nLanguageDTO getCurrentLanguage() { + return currentLanguage; + } + + public StateAbstractDTO getCurrentState() { + return currentState; + } + + public StateToken getCurrentStateToken() { + return currentState == null ? null : currentState.getStateToken(); + } + + public UserSimpleDTO getCurrentUser() { + return currentUserInfo == null ? null : currentUserInfo.getUser(); + } + + public UserInfoDTO getCurrentUserInfo() { + return currentUserInfo; + } + + public LicenseDTO getDefLicense() { + return initData.getDefaultLicense(); + } + + public String getGalleryPermittedExtensions() { + return initData.getGalleryPermittedExtensions(); + } + + public Collection<ToolSimpleDTO> getGroupTools() { + return initData.getGroupTools(); + } + + public int getImgCropsize() { + return initData.getImgCropsize(); + } + + public int getImgIconsize() { + return initData.getImgIconsize(); + } + + public int getImgResizewidth() { + return initData.getImgResizewidth(); + } + + public int getImgThumbsize() { + return initData.getImgThumbsize(); + } + + public InitDataDTO getInitData() { + return initData; + } + + public List<I18nLanguageSimpleDTO> getLanguages() { + return initData.getLanguages(); + } + + public Object[][] getLanguagesArray() { + if (languagesArray == null) { + languagesArray = mapLangs(); + } + return languagesArray; + } + + public List<LicenseDTO> getLicenses() { + return initData.getLicenses(); + } + + public boolean getShowDeletedContent() { + return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); + } + + public String getSiteUrl() { + final String baseURL = GWT.getModuleBaseURL(); + return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName())); + } + + public Object[][] getTimezones() { + if (timezonesArray == null) { + mapTimezones(); + } + return timezonesArray; + } + + public String getUserHash() { + return userHash; + } + + public Collection<ToolSimpleDTO> getUserTools() { + return initData.getUserTools(); + } + + public boolean inSameToken(final StateToken token) { + return getCurrentStateToken().equals(token); + } + + public boolean isCurrentStateAContent() { + return currentState instanceof StateContentDTO; + } + + public boolean isCurrentStateAGroup() { + return currentState == null ? false : !currentState.getGroup().isPersonal(); + } + + public boolean isInCurrentUserSpace() { + if (!isLogged()) { + return false; + } + if (getCurrentStateToken().getGroup().equals(getCurrentUser().getShortName())) { + return true; + } + return false; + } + + public boolean isLogged() { + return userHash != null; + } + + public boolean isNotLogged() { + return !isLogged(); + } + + public void onInitDataReceived(final Listener<InitDataDTO> listener) { + onInitDataReceived.add(listener); + } + + public void onUserSignIn(final Listener<UserInfoDTO> listener) { + onUserSignIn.add(listener); + } + + public void onUserSignOut(final Listener0 listener) { + onUserSignOut.add(listener); + } + + public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { + this.currentLanguage = currentLanguage; + eventBus.i18nReady(); + } + + public void setCurrentState(final StateAbstractDTO currentState) { + this.currentState = currentState; + } + + public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { + this.currentUserInfo = currentUserInfo; + if (currentUserInfo != null) { + onUserSignIn.fire(currentUserInfo); + } else { + onUserSignOut.fire(); + } + } + + public void setInitData(final InitDataDTO initData) { + this.initData = initData; + onInitDataReceived.fire(initData); + } + + public void setUserHash(final String userHash) { + this.userHash = userHash; + } + + private Object[][] mapCountries() { + assert (initData != null); + final Object[][] objs = new Object[initData.getCountries().size()][1]; + int i = 0; + for (final I18nCountryDTO country : initData.getCountries()) { + final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; + objs[i++] = obj; + } + return objs; + } + + private Object[][] mapLangs() { + assert (initData != null); + final Object[][] objs = new Object[initData.getLanguages().size()][1]; + int i = 0; + for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { + final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; + objs[i++] = obj; + } + return objs; + } + + private void mapTimezones() { + 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] }; + timezonesArray[i] = obj; + } + } +} Copied: trunk/src/main/java/cc/kune/core/client/state/StateManager.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,64 @@ +/* + * + * 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.client.state; + + +import cc.kune.core.client.actions.BeforeActionListener; +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; +import com.calclab.suco.client.events.Listener2; + +public interface StateManager { + + void addBeforeStateChangeListener(BeforeActionListener listener); + + void addSiteToken(String token, Listener0 whenToken); + + void gotoToken(StateToken newToken); + + void gotoToken(String newToken); + + void onGroupChanged(Listener2<String, String> listener); + + void onSocialNetworkChanged(Listener<StateAbstractDTO> listener); + + void onStateChanged(Listener<StateAbstractDTO> listener); + + void onToolChanged(Listener2<String, String> listener); + + void reload(); + + void removeBeforeStateChangeListener(BeforeActionListener listener); + + void removeSiteToken(String token); + + void restorePreviousToken(); + + void resumeTokenChange(); + + void setRetrievedState(StateAbstractDTO state); + + void setSocialNetwork(SocialNetworkDataDTO socialNet); + +} Copied: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,237 @@ +/* + * + * 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.client.state; + +import java.util.HashMap; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.actions.BeforeActionCollection; +import cc.kune.core.client.actions.BeforeActionListener; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.events.Listener2; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.event.logical.shared.ValueChangeHandler; +import com.google.gwt.user.client.History; +import com.google.inject.Inject; +import com.mvp4g.client.event.BaseEventHandler; + +public class StateManagerDefault extends BaseEventHandler<CoreEventBus> implements StateManager, + ValueChangeHandler<String> { + private final ContentProvider contentProvider; + private StateToken previousToken; + /** + * When a historyChanged is interrupted (for instance because you are + * editing something), the new token is stored here + */ + private StateToken resumedToken; + private final Session session; + private final HistoryWrapper history; + private final HashMap<String, Listener0> siteTokens; + private final Event<StateAbstractDTO> onStateChanged; + private final Event<StateAbstractDTO> onSocialNetworkChanged; + private final Event2<String, String> onToolChanged; + private final Event2<String, String> onGroupChanged; + private final BeforeActionCollection beforeStateChangeCollection; + + @Inject + public StateManagerDefault(final ContentProvider contentProvider, final Session session, + final HistoryWrapper history) { + // Put this outside here + History.addValueChangeHandler(this); + this.contentProvider = contentProvider; + this.session = session; + this.history = history; + this.previousToken = null; + this.resumedToken = null; + this.onStateChanged = new Event<StateAbstractDTO>("onStateChanged"); + this.onGroupChanged = new Event2<String, String>("onGroupChanged"); + this.onToolChanged = new Event2<String, String>("onToolChanged"); + this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged"); + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO parameter) { + if (previousToken == null) { + // starting up + reload(); + } else { + // do nothing, SigInPresent calls goto; + } + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + reload(); + } + }); + siteTokens = new HashMap<String, Listener0>(); + beforeStateChangeCollection = new BeforeActionCollection(); + } + + public void addBeforeStateChangeListener(final BeforeActionListener listener) { + beforeStateChangeCollection.add(listener); + } + + public void addSiteToken(final String token, final Listener0 listener) { + siteTokens.put(token, listener); + } + + public void gotoToken(final StateToken newToken) { + Log.debug("StateManager: history goto-token newItem (" + newToken + ")"); + history.newItem(newToken.getEncoded()); + } + + public void gotoToken(final String token) { + gotoToken(new StateToken(token)); + } + + public void onGroupChanged(final Listener2<String, String> listener) { + onGroupChanged.add(listener); + } + + public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) { + onSocialNetworkChanged.add(listener); + } + + public void onStateChanged(final Listener<StateAbstractDTO> listener) { + onStateChanged.add(listener); + } + + public void onToolChanged(final Listener2<String, String> listener) { + onToolChanged.add(listener); + } + + public void onValueChange(final ValueChangeEvent<String> event) { + onHistoryChanged(event.getValue()); + } + + /** + * <p> + * Reload current state (using client cache if available) + * </p> + */ + public void reload() { + onHistoryChanged(history.getToken()); + } + + public void removeBeforeStateChangeListener(final BeforeActionListener listener) { + beforeStateChangeCollection.remove(listener); + } + + public void removeSiteToken(final String token) { + siteTokens.remove(token); + } + + public void restorePreviousToken() { + gotoToken(previousToken); + } + + public void resumeTokenChange() { + if (resumedToken != null) { + reload(); + gotoToken(resumedToken); + clearResumedToken(); + } + } + + public void setRetrievedState(final StateAbstractDTO newState) { + contentProvider.cache(newState.getStateToken(), newState); + // setState(newState); + history.newItem(newState.getStateToken().toString()); + } + + public void setSocialNetwork(final SocialNetworkDataDTO socialNet) { + StateAbstractDTO state; + if (session != null && (state = session.getCurrentState()) != null) { + // After a SN operation, usually returns a SocialNetworkResultDTO + // with new SN data and we refresh the state + // to avoid to reload() again the state + state.setSocialNetworkData(socialNet); + onSocialNetworkChanged.fire(state); + } + } + + void onHistoryChanged(final String historyToken) { + // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory + if (beforeStateChangeCollection.checkBeforeAction()) { + final Listener0 tokenListener = siteTokens.get(historyToken); + Log.debug("StateManager: history token changed (" + historyToken + ")"); + if (tokenListener == null) { + // Ok, normal token change + onHistoryChanged(new StateToken(historyToken)); + } else { + // token is one of #newgroup #signin #translate ... + if (previousToken == null) { + // Starting with some token like "signin": load defContent + // also + onHistoryChanged(""); + } + tokenListener.onEvent(); + } + } else { + resumedToken = new StateToken(historyToken); + } + } + + void setState(final StateAbstractDTO newState) { + session.setCurrentState(newState); + onStateChanged.fire(newState); + eventBus.hideSpin(); + checkGroupAndToolChange(newState); + previousToken = newState.getStateToken(); + + } + + private void checkGroupAndToolChange(final StateAbstractDTO newState) { + final String previousGroup = previousToken == null ? "" : previousToken.getGroup(); + final String newGroup = newState.getStateToken().getGroup(); + final String previousTokenTool = previousToken == null ? "" : previousToken.getTool(); + final String newTokenTool = newState.getStateToken().getTool(); + final String previousToolName = previousTokenTool == null ? "" : previousTokenTool; + final String newToolName = newTokenTool == null ? "" : newTokenTool; + + if (previousToken == null || previousToolName == null || !previousToolName.equals(newToolName)) { + onToolChanged.fire(previousToolName, newToolName); + } + if (previousToken == null || !previousGroup.equals(newGroup)) { + onGroupChanged.fire(previousGroup, newGroup); + } + } + + private void clearResumedToken() { + resumedToken = null; + } + + private void onHistoryChanged(final StateToken newState) { + contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateAbstractDTO>() { + public void onSuccess(final StateAbstractDTO newState) { + setState(newState); + } + }); + } +} Copied: trunk/src/main/java/cc/kune/core/client/utils/Location.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/utils/Location.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/utils/Location.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,148 @@ +/* + * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + \*/ +package cc.kune.core.client.utils; + +import java.util.HashMap; +import java.util.Map; + +public class Location { + private String hash; + private String host; + private String hostName; + private String href; + private String path; + private String port; + private String protocol; + private String queryString; + private HashMap<String, String> paramMap; + + /** + * sample: #site.docs.3.1 + **/ + public String getHash() { + return hash; + } + + /** + * sample: locahost:8080 + * + * @return + */ + public String getHost() { + return host; + } + + /** + * sample: locahost + * + * @return + */ + public String getHostName() { + return hostName; + } + + /** + * sample: http://localhost:8080/ws/#site.docs.3.1?locale=en&log_level=INFO + **/ + public String getHref() { + return href; + } + + public String getParameter(final String name) { + return paramMap.get(name); + } + + public Map<String, String> getParameterMap() { + return paramMap; + } + + /** + * sample: /ws/ + * + * @return + */ + public String getPath() { + return path; + } + + public String getPort() { + return port; + } + + public String getProtocol() { + return protocol; + } + + /** + * sample: ?locale=en&log_level=INFO + * + * @return + */ + public String getQueryString() { + return queryString; + } + + protected void setHash(final String hash) { + this.hash = hash; + } + + protected void setHost(final String host) { + this.host = host; + } + + protected void setHostName(final String hostName) { + this.hostName = hostName; + } + + protected void setHref(final String href) { + this.href = href; + } + + protected void setPath(final String path) { + this.path = path; + } + + protected void setPort(final String port) { + this.port = port; + } + + protected void setProtocol(final String protocol) { + this.protocol = protocol; + } + + protected void setQueryString(final String queryString) { + this.queryString = queryString; + paramMap = new HashMap<String, String>(); + + if (queryString != null && queryString.length() > 1) { + String qs = queryString.substring(1); + String[] kvPairs = qs.split("&"); + for (String kvPair : kvPairs) { + String[] kv = kvPair.split("="); + if (kv.length > 1) { + paramMap.put(kv[0], unescape(kv[1])); + } else { + paramMap.put(kv[0], ""); + } + } + } + } + + private native String unescape(String val) /*-{ + return unescape(val); + }-*/; + +} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,99 @@ +/* + * + * 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.client.utils; + +import java.util.ArrayList; + +public class TextUtils { + + public static final String IN_DEVELOPMENT_P = " (in development)"; + public static final String IN_DEVELOPMENT = "In development"; + + // Original regexp from http://snippets.dzone.com/posts/show/452 + public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; + + // Original regexp from http://www.regular-expressions.info/email.html + public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?"; + + public static final String UNIX_NAME = "^[a-z0-9_\\-]+$"; + + public static final String NUM_REGEXP = "^[0-9]+$"; + + /* + * This method escape only some dangerous html chars + */ + public static String escapeHtmlLight(final String source) { + if (source == null) { + return null; + } + String result = source; + result = result.replaceAll("&", "&"); + result = result.replaceAll("\"", """); + // text = text.replaceAll("\'", "'"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); + return result; + } + + public static String generateHtmlLink(final String href, final String text) { + return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>"; + } + + public static ArrayList<String> splitTags(final String tagsString) { + final ArrayList<String> tagsList = new ArrayList<String>(); + String tagsCopy = tagsString; + // remove commas and quotes + if (tagsString == null) { + return tagsList; + } + tagsCopy = tagsCopy.replaceAll(",", " "); + tagsCopy = tagsCopy.replaceAll("\"", ""); + tagsCopy = tagsCopy.replaceAll("\'", ""); + final String[] splitted = tagsCopy.split("\\s+"); + for (String tag : splitted) { + tag = tag.replaceAll("\\s$", ""); + if (tag.length() > 0) { + tagsList.add(tag); + } + } + return tagsList; + } + + /* + * This method unescape only some dangerous html chars for use in GWT Html + * widget for instance + */ + public static String unescape(final String source) { + if (source == null) { + return null; + } + String result = source; + result = result.replaceAll("&", "&"); + result = result.replaceAll(""", "\""); + result = result.replaceAll("'", "\'"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); + return result; + } + + public TextUtils() { + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/utils/TextUtils.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/utils/WindowUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,65 @@ +/* + * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com> + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cc.kune.core.client.utils; + +public class WindowUtils { + + public static Location getLocation() { + Location result = new Location(); + result.setHash(getHash()); + result.setHost(getHost()); + result.setHostName(getHostName()); + result.setHref(getHref()); + result.setPath(getPath()); + result.setPort(getPort()); + result.setProtocol(getProtocol()); + result.setQueryString(getQueryString()); + return result; + } + + private static native String getHash() /*-{ + return $wnd.location.hash; + }-*/; + + private static native String getHost() /*-{ + return $wnd.location.host; + }-*/; + + private static native String getHostName() /*-{ + return $wnd.location.hostname; + }-*/; + + private static native String getHref() /*-{ + return $wnd.location.href; + }-*/; + + private static native String getPath() /*-{ + return $wnd.location.pathname; + }-*/; + + private static native String getPort() /*-{ + return $wnd.location.port; + }-*/; + + private static native String getProtocol() /*-{ + return $wnd.location.protocol; + }-*/; + + private static native String getQueryString() /*-{ + return $wnd.location.search; + }-*/; + +} \ No newline at end of file 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -2,7 +2,9 @@ import cc.kune.core.client.CoreEventBus; import cc.kune.core.client.ws.CorePresenter.ICoreView; +import cc.kune.core.shared.i18n.I18nTranslationService; +import com.google.inject.Inject; import com.mvp4g.client.annotation.Presenter; import com.mvp4g.client.presenter.BasePresenter; @@ -18,6 +20,10 @@ public interface ICoreView { } + @Inject + public CorePresenter(final I18nTranslationService i18n) { + } + /** * On start. */ Copied: trunk/src/main/java/cc/kune/core/shared/dto (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/dto) Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessListsDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/AccessListsDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRightsDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/AccessRightsDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/AccessRolDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AccessRolDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/AccessRolDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; public enum AccessRolDTO { Administrator, Editor, Viewer Modified: trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/AdmissionTypeDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/AdmissionTypeDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/BasicMimeTypeDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/BasicMimeTypeDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ChatUserParamsDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ChatUserParamsDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,11 +17,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; -import com.calclab.emiteuimodule.client.SubscriptionMode; import com.google.gwt.user.client.rpc.IsSerializable; +@Deprecated public class ChatUserParamsDTO implements IsSerializable { private String avatar; Modified: trunk/src/main/java/cc/kune/core/shared/dto/CommentDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/CommentDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/CommentDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContainerSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContentSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ContentStatusDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContentStatusDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ExtMediaDescripDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ExtMediaDescripDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ExtMediaDescripDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,4 +1,4 @@ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupListDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupListDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/GroupType.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/GroupType.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/GroupType.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nCountryDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nCountryDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/I18nCountryDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nLanguageDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nLanguageSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/I18nLanguageSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/I18nTranslationDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/I18nTranslationDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/I18nTranslationDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/InitDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.ArrayList; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LicenseDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/LicenseDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/LinkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/LinkDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/LinkDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ParticipationDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ParticipationDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ParticipationDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/RateResultDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/RateResultDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/RoomDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/RoomDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/RoomDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; public class RoomDTO { Modified: trunk/src/main/java/cc/kune/core/shared/dto/SearchResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SearchResultDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/SearchResultDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkRequestResult.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkRequestResult.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkRequestResult.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/SocialNetworkVisibilityDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkVisibilityDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateAbstractDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateAbstractDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateContainerDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContainerDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateContentDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateContentDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.Date; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateNoContentDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateNoContentDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateNoContentDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateToken.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateToken.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateTokenUtils.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/StateTokenUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,6 +1,6 @@ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; public class StateTokenUtils { Added: trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,7 @@ +package cc.kune.core.shared.dto; + +import com.google.gwt.user.client.rpc.IsSerializable; + +public enum SubscriptionMode implements IsSerializable { + manual, autoAcceptAll, autoRejectAll +} \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/shared/dto/SubscriptionMode.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagCloudResultDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/TagCloudResultDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagCountDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/TagCountDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/TagDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TagDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/TagDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/TimeZoneDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/TimeZoneDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/TimeZoneDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/ToolSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/ToolSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/ToolSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesDataDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesDataDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesDataDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * \*/ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.ArrayList; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserBuddiesVisibilityDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserBuddiesVisibilityDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,9 +17,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; -import com.calclab.emiteuimodule.client.SubscriptionMode; import com.google.gwt.user.client.rpc.IsSerializable; public class UserDTO implements IsSerializable { @@ -153,6 +152,7 @@ this.timezone = timezone; } + @Override public String toString() { return "UserDTO[" + shortName + "]"; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserInfoDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import java.util.List; Modified: trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserSimpleDTO.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/main/java/cc/kune/core/shared/dto/UserSimpleDTO.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.ourproject.kune.platf.client.dto; +package cc.kune.core.shared.dto; import com.google.gwt.user.client.rpc.IsSerializable; Copied: trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java (from rev 1158, trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java) =================================================================== --- trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java (rev 0) +++ trunk/src/main/java/cc/kune/core/shared/i18n/I18nTranslationService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -0,0 +1,137 @@ +/* + * + * 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.i18n; + +public abstract class I18nTranslationService { + protected static final String TRANSLATION_NOTE_REGEXP = " (\\[)%NT (.*)(\\])$"; + protected static final String NOTE_FOR_TRANSLATOR_TAG_BEGIN = " [%NT "; + protected static final String NOTE_FOR_TRANSLATOR_TAG_END = "]"; + // Also in I18nTranslation + protected static final String UNTRANSLATED_VALUE = null; + + public String decodeHtml(final String textToDecode) { + String text = textToDecode; + // text = text.replaceAll("©", "©"); + return text; + } + + public String removeNT(final String string) { + return string.replaceAll(TRANSLATION_NOTE_REGEXP, ""); + } + + /** + * In production, this method uses a hashmap. In development, if the text is + * not in the hashmap, it makes a server petition (that stores the text + * pending for translation in db). + * + * Warning: text is escaped as html before insert in the db. Don't use html + * here (o user this method with params). + * + * @param text + * @return text translated in the current language + */ + // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:49 + public abstract String t(final String text); + + /** + * Use [%d] to reference the Integer parameters + * + */ + // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50 + public String t(final String text, final Integer... args) { + String translation = t(text); + for (Integer arg : args) { + translation = translation.replaceFirst("\\[%d\\]", arg.toString()); + } + return decodeHtml(translation); + } + + /** + * Use [%d] to reference the Long parameter + * + */ + // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50 + public String t(final String text, final Long... args) { + String translation = t(text); + for (Long arg : args) { + translation = translation.replaceFirst("\\[%d\\]", arg.toString()); + } + return decodeHtml(translation); + } + + /** + * Use [%s] to reference the string parameter + * + */ + // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50 + public String t(final String text, final String... args) { + String translation = t(text); + for (String arg : args) { + translation = translation.replaceFirst("\\[%s\\]", arg); + } + return decodeHtml(translation); + } + + /** + * Adds [%NT noteForTranslators] at the end of text. This tag is later + * renderer in the translator panel to inform translator how to do this + * translation + * + */ + public String tWithNT(final String text, final String noteForTranslators) { + return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END); + } + + /** + * Use [%d] to reference the Integer parameter. + * + * Also adds [%NT noteForTranslators] at the end of text. This tag is later + * renderer in the translator panel to inform translator how to do this + * translation + * + */ + public String tWithNT(final String text, final String noteForTranslators, final Integer... args) { + return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args); + } + + /** + * Use [%d] to reference the Long parameter. + * + * Also adds [%NT noteForTranslators] at the end of text. This tag is later + * renderer in the translator panel to inform translator how to do this + * translation + * + */ + public String tWithNT(final String text, final String noteForTranslators, final Long... args) { + return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args); + } + + /** + * Use [%s] to reference the String parameter. + * + * Also adds [%NT noteForTranslators] at the end of text. This tag is later + * renderer in the translator panel to inform translator how to do this + * translation + * + */ + public String tWithNT(final String text, final String noteForTranslators, final String... args) { + return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args); + } +} Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -23,12 +23,6 @@ import org.ourproject.kune.chat.server.ChatServerModule; import org.ourproject.kune.docs.server.DocumentServerModule; import org.ourproject.kune.gallery.server.GalleryServerModule; -import org.ourproject.kune.platf.client.rpc.ContentService; -import org.ourproject.kune.platf.client.rpc.GroupService; -import org.ourproject.kune.platf.client.rpc.I18nService; -import org.ourproject.kune.platf.client.rpc.SiteService; -import org.ourproject.kune.platf.client.rpc.SocialNetworkService; -import org.ourproject.kune.platf.client.rpc.UserService; import org.ourproject.kune.platf.server.LoggerMethodInterceptor; import org.ourproject.kune.platf.server.PlatformServerModule; import org.ourproject.kune.platf.server.manager.file.EntityLogoDownloadManager; @@ -50,6 +44,13 @@ import org.ourproject.kune.rack.filters.rest.RESTServicesModule; import org.ourproject.kune.wiki.server.WikiServerModule; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.client.rpcservices.UserService; + import com.google.inject.AbstractModule; import com.google.inject.Module; import com.google.inject.Scope; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,12 +25,6 @@ import static org.ourproject.kune.blogs.client.BlogClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.blogs.client.cnt.BlogViewer; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; @@ -45,6 +39,13 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class BlogClientActions extends AbstractFoldableContentActions { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -30,15 +30,8 @@ import org.ourproject.kune.blogs.client.ctx.BlogContext; import org.ourproject.kune.blogs.client.ctx.BlogContextPresenter; import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; @@ -57,6 +50,14 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.blogs.client; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; import org.ourproject.kune.workspace.client.tool.ToolSelector; +import cc.kune.core.client.i18n.I18nUITranslationService; + public class BlogClientTool extends FoldableAbstractClientTool { public static final String NAME = "blogs"; public static final String TYPE_ROOT = NAME + "." + "root"; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class BlogFolderContentPanel extends FoldableContentPanel implements BlogFolderContentView { public BlogFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,16 +21,17 @@ import org.ourproject.kune.blogs.client.BlogClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +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; public class BlogFolderContentPresenter extends FoldableContentPresenter implements BlogFolderContent { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.blogs.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class BlogViewerPanel extends FoldableContentPanel implements BlogViewerView { public BlogViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { super(ws, i18n); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,16 +20,17 @@ package org.ourproject.kune.blogs.client.cnt; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.ioc.Provider; public class BlogViewerPresenter extends FoldableContentPresenter implements BlogViewer { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/ctx/BlogContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.blogs.client.ctx; import org.ourproject.kune.blogs.client.BlogClientTool; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class BlogContextPresenter extends FoldableContextPresenter implements BlogContext { Modified: trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,6 @@ */ package org.ourproject.kune.blogs.server; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; -import org.ourproject.kune.platf.client.errors.ContentNotPermittedException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.domain.Container; @@ -36,6 +33,10 @@ import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.tool.ServerToolTarget; +import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; public class BlogServerTool implements ServerTool { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,17 +26,18 @@ import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cxt.ContextActionRegistry; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -29,14 +29,9 @@ import org.ourproject.kune.chat.client.ctx.room.AddRoomPresenter; import org.ourproject.kune.platf.client.app.Application; import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; @@ -48,6 +43,12 @@ import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.ToolSelector; +import cc.kune.core.client.i18n.I18nUITranslationService; +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.i18n.I18nTranslationService; + import com.calclab.emiteuimodule.client.EmiteUIDialog; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.chat.client; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; import org.ourproject.kune.workspace.client.tool.ToolSelector; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class ChatClientTool extends FoldableAbstractClientTool { public static final String NAME = "chats"; public static final String TYPE_ROOT = "chat.root"; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -27,16 +27,17 @@ import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.Shortcut; import org.ourproject.kune.platf.client.app.Application; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.ui.WindowUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.utils.WindowUtils; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; import com.calclab.emite.im.client.roster.RosterItem; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.chat.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class ChatRoomPanel extends FoldableContentPanel implements ChatRoomView { public ChatRoomPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,17 +21,18 @@ import org.ourproject.kune.chat.client.ChatClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.i18n.I18nUITranslationService; +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.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.ioc.Provider; public class ChatRoomPresenter extends FoldableContentPresenter implements ChatRoom { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/ChatContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,10 +20,11 @@ package org.ourproject.kune.chat.client.ctx; import org.ourproject.kune.chat.client.ChatClientTool; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class ChatContextPresenter extends FoldableContextPresenter implements ChatContext { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.chat.client.ctx.room; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; import com.google.gwt.core.client.Scheduler; Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,13 +20,14 @@ package org.ourproject.kune.chat.client.ctx.room; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.dto.StateContainerDTO; + import com.calclab.suco.client.ioc.Provider; public class AddRoomPresenter implements AddRoom { Modified: trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/chat/server/ChatServerTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,7 +20,6 @@ package org.ourproject.kune.chat.server; import org.ourproject.kune.chat.client.ChatClientTool; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; @@ -32,6 +31,8 @@ import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.tool.ServerToolTarget; +import cc.kune.core.client.errors.ContainerNotPermittedException; + import com.google.inject.Inject; public class ChatServerTool implements ServerTool { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,12 +26,6 @@ import static org.ourproject.kune.docs.client.DocumentClientTool.TYPE_WAVE; import org.ourproject.kune.docs.client.cnt.DocumentViewer; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; @@ -46,6 +40,13 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class DocumentClientActions extends AbstractFoldableContentActions { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -30,15 +30,8 @@ import org.ourproject.kune.docs.client.ctx.DocumentContext; import org.ourproject.kune.docs.client.ctx.DocumentContextPresenter; import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; @@ -57,6 +50,14 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.docs.client; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; import org.ourproject.kune.workspace.client.tool.ToolSelector; +import cc.kune.core.client.i18n.I18nUITranslationService; + public class DocumentClientTool extends FoldableAbstractClientTool { public static final String NAME = "docs"; public static final String TYPE_ROOT = NAME + "." + "root"; Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class DocFolderContentPanel extends FoldableContentPanel implements DocFolderContentView { public DocFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,15 +21,16 @@ import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; public class DocFolderContentPresenter extends FoldableContentPresenter implements DocFolderContent { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.docs.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class DocumentViewerPanel extends FoldableContentPanel implements DocumentViewerView { public DocumentViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { super(ws, i18n); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/DocumentViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,16 +20,17 @@ package org.ourproject.kune.docs.client.cnt; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.ioc.Provider; public class DocumentViewerPresenter extends FoldableContentPresenter implements DocumentViewer { Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.docs.client.ctx; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class DocumentContextPresenter extends FoldableContextPresenter implements DocumentContext { Modified: trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/docs/server/DocumentServerTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,9 +21,6 @@ import java.util.Date; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; -import org.ourproject.kune.platf.client.errors.ContentNotPermittedException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.domain.Container; @@ -37,6 +34,10 @@ import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.tool.ServerToolTarget; +import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; public class DocumentServerTool implements ServerTool { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -24,12 +24,6 @@ import static org.ourproject.kune.gallery.client.GalleryClientTool.TYPE_UPLOADEDFILE; import org.ourproject.kune.gallery.client.cnt.GalleryViewer; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; @@ -44,6 +38,13 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class GalleryClientActions extends AbstractFoldableContentActions { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -30,15 +30,8 @@ import org.ourproject.kune.gallery.client.ctx.GalleryContext; import org.ourproject.kune.gallery.client.ctx.GalleryContextPresenter; import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; @@ -57,6 +50,14 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.gallery.client; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; import org.ourproject.kune.workspace.client.tool.ToolSelector; +import cc.kune.core.client.i18n.I18nUITranslationService; + public class GalleryClientTool extends FoldableAbstractClientTool { public static final String NAME = "gallery"; public static final String TYPE_ROOT = NAME + "." + "root"; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,14 +19,15 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.BasicThumb; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +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.i18n.I18nTranslationService; + import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,19 +21,20 @@ import org.ourproject.kune.gallery.client.GalleryClientTool; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.ContainerDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +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; public class GalleryFolderContentPresenter extends FoldableContentPresenter implements GalleryFolderContent { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.workspace.client.cnt.AbstractContentView; +import cc.kune.core.shared.dto.StateToken; + public interface GalleryFolderContentView extends AbstractContentView { void addThumb(StateToken token, String title, String imgUrl); Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.gallery.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class GalleryViewerPanel extends FoldableContentPanel implements GalleryViewerView { public GalleryViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,16 +20,17 @@ package org.ourproject.kune.gallery.client.cnt; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.ioc.Provider; public class GalleryViewerPresenter extends FoldableContentPresenter implements GalleryViewer { Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/ctx/GalleryContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.gallery.client.ctx; import org.ourproject.kune.gallery.client.GalleryClientTool; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class GalleryContextPresenter extends FoldableContextPresenter implements GalleryContext { Modified: trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/gallery/server/GalleryServerTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,6 @@ */ package org.ourproject.kune.gallery.server; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; -import org.ourproject.kune.platf.client.errors.ContentNotPermittedException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; @@ -33,6 +30,10 @@ import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.tool.ServerToolTarget; +import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; public class GalleryServerTool implements ServerTool { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; import org.ourproject.kune.platf.client.services.ImageDescriptor; import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionItem.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,6 +19,7 @@ \*/ package org.ourproject.kune.platf.client.actions; + import com.allen_sauer.gwt.log.client.Log; /** Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; public class ActionMenuItemDescriptor<T> extends ActionDescriptor<T> { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import java.util.HashMap; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.AccessRightsDTO; + import com.allen_sauer.gwt.log.client.Log; public class ActionRegistry<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener0; public class ActionToolbarMenuCheckItemDescriptor<T> extends ActionToolbarMenuDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener; public class ActionToolbarMenuRadioDescriptor<T> extends ActionToolbarMenuDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarPushButtonDescriptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,7 +1,9 @@ package org.ourproject.kune.platf.client.actions; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; + +import cc.kune.core.shared.dto.AccessRolDTO; + import com.calclab.suco.client.events.Listener0; public class ActionToolbarPushButtonDescriptor<T> extends ActionToolbarButtonDescriptor<T> { Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionCollection.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,45 +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.client.actions; - -import java.util.ArrayList; - -/** - * The Class BeforeActionCollection. - */ -public class BeforeActionCollection extends ArrayList<BeforeActionListener> { - - private static final long serialVersionUID = -1508664709628420137L; - - /** - * Check before action listeners. - * - * @return true, if all listener returns true - */ - public boolean checkBeforeAction() { - for (BeforeActionListener listener : this) { - if (!listener.beforeAction()) { - return false; - } - } - return true; - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/BeforeActionListener.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,31 +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.client.actions; - -public interface BeforeActionListener { - - /** - * Return false to cancel the action - * - * @return - */ - boolean beforeAction(); - -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/common/GotoGroupAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -3,8 +3,9 @@ import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.state.StateManager; +import cc.kune.core.client.state.StateManager; + public class GotoGroupAction extends AbstractExtendedAction { private final String name; private final StateManager stateManager; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -30,6 +30,7 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.ActionToolbarPushButtonDescriptor; + import com.allen_sauer.gwt.log.client.Log; public class ActionToolbarPresenter<T> implements ActionToolbar<T> { Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui ___________________________________________________________________ Name: svn:ignore + *.swp Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/AbstractComposedGuiItem.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -2,8 +2,9 @@ import java.util.List; -import org.ourproject.kune.platf.client.errors.UIException; +import cc.kune.core.client.errors.UIException; + import com.google.gwt.user.client.ui.Composite; public abstract class AbstractComposedGuiItem extends Composite { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuBinding.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.errors.UIException; +import cc.kune.core.client.errors.UIException; public class MenuBinding extends GuiBindingAdapter { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuItemBinding.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,7 +1,8 @@ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.errors.UIException; +import cc.kune.core.client.errors.UIException; + import com.gwtext.client.widgets.menu.Item; public class MenuItemBinding extends GuiBindingAdapter { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/MenuSeparatorBinding.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.client.actions.ui; -import org.ourproject.kune.platf.client.errors.UIException; +import cc.kune.core.client.errors.UIException; public class MenuSeparatorBinding extends GuiBindingAdapter { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.platf.client.app; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.rpc.SiteServiceAsync; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.utils.PrefetchUtilities; +import cc.kune.core.client.rpcservices.SiteServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.InitDataDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Event0; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapper.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,28 +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.client.app; - -public interface HistoryWrapper { - - String getToken(); - - void newItem(final String historyToken); - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/HistoryWrapperDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,34 +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.client.app; - -import com.google.gwt.user.client.History; - -public class HistoryWrapperDefault implements HistoryWrapper { - - public String getToken() { - return History.getToken(); - } - - public void newItem(final String historyToken) { - History.newItem(historyToken); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AccessViolationException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class AccessViolationException extends DefaultException { - private static final long serialVersionUID = -3786772632052256999L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyGroupMemberException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class AlreadyGroupMemberException extends DefaultException { - private static final long serialVersionUID = 6663958867752546481L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/AlreadyUserMemberException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class AlreadyUserMemberException extends DefaultException { - private static final long serialVersionUID = -6365615768192330492L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContainerNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class ContainerNotPermittedException extends DefaultException { - private static final long serialVersionUID = 6866318170714609691L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class ContentNotFoundException extends DefaultException { - private static final long serialVersionUID = -4641212341448422627L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ContentNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class ContentNotPermittedException extends DefaultException { - private static final long serialVersionUID = 4771568826852748873L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/DefaultException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,40 +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.client.errors; - -import com.google.gwt.user.client.rpc.IsSerializable; -import com.google.gwt.user.client.rpc.StatusCodeException; - -public class DefaultException extends StatusCodeException implements IsSerializable { - - private static final long serialVersionUID = -6111471089427505005L; - - public DefaultException() { - this(0, ""); - } - - public DefaultException(final int statusCode, final String message) { - super(statusCode, message); - } - - public DefaultException(final String message) { - this(0, message); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/EmailAddressInUseException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class EmailAddressInUseException extends DefaultException { - private static final long serialVersionUID = 3740509040361715407L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class GroupNameInUseException extends DefaultException { - private static final long serialVersionUID = -4746775725822225687L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/GroupNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class GroupNotFoundException extends DefaultException { - private static final long serialVersionUID = 2358855015943550817L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/I18nNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class I18nNotFoundException extends DefaultException { - private static final long serialVersionUID = -2400899465805236215L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/LastAdminInGroupException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class LastAdminInGroupException extends DefaultException { - private static final long serialVersionUID = -8727443733339361388L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameInUseException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class NameInUseException extends DefaultException { - private static final long serialVersionUID = 4890594846432830537L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NameNotPermittedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class NameNotPermittedException extends DefaultException { - private static final long serialVersionUID = -8022844560909422614L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/NoDefaultContentException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class NoDefaultContentException extends DefaultException { - private static final long serialVersionUID = 7443824340580555859L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/SessionExpiredException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class SessionExpiredException extends DefaultException { - private static final long serialVersionUID = -1603881986661302041L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/ToolNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class ToolNotFoundException extends DefaultException { - private static final long serialVersionUID = 472511647264356558L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UIException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,43 +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.client.errors; - -import com.allen_sauer.gwt.log.client.Log; - -public class UIException extends RuntimeException { - - private static final long serialVersionUID = -1327164226202923181L; - - public UIException(final String text) { - super(text); - Log.error(text); - } - - public UIException(final String text, final Throwable cause) { - super(text, cause); - Log.error(text, cause); - } - - public UIException(final Throwable cause) { - super(cause); - Log.error("UIException", cause); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UnknownPropertyException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,28 +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.client.errors; - -public class UnknownPropertyException extends DefaultException { - private static final long serialVersionUID = -5921396887476497824L; - - public UnknownPropertyException(final String message) { - super(message); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserAuthException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class UserAuthException extends DefaultException { - private static final long serialVersionUID = -8383513776573054971L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserMustBeLoggedException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class UserMustBeLoggedException extends DefaultException { - private static final long serialVersionUID = -5091069990899662849L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/errors/UserNotFoundException.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -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.client.errors; - -public class UserNotFoundException extends DefaultException { - private static final long serialVersionUID = 6207713694613166661L; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListener.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,27 +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.client.i18n; - -import com.google.gwt.user.client.EventListener; - -public interface I18nChangeListener extends EventListener { - - void onI18nLanguageChange(); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nChangeListenerCollection.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,42 +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.client.i18n; - -import java.util.ArrayList; - -/** - * A helper class for implementers of the SourcesI18nChangeEvents interface. - * This subclass of {@link ArrayList} assumes that all objects added to it will - * be of type {@link org.ourproject.kune.platf.client.i18n.I18nChangeListener}. - */ -public class I18nChangeListenerCollection extends ArrayList<I18nChangeListener> { - - private static final long serialVersionUID = -2435290836445582410L; - - /** - * Fires a locale change event to all listeners. - * - */ - public void fireI18nLanguageChange() { - for (I18nChangeListener listener : this) { - listener.onI18nLanguageChange(); - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,137 +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.client.i18n; - -public abstract class I18nTranslationService { - protected static final String TRANSLATION_NOTE_REGEXP = " (\\[)%NT (.*)(\\])$"; - protected static final String NOTE_FOR_TRANSLATOR_TAG_BEGIN = " [%NT "; - protected static final String NOTE_FOR_TRANSLATOR_TAG_END = "]"; - // Also in I18nTranslation - protected static final String UNTRANSLATED_VALUE = null; - - public String decodeHtml(final String textToDecode) { - String text = textToDecode; - // text = text.replaceAll("©", "©"); - return text; - } - - public String removeNT(final String string) { - return string.replaceAll(TRANSLATION_NOTE_REGEXP, ""); - } - - /** - * In production, this method uses a hashmap. In development, if the text is - * not in the hashmap, it makes a server petition (that stores the text - * pending for translation in db). - * - * Warning: text is escaped as html before insert in the db. Don't use html - * here (o user this method with params). - * - * @param text - * @return text translated in the current language - */ - // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:49 - public abstract String t(final String text); - - /** - * Use [%d] to reference the Integer parameters - * - */ - // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50 - public String t(final String text, final Integer... args) { - String translation = t(text); - for (Integer arg : args) { - translation = translation.replaceFirst("\\[%d\\]", arg.toString()); - } - return decodeHtml(translation); - } - - /** - * Use [%d] to reference the Long parameter - * - */ - // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50 - public String t(final String text, final Long... args) { - String translation = t(text); - for (Long arg : args) { - translation = translation.replaceFirst("\\[%d\\]", arg.toString()); - } - return decodeHtml(translation); - } - - /** - * Use [%s] to reference the string parameter - * - */ - // @PMD:REVIEWED:ShortMethodName: by vjrj on 21/05/09 13:50 - public String t(final String text, final String... args) { - String translation = t(text); - for (String arg : args) { - translation = translation.replaceFirst("\\[%s\\]", arg); - } - return decodeHtml(translation); - } - - /** - * Adds [%NT noteForTranslators] at the end of text. This tag is later - * renderer in the translator panel to inform translator how to do this - * translation - * - */ - public String tWithNT(final String text, final String noteForTranslators) { - return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END); - } - - /** - * Use [%d] to reference the Integer parameter. - * - * Also adds [%NT noteForTranslators] at the end of text. This tag is later - * renderer in the translator panel to inform translator how to do this - * translation - * - */ - public String tWithNT(final String text, final String noteForTranslators, final Integer... args) { - return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args); - } - - /** - * Use [%d] to reference the Long parameter. - * - * Also adds [%NT noteForTranslators] at the end of text. This tag is later - * renderer in the translator panel to inform translator how to do this - * translation - * - */ - public String tWithNT(final String text, final String noteForTranslators, final Long... args) { - return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args); - } - - /** - * Use [%s] to reference the String parameter. - * - * Also adds [%NT noteForTranslators] at the end of text. This tag is later - * renderer in the translator panel to inform translator how to do this - * translation - * - */ - public String tWithNT(final String text, final String noteForTranslators, final String... args) { - return t(text + NOTE_FOR_TRANSLATOR_TAG_BEGIN + noteForTranslators + NOTE_FOR_TRANSLATOR_TAG_END, args); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nTranslationServiceMocked.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,30 +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.client.i18n; - -import org.ourproject.kune.platf.client.ui.TextUtils; - -public class I18nTranslationServiceMocked extends I18nTranslationService { - public String t(final String text) { - String encodeText = TextUtils.escapeHtmlLight(text); - String translation = removeNT(encodeText); - return decodeHtml(translation); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,235 +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.client.i18n; - -import java.util.Date; -import java.util.HashMap; - -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.rpc.I18nServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.ui.Location; -import org.ourproject.kune.platf.client.ui.TextUtils; -import org.ourproject.kune.platf.client.ui.WindowUtils; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Listener0; -import com.google.gwt.i18n.client.DateTimeFormat; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class I18nUITranslationService extends I18nTranslationService { - private HashMap<String, String> lexicon; - private String currentLanguageCode; - private I18nChangeListenerCollection i18nChangeListeners; - private I18nLanguageDTO currentLang; - private I18nServiceAsync i18nService; - private Session session; - - /* - * If a UI element need to be fired when (for instance) the language changes - * use this. Useful if you widget have to take in account text language - * direction, for instance. - */ - public void addI18nChangeListener(final I18nChangeListener listener) { - if (i18nChangeListeners == null) { - i18nChangeListeners = new I18nChangeListenerCollection(); - } - i18nChangeListeners.add(listener); - } - - public void changeCurrentLanguage(final String newLanguage) { - if (!newLanguage.equals(this.currentLanguageCode)) { - setCurrentLanguage(newLanguage); - changeLocale(newLanguage); - } - } - - public String formatDateWithLocale(final Date date) { - return formatDateWithLocale(date, false); - } - - public String formatDateWithLocale(final Date date, final boolean shortFormat) { - String dateFormat = shortFormat ? currentLang.getDateFormatShort() : currentLang.getDateFormat(); - - final DateTimeFormat fmt; - if (dateFormat == null) { - fmt = DateTimeFormat.getFormat("M/d/yyyy h:mm a"); - } else { - if (shortFormat) { - fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); - } else { - final String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date); - final String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]"; - dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'"); - fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); - } - } - final String dateFormated = fmt.format(date); - return dateFormated; - } - - public String getCurrentLanguage() { - return currentLanguageCode; - } - - public HashMap<String, String> getLexicon() { - return lexicon; - } - - public void init(final I18nServiceAsync i18nService, final Session session, final Listener0 onReady) { - this.i18nService = i18nService; - this.session = session; - final Location loc = WindowUtils.getLocation(); - final String locale = loc.getParameter("locale"); - i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { - public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); - } - - public void onSuccess(final I18nLanguageDTO result) { - currentLang = result; - currentLanguageCode = currentLang.getCode(); - session.setCurrentLanguage(currentLang); - i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { - public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed:" + caught.getMessage()); - } - - public void onSuccess(final HashMap<String, String> result) { - lexicon = result; - onReady.onEvent(); - } - }); - } - }); - } - - public void removeI18nChangeListener(final I18nChangeListener listener) { - if (i18nChangeListeners != null) { - i18nChangeListeners.remove(listener); - } - } - - public void setCurrentLanguage(final String newLanguage) { - this.currentLanguageCode = newLanguage; - } - - public void setLexicon(final HashMap<String, String> lexicon) { - this.lexicon = lexicon; - fireI18nLanguageChange(); - } - - public void setTranslationAfterSave(final String text, final String translation) { - lexicon.put(text, translation); - fireI18nLanguageChange(); - } - - /** - * In production, this method uses a hashmap. In development, if the text is - * not in the hashmap, it makes a server petition (that stores the text - * pending for translation in db). - * - * Warning: text is escaped as html before insert in the db. Don't use html - * here (o user this method with params). - * - * @param text - * @return text translated in the current language - */ - @Override - public String t(final String text) { - final String encodeText = TextUtils.escapeHtmlLight(text); - String translation = lexicon.get(encodeText); - if (lexicon.containsKey(encodeText)) { - if (translation == UNTRANSLATED_VALUE) { - // Not translated but in db, return text - translation = removeNT(encodeText); - } - } else { - // Not translated and not in db, make a petition for translation - if (session.isLogged()) { - i18nService.getTranslation(session.getUserHash(), currentLanguageCode, text, - new AsyncCallback<String>() { - public void onFailure(final Throwable caught) { - } - - public void onSuccess(final String result) { - } - }); - Log.debug("Registering in db '" + text + "' as pending translation"); - lexicon.put(encodeText, UNTRANSLATED_VALUE); - } - translation = removeNT(encodeText); - } - return decodeHtml(translation); - } - - /** - * - * See in: - * http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread - * /5e4e25050d3be984/7035ec39354d06aa?lnk=gst&q=get+locale&rnum=23 - * - * JSNI method to change the locale of the application - it effectively - * parses the existing URL and creates a new one for the chosen locale. - * - * It additionally launches any JavaScript debugger that might be attached - * to the system (Windows only). To disable this functionality just remove - * the "debugger" line. - * - * @param newLocale - * String value of the new locale to go to. - */ - private native void changeLocale(String newLocale) - /*-{ - // Uncomment the "debugger;" line to see how to set debug statements in JSNI code - // When in web mode, if your browser has a JavaScript debugger attached, it will - // launch at this point in the code (when the user changes locale through the menu system). - // debugger; - - // Get the current location - var currLocation = $wnd.location.toString(); - // Get rid of any GWT History tokens that might be present - var noHistoryCurrLocArray = currLocation.split("#"); - var noHistoryCurrLoc = noHistoryCurrLocArray[0]; - var currHistory = noHistoryCurrLocArray[1]; - // Get rid of any locale string - var locArray = noHistoryCurrLoc.split("?"); - // Build the new href location and then send the browser there. - // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; - $wnd.location.href = locArray[0]+"?locale="+newLocale - - // extjs part: - // commented because the error: "Ext is not defined" - // we have to try other way - // var head = document.getElementsByTagName("head")[0]; - // var script = document.createElement('script'); - // script.id = 'localScript'; - // script.type = 'text/javascript'; - // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; - // head.appendChild(script); - }-*/; - - private void fireI18nLanguageChange() { - if (i18nChangeListeners != null) { - i18nChangeListeners.fireI18nLanguageChange(); - } - } - -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/Resources.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,5 +1,7 @@ package org.ourproject.kune.platf.client.i18n; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class Resources { public static I18nTranslationService i18n; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/AsyncCallbackSimple.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,38 +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.client.rpc; - -import org.ourproject.kune.platf.client.services.ErrorHandler; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public abstract class AsyncCallbackSimple<T> implements AsyncCallback<T> { - - private static ErrorHandler errorHandler; - - public static void init(ErrorHandler kuneErrorHandler) { - errorHandler = kuneErrorHandler; - } - - public void onFailure(final Throwable caught) { - errorHandler.process(caught); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,88 +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.client.rpc; - -import java.util.Date; - -import org.ourproject.kune.platf.client.dto.CommentDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.RateResultDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; - -import com.google.gwt.user.client.rpc.RemoteService; - -public interface ContentService extends RemoteService { - - void addAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; - - CommentDTO addComment(String userHash, StateToken token, Long parentCommentId, String commentText) - throws DefaultException; - - CommentDTO addComment(String userHash, StateToken token, String commentText) throws DefaultException; - - StateContentDTO addContent(String user, StateToken parentToken, String name, String typeId) throws DefaultException; - - StateContainerDTO addFolder(String hash, StateToken parentToken, String typeId, String title) - throws DefaultException; - - StateContainerDTO addRoom(String user, StateToken parentToken, String name) throws DefaultException; - - StateContentDTO addWave(String userHash, StateToken parentToken, String waveFileType, String waveId); - - StateContentDTO delContent(String userHash, StateToken token) throws DefaultException; - - StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException; - - TagCloudResultDTO getSummaryTags(String userHash, StateToken groupToken) throws DefaultException; - - CommentDTO markCommentAsAbuse(String userHash, StateToken token, Long commentId) throws DefaultException; - - RateResultDTO rateContent(String userHash, StateToken token, Double value) throws DefaultException; - - void removeAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; - - StateAbstractDTO renameContainer(String userHash, StateToken token, String newName) throws DefaultException; - - StateAbstractDTO renameContent(String userHash, StateToken token, String newName) throws DefaultException; - - void save(String user, StateToken token, String content) throws DefaultException; - - ContentSimpleDTO setAsDefaultContent(String userHash, StateToken token); - - I18nLanguageDTO setLanguage(String userHash, StateToken token, String languageCode) throws DefaultException; - - void setPublishedOn(String userHash, StateToken token, Date date) throws DefaultException; - - StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatusDTO status); - - StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status); - - TagCloudResultDTO setTags(String userHash, StateToken token, String tags) throws DefaultException; - - CommentDTO voteComment(String userHash, StateToken token, Long commentId, boolean votePositive) - throws DefaultException; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,93 +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.client.rpc; - -import java.util.Date; - -import org.ourproject.kune.platf.client.dto.CommentDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.RateResultDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface ContentServiceAsync { - - void addAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback); - - void addComment(String userHash, StateToken token, Long parentCommentId, String commentText, - AsyncCallback<CommentDTO> asyncCallback); - - void addComment(String userHash, StateToken token, String commentText, AsyncCallback<CommentDTO> asyncCallback); - - void addContent(String user, StateToken parentToken, String name, String typeId, - AsyncCallback<StateContentDTO> callback); - - void addFolder(String hash, StateToken parentToken, String title, String typeId, - AsyncCallback<StateContainerDTO> callback); - - void addRoom(String user, StateToken parentToken, String name, AsyncCallback<StateContainerDTO> callback); - - void addWave(String userHash, StateToken parentToken, String waveFileType, String waveId, - AsyncCallback<StateContentDTO> asyncCallbackSimple); - - void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback); - - void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); - - void getSummaryTags(String userHash, StateToken groupToken, AsyncCallback<TagCloudResultDTO> asyncCallback); - - void markCommentAsAbuse(String userHash, StateToken token, Long commentId, AsyncCallback<CommentDTO> asyncCallback); - - void rateContent(String userHash, StateToken token, Double value, AsyncCallback<RateResultDTO> asyncCallback); - - void removeAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<Void> asyncCallback); - - void renameContainer(String userHash, StateToken token, String newName, - AsyncCallback<StateAbstractDTO> asyncCallback); - - void renameContent(String userHash, StateToken token, String newName, AsyncCallback<StateAbstractDTO> asyncCallback); - - void save(String user, StateToken token, String content, AsyncCallback<Void> asyncCallback); - - void setAsDefaultContent(String userHash, StateToken token, AsyncCallback<ContentSimpleDTO> asyncCallback); - - void setLanguage(String userHash, StateToken token, String languageCode, - AsyncCallback<I18nLanguageDTO> asyncCallback); - - void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<Void> asyncCallback); - - void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status, - AsyncCallback<StateAbstractDTO> asyncCallback); - - void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status, - AsyncCallback<StateAbstractDTO> asyncCallback); - - void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResultDTO> asyncCallback); - - void voteComment(String userHash, StateToken token, Long commentId, boolean votePositive, - AsyncCallback<CommentDTO> asyncCallback); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,52 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.DefaultException; - -import com.google.gwt.user.client.rpc.RemoteService; - -public interface GroupService extends RemoteService { - - void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license); - - void changeGroupWsTheme(String userHash, StateToken groupToken, String theme) throws DefaultException; - - GroupDTO clearGroupBackImage(String userHash, StateToken token); - - StateToken createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools) - throws DefaultException; - - GroupDTO getGroup(String userHash, StateToken token); - - GroupDTO setGroupBackImage(String userHash, StateToken token); - - void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy); - - void setSocialNetworkVisibility(String userHash, StateToken groupToken, SocialNetworkVisibilityDTO visibility); - - void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/GroupServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,55 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO; -import org.ourproject.kune.platf.client.dto.StateToken; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface GroupServiceAsync { - - void changeDefLicense(final String userHash, final StateToken groupToken, final LicenseDTO license, - AsyncCallback<Void> asyncCallback); - - void changeGroupWsTheme(String userHash, StateToken groupToken, String theme, AsyncCallback<Void> callback); - - void clearGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); - - void createNewGroup(String userHash, GroupDTO group, String publicDesc, String tags, String[] enabledTools, - AsyncCallback<StateToken> callback); - - void getGroup(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); - - void setGroupBackImage(String userHash, StateToken token, AsyncCallback<GroupDTO> asyncCallback); - - void setGroupNewMembersJoiningPolicy(String userHash, StateToken groupToken, AdmissionTypeDTO admissionPolicy, - AsyncCallback<Void> asyncCallback); - - void setSocialNetworkVisibility(String userHash, StateToken token, SocialNetworkVisibilityDTO visibility, - AsyncCallback<Void> asyncCallback); - - void setToolEnabled(String userHash, StateToken groupToken, String toolName, boolean enabled, - AsyncCallback<Void> asyncCallback); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,39 +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.client.rpc; - -import java.util.HashMap; - -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; - -import com.google.gwt.user.client.rpc.RemoteService; - -public interface I18nService extends RemoteService { - - I18nLanguageDTO getInitialLanguage(String localeParam); - - HashMap<String, String> getLexicon(String language); - - String getTranslation(String userHash, String language, String text); - - String setTranslation(String userHash, String id, String translation) throws DefaultException; - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/I18nServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,38 +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.client.rpc; - -import java.util.HashMap; - -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface I18nServiceAsync { - - void getLexicon(String language, AsyncCallback<HashMap<String, String>> callback); - - void getTranslation(String userHash, String language, String text, AsyncCallback<String> callback); - - void setTranslation(String userHash, String id, String translation, AsyncCallback<String> asyncCallback); - - void getInitialLanguage(String localeParam, AsyncCallback<I18nLanguageDTO> callback); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,31 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; - -import com.google.gwt.user.client.rpc.RemoteService; - -public interface SiteService extends RemoteService { - - InitDataDTO getInitData(String userHash) throws DefaultException; - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SiteServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,30 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.InitDataDTO; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface SiteServiceAsync { - - void getInitData(String userHash, AsyncCallback<InitDataDTO> callback); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,60 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.DefaultException; - -import com.google.gwt.user.client.rpc.RemoteService; - -public interface SocialNetworkService extends RemoteService { - - SocialNetworkDataDTO acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName) - throws DefaultException; - - SocialNetworkDataDTO addAdminMember(String hash, StateToken groupToken, String groupToAddShortName) - throws DefaultException; - - SocialNetworkDataDTO addCollabMember(String hash, StateToken groupToken, String groupToAddShortName) - throws DefaultException; - - SocialNetworkDataDTO addViewerMember(String hash, StateToken groupToken, String groupToAddShortName) - throws DefaultException; - - SocialNetworkDataDTO deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName) - throws DefaultException; - - SocialNetworkDataDTO denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName) - throws DefaultException; - - SocialNetworkDataDTO getSocialNetwork(String hash, StateToken groupToken) throws DefaultException; - - SocialNetworkRequestResult requestJoinGroup(String hash, StateToken groupToken) throws DefaultException; - - SocialNetworkDataDTO setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName) - throws DefaultException; - - SocialNetworkDataDTO setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName) - throws DefaultException; - - SocialNetworkDataDTO unJoinGroup(String hash, StateToken groupToken) throws DefaultException; -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,59 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.dto.StateToken; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface SocialNetworkServiceAsync { - - void acceptJoinGroup(String hash, StateToken groupToken, String groupToAcceptShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void addAdminMember(String hash, StateToken groupToken, String groupToAddShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void addCollabMember(String hash, StateToken groupToken, String groupToAddShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void addViewerMember(String hash, StateToken groupToken, String groupToAddShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void deleteMember(String hash, StateToken groupToken, String groupToDeleteShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void denyJoinGroup(String hash, StateToken groupToken, String groupToDenyShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void getSocialNetwork(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback); - - void requestJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkRequestResult> callback); - - void setAdminAsCollab(String hash, StateToken groupToken, String groupToSetCollabShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void setCollabAsAdmin(String hash, StateToken groupToken, String groupToSetAdminShortName, - AsyncCallback<SocialNetworkDataDTO> callback); - - void unJoinGroup(String hash, StateToken groupToken, AsyncCallback<SocialNetworkDataDTO> callback); -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,46 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO; -import org.ourproject.kune.platf.client.dto.UserDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; - -import com.google.gwt.user.client.rpc.RemoteService; - -public interface UserService extends RemoteService { - - UserInfoDTO createUser(UserDTO user, boolean wantPersonalHomepage) throws DefaultException; - - String getUserAvatarBaser64(String userHash, StateToken userToken) throws DefaultException; - - UserInfoDTO login(String nickOrEmail, String passwd) throws DefaultException; - - void logout(String userHash) throws DefaultException; - - void onlyCheckSession(String userHash) throws DefaultException; - - UserInfoDTO reloadUserInfo(String userHash) throws DefaultException; - - void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/UserServiceAsync.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,46 +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.client.rpc; - -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO; -import org.ourproject.kune.platf.client.dto.UserDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface UserServiceAsync { - - void createUser(UserDTO user, boolean wantPersonalHomepage, AsyncCallback<UserInfoDTO> asyncCallback); - - void getUserAvatarBaser64(String userHash, StateToken userToken, AsyncCallback<String> asyncCallback); - - void login(String nickOrEmail, String passwd, AsyncCallback<UserInfoDTO> asyncCallback); - - void logout(String userHash, AsyncCallback<Void> asyncCallback); - - void onlyCheckSession(String userHash, AsyncCallback<Void> asyncCallback); - - void reloadUserInfo(String userHash, AsyncCallback<UserInfoDTO> asyncCallback); - - void setBuddiesVisibility(String userHash, StateToken groupToken, UserBuddiesVisibilityDTO visibility, - AsyncCallback<Void> asyncCallback); - -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/CoreModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,35 +21,30 @@ import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; import org.ourproject.kune.platf.client.app.GroupOptionsCollection; -import org.ourproject.kune.platf.client.app.HistoryWrapper; -import org.ourproject.kune.platf.client.app.HistoryWrapperDefault; import org.ourproject.kune.platf.client.app.ToolGroup; import org.ourproject.kune.platf.client.app.UserOptionsCollection; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.I18nService; -import org.ourproject.kune.platf.client.rpc.I18nServiceAsync; -import org.ourproject.kune.platf.client.rpc.SiteService; -import org.ourproject.kune.platf.client.rpc.SiteServiceAsync; -import org.ourproject.kune.platf.client.rpc.UserService; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.state.ContentProvider; -import org.ourproject.kune.platf.client.state.ContentProviderDefault; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.SessionDefault; -import org.ourproject.kune.platf.client.state.StateManager; -import org.ourproject.kune.platf.client.state.StateManagerDefault; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageGroup; import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkGroup; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaGroup; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharGroup; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.client.rpcservices.I18nServiceAsync; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.client.rpcservices.SiteServiceAsync; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.ContentProvider; +import cc.kune.core.client.state.HistoryWrapper; +import cc.kune.core.client.state.HistoryWrapperDefault; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.Cookies; -import com.google.gwt.user.client.History; import com.google.gwt.user.client.rpc.ServiceDefTarget; public class CoreModule extends AbstractExtendedModule { @@ -66,7 +61,10 @@ register(Singleton.class, new Factory<Session>(Session.class) { @Override public Session create() { - return new SessionDefault(Cookies.getCookie(Session.USERHASH), p(UserServiceAsync.class)); + return null; + // return new + // SessionDefault(Cookies.getCookie(Session.USERHASH), + // p(UserServiceAsync.class)); } }, new Factory<I18nServiceAsync>(I18nServiceAsync.class) { @Override @@ -94,9 +92,11 @@ register(Singleton.class, new Factory<I18nUITranslationService>(I18nUITranslationService.class) { @Override public I18nUITranslationService create() { - final I18nUITranslationService i18n = new I18nUITranslationService(); - i18n.init(i(I18nServiceAsync.class), i(Session.class), onI18nReady); - return i18n; + // final I18nUITranslationService i18n = new + // I18nUITranslationService(); + // i18n.init(i(I18nServiceAsync.class), i(Session.class), + // onI18nReady); + return null; // i18n; } }); @@ -110,15 +110,17 @@ }, new Factory<ContentProvider>(ContentProvider.class) { @Override public ContentProvider create() { - return new ContentProviderDefault(i(ContentServiceAsync.class)); + return null; // new + // ContentProviderDefault(i(ContentServiceAsync.class)); } }, new Factory<StateManager>(StateManager.class) { @Override public StateManager create() { - final StateManagerDefault stateManager = new StateManagerDefault(i(ContentProvider.class), - i(Session.class), i(HistoryWrapper.class)); - History.addValueChangeHandler(stateManager); - return stateManager; + // final StateManagerDefault stateManager = new + // StateManagerDefault(i(ContentProvider.class), + // i(Session.class), i(HistoryWrapper.class)); + // History.addValueChangeHandler(stateManager); + return null; } }); Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/ErrorHandler.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,129 +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.client.services; - -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.AlreadyGroupMemberException; -import org.ourproject.kune.platf.client.errors.AlreadyUserMemberException; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; -import org.ourproject.kune.platf.client.errors.ContentNotPermittedException; -import org.ourproject.kune.platf.client.errors.GroupNotFoundException; -import org.ourproject.kune.platf.client.errors.LastAdminInGroupException; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event0; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; - -public class ErrorHandler { - private final Session session; - private final I18nTranslationService i18n; - private final Event0 onSessionExpired; - private final Provider<StateManager> stateManagerProvider; - - public ErrorHandler(final Session session, final I18nTranslationService i18n, - final Provider<StateManager> stateManagerProvider) { - this.session = session; - this.i18n = i18n; - this.stateManagerProvider = stateManagerProvider; - this.onSessionExpired = new Event0("onSessionExpired"); - } - - public void doSessionExpired() { - onSessionExpired.fire(); - NotifyUser.info("Your session has expired. Please log in again."); - } - - public void onSessionExpired(final Listener0 listener) { - onSessionExpired.add(listener); - } - - public void process(final Throwable caught) { - NotifyUser.hideProgress(); - if (caught instanceof AccessViolationException) { - logException(caught); - NotifyUser.error(i18n.t("You do not have rights to perform that action")); - } else if (caught instanceof SessionExpiredException) { - logException(caught); - doSessionExpired(); - } else if (caught instanceof UserMustBeLoggedException) { - logException(caught); - if (session.isLogged()) { - doSessionExpired(); - } else { - NotifyUser.important(i18n.t("Please sign in or register to collaborate")); - } - } else if (caught instanceof GroupNotFoundException) { - logException(caught); - NotifyUser.veryImportant(i18n.t("Group not found")); - stateManagerProvider.get().gotoToken(""); - } else if (caught instanceof IncompatibleRemoteServiceException) { - NotifyUser.error(i18n.t("Your browser is outdated with the server software. Please reload this page.")); - } else if (caught instanceof ContentNotFoundException) { - logException(caught); - NotifyUser.veryImportant(i18n.t("Content not found")); - stateManagerProvider.get().gotoToken(""); - } else if (caught instanceof ContentNotPermittedException) { - logException(caught); - NotifyUser.error(i18n.t("Action not permitted in this location")); - stateManagerProvider.get().gotoToken(""); - } else if (caught instanceof ContainerNotPermittedException) { - logException(caught); - NotifyUser.error(i18n.t("Action not permitted in this location")); - stateManagerProvider.get().gotoToken(""); - } else if (caught instanceof LastAdminInGroupException) { - logException(caught); - NotifyUser.showAlertMessage(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); - NotifyUser.error(i18n.t("This group is already a group member")); - } else if (caught instanceof AlreadyUserMemberException) { - logException(caught); - NotifyUser.error(i18n.t("This user is already a group member")); - } else { - logException(caught, true); - NotifyUser.error(i18n.t("Error performing operation")); - GWT.log("Other kind of exception in StateManagerDefault/processErrorException", caught); - } - } - - private void logException(final Throwable caught) { - logException(caught, false); - } - - private void logException(final Throwable caught, final boolean showException) { - if (showException) { - Log.debug("Exception in KuneErrorHandler", caught); - } else { - Log.debug("Exception in KuneErrorHandler: " + caught.getMessage()); - } - } - -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,15 +25,8 @@ import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; import org.ourproject.kune.platf.client.app.ApplicationDefault; import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.SiteServiceAsync; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.QuickTipsHelper; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.img.ImgResources; @@ -106,6 +99,14 @@ import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.platf.client.utils.TimerWrapper; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.SiteServiceAsync; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.decorator.NoDecoration; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; @@ -159,7 +160,7 @@ register(Singleton.class, new Factory<ErrorHandler>(ErrorHandler.class) { @Override public ErrorHandler create() { - return new ErrorHandler(i(Session.class), i18n, p(StateManager.class)); + return null; // new ErrorHandler(i(Session.class), i18n, p(StateManager.class)); } }); @@ -175,7 +176,7 @@ } }); - AsyncCallbackSimple.init(i(ErrorHandler.class)); + //AsyncCallbackSimple.init(i(ErrorHandler.class)); register(Singleton.class, new Factory<Application>(Application.class) { @Override Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -5,8 +5,9 @@ import org.ourproject.kune.platf.client.actions.ActionDescriptor; import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.KeyStroke; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; import com.google.gwt.dom.client.NativeEvent; Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/AccessRightsClientManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,31 +0,0 @@ -package org.ourproject.kune.platf.client.state; - -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; - -import com.calclab.suco.client.events.Event2; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener2; - -public class AccessRightsClientManager { - private AccessRightsDTO previousRights; - private final Event2<AccessRightsDTO, AccessRightsDTO> onRightsChanged; - - public AccessRightsClientManager(final StateManager stateManager) { - this.previousRights = null; - this.onRightsChanged = new Event2<AccessRightsDTO, AccessRightsDTO>("onRightsChanged"); - stateManager.onStateChanged(new Listener<StateAbstractDTO>() { - public void onEvent(final StateAbstractDTO newState) { - final AccessRightsDTO rights = newState.getGroupRights(); - if (!rights.equals(previousRights)) { - onRightsChanged.fire(previousRights, rights); - previousRights = rights; - } - } - }); - } - - public void onRightsChanged(final Listener2<AccessRightsDTO, AccessRightsDTO> listener) { - onRightsChanged.add(listener); - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProvider.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,33 +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.client.state; - -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public interface ContentProvider { - - void cache(StateToken encodeState, StateAbstractDTO content); - - void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/ContentProviderDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,59 +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.client.state; - -import java.util.HashMap; - -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; - -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class ContentProviderDefault implements ContentProvider { - - private final ContentServiceAsync server; - private final HashMap<StateToken, StateAbstractDTO> cache; - - public ContentProviderDefault(final ContentServiceAsync server) { - this.server = server; - this.cache = new HashMap<StateToken, StateAbstractDTO>(); - } - - public void cache(final StateToken encodeState, final StateAbstractDTO content) { - cache.put(encodeState, content); - } - - public void getContent(final String user, final StateToken newState, final AsyncCallback<StateAbstractDTO> callback) { - NotifyUser.showProgressLoading(); - final StateAbstractDTO catched = getCached(newState); - if (catched != null) { - callback.onSuccess(catched); - } else { - server.getContent(user, newState, callback); - } - } - - private StateAbstractDTO getCached(final StateToken newState) { - return cache.remove(newState); - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,154 +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/>. - * - */ -/* - * - * This file is part of kune. - * Copyright (C) 2007-2009 The kune development team (see CREDITS for details) - * - * 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.client.state; - -import java.util.Collection; -import java.util.List; - -import org.ourproject.kune.platf.client.dto.I18nCountryDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageSimpleDTO; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; - -public interface Session { - - /** - * Duration remembering login: 2 weeks - */ - int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; - - String USERHASH = "userHash"; - - void check(AsyncCallbackSimple<Void> callback); - - StateContainerDTO getContainerState(); - - StateContentDTO getContentState(); - - List<I18nCountryDTO> getCountries(); - - Object[][] getCountriesArray(); - - String getCurrentCCversion(); - - String getCurrentGroupShortName(); - - I18nLanguageDTO getCurrentLanguage(); - - StateAbstractDTO getCurrentState(); - - StateToken getCurrentStateToken(); - - UserSimpleDTO getCurrentUser(); - - UserInfoDTO getCurrentUserInfo(); - - LicenseDTO getDefLicense(); - - String getGalleryPermittedExtensions(); - - Collection<ToolSimpleDTO> getGroupTools(); - - int getImgCropsize(); - - int getImgIconsize(); - - int getImgResizewidth(); - - int getImgThumbsize(); - - InitDataDTO getInitData(); - - List<I18nLanguageSimpleDTO> getLanguages(); - - Object[][] getLanguagesArray(); - - List<LicenseDTO> getLicenses(); - - boolean getShowDeletedContent(); - - String getSiteUrl(); - - Object[][] getTimezones(); - - String getUserHash(); - - Collection<ToolSimpleDTO> getUserTools(); - - boolean inSameToken(StateToken token); - - boolean isCurrentStateAContent(); - - boolean isCurrentStateAGroup(); - - boolean isInCurrentUserSpace(); - - boolean isLogged(); - - boolean isNotLogged(); - - void onInitDataReceived(Listener<InitDataDTO> listener); - - void onUserSignIn(Listener<UserInfoDTO> listener); - - void onUserSignOut(Listener0 listener); - - void setCurrentLanguage(final I18nLanguageDTO currentLanguage); - - void setCurrentState(final StateAbstractDTO currentState); - - void setCurrentUserInfo(UserInfoDTO currentUserInfo); - - void setInitData(InitDataDTO initData); - - void setUserHash(String userHash); - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,292 +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.client.state; - -import java.util.Collection; -import java.util.List; - -import org.ourproject.kune.platf.client.dto.I18nCountryDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageSimpleDTO; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event0; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.core.client.GWT; - -public class SessionDefault implements Session { - private String userHash; - private InitDataDTO initData; - private UserInfoDTO currentUserInfo; - private Object[][] languagesArray; - private Object[][] countriesArray; - private Object[][] timezonesArray; - private StateAbstractDTO currentState; - private I18nLanguageDTO currentLanguage; - private final Event<InitDataDTO> onInitDataReceived; - private final Event<UserInfoDTO> onUserSignIn; - private final Event0 onUserSignOut; - private final Provider<UserServiceAsync> userServiceProvider; - - public SessionDefault(final String userHash, final Provider<UserServiceAsync> userServiceProvider) { - this.userHash = userHash == null || userHash.equals("null") ? null : userHash; - this.userServiceProvider = userServiceProvider; - languagesArray = null; - this.onInitDataReceived = new Event<InitDataDTO>("initDataReceived"); - this.onUserSignIn = new Event<UserInfoDTO>("onUserSignIn"); - this.onUserSignOut = new Event0("onUserSignOut"); - } - - public void check(final AsyncCallbackSimple<Void> callback) { - Log.debug("Checking session (userhash: " + getUserHash() + ")"); - userServiceProvider.get().onlyCheckSession(getUserHash(), callback); - } - - public StateContainerDTO getContainerState() { - return (StateContainerDTO) currentState; - } - - public StateContentDTO getContentState() { - return (StateContentDTO) currentState; - } - - public List<I18nCountryDTO> getCountries() { - return initData.getCountries(); - } - - public Object[][] getCountriesArray() { - if (countriesArray == null) { - countriesArray = mapCountries(); - } - return countriesArray; - } - - public String getCurrentCCversion() { - return initData.getCurrentCCversion(); - } - - public String getCurrentGroupShortName() { - return currentState == null ? null : currentState.getStateToken().getGroup(); - } - - public I18nLanguageDTO getCurrentLanguage() { - return currentLanguage; - } - - public StateAbstractDTO getCurrentState() { - return currentState; - } - - public StateToken getCurrentStateToken() { - return currentState == null ? null : currentState.getStateToken(); - } - - public UserSimpleDTO getCurrentUser() { - return currentUserInfo == null ? null : currentUserInfo.getUser(); - } - - public UserInfoDTO getCurrentUserInfo() { - return currentUserInfo; - } - - public LicenseDTO getDefLicense() { - return initData.getDefaultLicense(); - } - - public String getGalleryPermittedExtensions() { - return initData.getGalleryPermittedExtensions(); - } - - public Collection<ToolSimpleDTO> getGroupTools() { - return initData.getGroupTools(); - } - - public int getImgCropsize() { - return initData.getImgCropsize(); - } - - public int getImgIconsize() { - return initData.getImgIconsize(); - } - - public int getImgResizewidth() { - return initData.getImgResizewidth(); - } - - public int getImgThumbsize() { - return initData.getImgThumbsize(); - } - - public InitDataDTO getInitData() { - return initData; - } - - public List<I18nLanguageSimpleDTO> getLanguages() { - return initData.getLanguages(); - } - - public Object[][] getLanguagesArray() { - if (languagesArray == null) { - languagesArray = mapLangs(); - } - return languagesArray; - } - - public List<LicenseDTO> getLicenses() { - return initData.getLicenses(); - } - - public boolean getShowDeletedContent() { - return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); - } - - public String getSiteUrl() { - final String baseURL = GWT.getModuleBaseURL(); - return baseURL.substring(0, baseURL.lastIndexOf("/" + GWT.getModuleName())); - } - - public Object[][] getTimezones() { - if (timezonesArray == null) { - mapTimezones(); - } - return timezonesArray; - } - - public String getUserHash() { - return userHash; - } - - public Collection<ToolSimpleDTO> getUserTools() { - return initData.getUserTools(); - } - - public boolean inSameToken(final StateToken token) { - return getCurrentStateToken().equals(token); - } - - public boolean isCurrentStateAContent() { - return currentState instanceof StateContentDTO; - } - - public boolean isCurrentStateAGroup() { - return currentState == null ? false : !currentState.getGroup().isPersonal(); - } - - public boolean isInCurrentUserSpace() { - if (!isLogged()) { - return false; - } - if (getCurrentStateToken().getGroup().equals(getCurrentUser().getShortName())) { - return true; - } - return false; - } - - public boolean isLogged() { - return userHash != null; - } - - public boolean isNotLogged() { - return !isLogged(); - } - - public void onInitDataReceived(final Listener<InitDataDTO> listener) { - onInitDataReceived.add(listener); - } - - public void onUserSignIn(final Listener<UserInfoDTO> listener) { - onUserSignIn.add(listener); - } - - public void onUserSignOut(final Listener0 listener) { - onUserSignOut.add(listener); - } - - public void setCurrentLanguage(final I18nLanguageDTO currentLanguage) { - this.currentLanguage = currentLanguage; - } - - public void setCurrentState(final StateAbstractDTO currentState) { - this.currentState = currentState; - } - - public void setCurrentUserInfo(final UserInfoDTO currentUserInfo) { - this.currentUserInfo = currentUserInfo; - if (currentUserInfo != null) { - onUserSignIn.fire(currentUserInfo); - } else { - onUserSignOut.fire(); - } - } - - public void setInitData(final InitDataDTO initData) { - this.initData = initData; - onInitDataReceived.fire(initData); - } - - public void setUserHash(final String userHash) { - this.userHash = userHash; - } - - private Object[][] mapCountries() { - assert (initData != null); - final Object[][] objs = new Object[initData.getCountries().size()][1]; - int i = 0; - for (final I18nCountryDTO country : initData.getCountries()) { - final Object[] obj = new Object[] { country.getCode(), country.getEnglishName() }; - objs[i++] = obj; - } - return objs; - } - - private Object[][] mapLangs() { - assert (initData != null); - final Object[][] objs = new Object[initData.getLanguages().size()][1]; - int i = 0; - for (final I18nLanguageSimpleDTO language : initData.getLanguages()) { - final Object[] obj = new Object[] { language.getCode(), language.getEnglishName() }; - objs[i++] = obj; - } - return objs; - } - - private void mapTimezones() { - 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] }; - timezonesArray[i] = obj; - } - } -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,63 +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.client.state; - -import org.ourproject.kune.platf.client.actions.BeforeActionListener; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; - -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.events.Listener2; - -public interface StateManager { - - void addBeforeStateChangeListener(BeforeActionListener listener); - - void addSiteToken(String token, Listener0 whenToken); - - void gotoToken(StateToken newToken); - - void gotoToken(String newToken); - - void onGroupChanged(Listener2<String, String> listener); - - void onSocialNetworkChanged(Listener<StateAbstractDTO> listener); - - void onStateChanged(Listener<StateAbstractDTO> listener); - - void onToolChanged(Listener2<String, String> listener); - - void reload(); - - void removeBeforeStateChangeListener(BeforeActionListener listener); - - void removeSiteToken(String token); - - void restorePreviousToken(); - - void resumeTokenChange(); - - void setRetrievedState(StateAbstractDTO state); - - void setSocialNetwork(SocialNetworkDataDTO socialNet); - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,231 +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.client.state; - -import java.util.HashMap; - -import org.ourproject.kune.platf.client.actions.BeforeActionCollection; -import org.ourproject.kune.platf.client.actions.BeforeActionListener; -import org.ourproject.kune.platf.client.app.HistoryWrapper; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.ui.noti.NotifyUser; - -import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.events.Event; -import com.calclab.suco.client.events.Event2; -import com.calclab.suco.client.events.Listener; -import com.calclab.suco.client.events.Listener0; -import com.calclab.suco.client.events.Listener2; -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; - -public class StateManagerDefault implements StateManager, ValueChangeHandler<String> { - private final ContentProvider contentProvider; - private StateToken previousToken; - /** - * When a historyChanged is interrupted (for instance because you are - * editing something), the new token is stored here - */ - private StateToken resumedToken; - private final Session session; - private final HistoryWrapper history; - private final HashMap<String, Listener0> siteTokens; - private final Event<StateAbstractDTO> onStateChanged; - private final Event<StateAbstractDTO> onSocialNetworkChanged; - private final Event2<String, String> onToolChanged; - private final Event2<String, String> onGroupChanged; - private final BeforeActionCollection beforeStateChangeCollection; - - public StateManagerDefault(final ContentProvider contentProvider, final Session session, - final HistoryWrapper history) { - this.contentProvider = contentProvider; - this.session = session; - this.history = history; - this.previousToken = null; - this.resumedToken = null; - this.onStateChanged = new Event<StateAbstractDTO>("onStateChanged"); - this.onGroupChanged = new Event2<String, String>("onGroupChanged"); - this.onToolChanged = new Event2<String, String>("onToolChanged"); - this.onSocialNetworkChanged = new Event<StateAbstractDTO>("onSocialNetworkChanged"); - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { - if (previousToken == null) { - // starting up - reload(); - } else { - // do nothing, SigInPresent calls goto; - } - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - reload(); - } - }); - siteTokens = new HashMap<String, Listener0>(); - beforeStateChangeCollection = new BeforeActionCollection(); - } - - public void addBeforeStateChangeListener(final BeforeActionListener listener) { - beforeStateChangeCollection.add(listener); - } - - public void addSiteToken(final String token, final Listener0 listener) { - siteTokens.put(token, listener); - } - - public void gotoToken(final StateToken newToken) { - Log.debug("StateManager: history goto-token newItem (" + newToken + ")"); - history.newItem(newToken.getEncoded()); - } - - public void gotoToken(final String token) { - gotoToken(new StateToken(token)); - } - - public void onGroupChanged(final Listener2<String, String> listener) { - onGroupChanged.add(listener); - } - - public void onSocialNetworkChanged(final Listener<StateAbstractDTO> listener) { - onSocialNetworkChanged.add(listener); - } - - public void onStateChanged(final Listener<StateAbstractDTO> listener) { - onStateChanged.add(listener); - } - - public void onToolChanged(final Listener2<String, String> listener) { - onToolChanged.add(listener); - } - - public void onValueChange(final ValueChangeEvent<String> event) { - onHistoryChanged(event.getValue()); - } - - /** - * <p> - * Reload current state (using client cache if available) - * </p> - */ - public void reload() { - onHistoryChanged(history.getToken()); - } - - public void removeBeforeStateChangeListener(final BeforeActionListener listener) { - beforeStateChangeCollection.remove(listener); - } - - public void removeSiteToken(final String token) { - siteTokens.remove(token); - } - - public void restorePreviousToken() { - gotoToken(previousToken); - } - - public void resumeTokenChange() { - if (resumedToken != null) { - reload(); - gotoToken(resumedToken); - clearResumedToken(); - } - } - - public void setRetrievedState(final StateAbstractDTO newState) { - contentProvider.cache(newState.getStateToken(), newState); - // setState(newState); - history.newItem(newState.getStateToken().toString()); - } - - public void setSocialNetwork(final SocialNetworkDataDTO socialNet) { - StateAbstractDTO state; - if (session != null && (state = session.getCurrentState()) != null) { - // After a SN operation, usually returns a SocialNetworkResultDTO - // with new SN data and we refresh the state - // to avoid to reload() again the state - state.setSocialNetworkData(socialNet); - onSocialNetworkChanged.fire(state); - } - } - - void onHistoryChanged(final String historyToken) { - // http://code.google.com/p/google-web-toolkit-doc-1-5/wiki/DevGuideHistory - if (beforeStateChangeCollection.checkBeforeAction()) { - final Listener0 tokenListener = siteTokens.get(historyToken); - Log.debug("StateManager: history token changed (" + historyToken + ")"); - if (tokenListener == null) { - // Ok, normal token change - onHistoryChanged(new StateToken(historyToken)); - } else { - // token is one of #newgroup #signin #translate ... - if (previousToken == null) { - // Starting with some token like "signin": load defContent - // also - onHistoryChanged(""); - } - tokenListener.onEvent(); - } - } else { - resumedToken = new StateToken(historyToken); - } - } - - void setState(final StateAbstractDTO newState) { - session.setCurrentState(newState); - onStateChanged.fire(newState); - NotifyUser.hideProgress(); - checkGroupAndToolChange(newState); - previousToken = newState.getStateToken(); - - } - - private void checkGroupAndToolChange(final StateAbstractDTO newState) { - final String previousGroup = previousToken == null ? "" : previousToken.getGroup(); - final String newGroup = newState.getStateToken().getGroup(); - final String previousTokenTool = previousToken == null ? "" : previousToken.getTool(); - final String newTokenTool = newState.getStateToken().getTool(); - final String previousToolName = previousTokenTool == null ? "" : previousTokenTool; - final String newToolName = newTokenTool == null ? "" : newTokenTool; - - if (previousToken == null || previousToolName == null || !previousToolName.equals(newToolName)) { - onToolChanged.fire(previousToolName, newToolName); - } - if (previousToken == null || !previousGroup.equals(newGroup)) { - onGroupChanged.fire(previousGroup, newGroup); - } - } - - private void clearResumedToken() { - resumedToken = null; - } - - private void onHistoryChanged(final StateToken newState) { - contentProvider.getContent(session.getUserHash(), newState, new AsyncCallbackSimple<StateAbstractDTO>() { - public void onSuccess(final StateAbstractDTO newState) { - setState(newState); - } - }); - } -} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.platf.client.ui; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.core.Connection; import com.gwtext.client.core.UrlParam; import com.gwtext.client.data.FieldDef; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/KuneStringUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,6 +19,8 @@ */ package org.ourproject.kune.platf.client.ui; +import cc.kune.core.client.utils.TextUtils; + /** * Use TextUtils * Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/Location.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,148 +0,0 @@ -/* - * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com> - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - \*/ -package org.ourproject.kune.platf.client.ui; - -import java.util.HashMap; -import java.util.Map; - -public class Location { - private String hash; - private String host; - private String hostName; - private String href; - private String path; - private String port; - private String protocol; - private String queryString; - private HashMap<String, String> paramMap; - - /** - * sample: #site.docs.3.1 - **/ - public String getHash() { - return hash; - } - - /** - * sample: locahost:8080 - * - * @return - */ - public String getHost() { - return host; - } - - /** - * sample: locahost - * - * @return - */ - public String getHostName() { - return hostName; - } - - /** - * sample: http://localhost:8080/ws/#site.docs.3.1?locale=en&log_level=INFO - **/ - public String getHref() { - return href; - } - - public String getParameter(final String name) { - return paramMap.get(name); - } - - public Map<String, String> getParameterMap() { - return paramMap; - } - - /** - * sample: /ws/ - * - * @return - */ - public String getPath() { - return path; - } - - public String getPort() { - return port; - } - - public String getProtocol() { - return protocol; - } - - /** - * sample: ?locale=en&log_level=INFO - * - * @return - */ - public String getQueryString() { - return queryString; - } - - protected void setHash(final String hash) { - this.hash = hash; - } - - protected void setHost(final String host) { - this.host = host; - } - - protected void setHostName(final String hostName) { - this.hostName = hostName; - } - - protected void setHref(final String href) { - this.href = href; - } - - protected void setPath(final String path) { - this.path = path; - } - - protected void setPort(final String port) { - this.port = port; - } - - protected void setProtocol(final String protocol) { - this.protocol = protocol; - } - - protected void setQueryString(final String queryString) { - this.queryString = queryString; - paramMap = new HashMap<String, String>(); - - if (queryString != null && queryString.length() > 1) { - String qs = queryString.substring(1); - String[] kvPairs = qs.split("&"); - for (String kvPair : kvPairs) { - String[] kv = kvPair.split("="); - if (kv.length > 1) { - paramMap.put(kv[0], unescape(kv[1])); - } else { - paramMap.put(kv[0], ""); - } - } - } - } - - private native String unescape(String val) /*-{ - return unescape(val); - }-*/; - -} \ No newline at end of file Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/TextUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,99 +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.client.ui; - -import java.util.ArrayList; - -public class TextUtils { - - public static final String IN_DEVELOPMENT_P = " (in development)"; - public static final String IN_DEVELOPMENT = "In development"; - - // Original regexp from http://snippets.dzone.com/posts/show/452 - public static final String URL_REGEXP = "((ftp|http|https|mailto):\\/\\/(\\w+:{0,1}\\w*@)?(\\S+)(:[0-9]+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?)"; - - // Original regexp from http://www.regular-expressions.info/email.html - public static final String EMAIL_REGEXP = "[-!#$%&\'*+/=?_`{|}~a-z0-9^]+(\\.[-!#$%&\'*+/=?_`{|}~a-z0-9^]+)*@(localhost|([a-z0-9]([-a-z0-9]*[a-z0-9])?\\.)+[a-z0-9]([-a-z0-9]*[a-z0-9]))?"; - - public static final String UNIX_NAME = "^[a-z0-9_\\-]+$"; - - public static final String NUM_REGEXP = "^[0-9]+$"; - - /* - * This method escape only some dangerous html chars - */ - public static String escapeHtmlLight(final String source) { - if (source == null) { - return null; - } - String result = source; - result = result.replaceAll("&", "&"); - result = result.replaceAll("\"", """); - // text = text.replaceAll("\'", "'"); - result = result.replaceAll("<", "<"); - result = result.replaceAll(">", ">"); - return result; - } - - public static String generateHtmlLink(final String href, final String text) { - return "<a href=\"" + href + "\" target=\"_blank\">" + text + "</a>"; - } - - public static ArrayList<String> splitTags(final String tagsString) { - final ArrayList<String> tagsList = new ArrayList<String>(); - String tagsCopy = tagsString; - // remove commas and quotes - if (tagsString == null) { - return tagsList; - } - tagsCopy = tagsCopy.replaceAll(",", " "); - tagsCopy = tagsCopy.replaceAll("\"", ""); - tagsCopy = tagsCopy.replaceAll("\'", ""); - final String[] splitted = tagsCopy.split("\\s+"); - for (String tag : splitted) { - tag = tag.replaceAll("\\s$", ""); - if (tag.length() > 0) { - tagsList.add(tag); - } - } - return tagsList; - } - - /* - * This method unescape only some dangerous html chars for use in GWT Html - * widget for instance - */ - public static String unescape(final String source) { - if (source == null) { - return null; - } - String result = source; - result = result.replaceAll("&", "&"); - result = result.replaceAll(""", "\""); - result = result.replaceAll("'", "\'"); - result = result.replaceAll("<", "<"); - result = result.replaceAll(">", ">"); - return result; - } - - public TextUtils() { - } - -} Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/WindowUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,65 +0,0 @@ -/* - * Copyright 2006 Robert Hanson <iamroberthanson AT gmail.com> - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.ourproject.kune.platf.client.ui; - -public class WindowUtils { - - public static Location getLocation() { - Location result = new Location(); - result.setHash(getHash()); - result.setHost(getHost()); - result.setHostName(getHostName()); - result.setHref(getHref()); - result.setPath(getPath()); - result.setPort(getPort()); - result.setProtocol(getProtocol()); - result.setQueryString(getQueryString()); - return result; - } - - private static native String getHash() /*-{ - return $wnd.location.hash; - }-*/; - - private static native String getHost() /*-{ - return $wnd.location.host; - }-*/; - - private static native String getHostName() /*-{ - return $wnd.location.hostname; - }-*/; - - private static native String getHref() /*-{ - return $wnd.location.href; - }-*/; - - private static native String getPath() /*-{ - return $wnd.location.pathname; - }-*/; - - private static native String getPort() /*-{ - return $wnd.location.port; - }-*/; - - private static native String getProtocol() /*-{ - return $wnd.location.protocol; - }-*/; - - private static native String getQueryString() /*-{ - return $wnd.location.search; - }-*/; - -} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/WizardDialog.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.platf.client.ui.dialogs; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.DeckPanel; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.EventObject; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/download/FileDownloadUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ \*/ package org.ourproject.kune.platf.client.ui.download; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.services.ImageDescriptor; import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.utils.Url; import org.ourproject.kune.platf.client.utils.UrlParam; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateToken; + import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.RootPanel; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/noti/NotifyUser.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.platf.client.ui.noti; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Event2; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/SimplePalettePanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,7 +1,8 @@ package org.ourproject.kune.platf.client.ui.palette; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.widgets.ColorPalette; import com.gwtext.client.widgets.event.ColorPaletteListenerAdapter; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -11,8 +11,6 @@ import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.errors.UIException; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.RichTextArea; @@ -25,6 +23,9 @@ import org.xwiki.gwt.dom.client.Range; import org.xwiki.gwt.dom.client.Selection; +import cc.kune.core.client.errors.UIException; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -28,8 +28,6 @@ import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor; import org.ourproject.kune.platf.client.actions.ui.ToolbarSeparatorDescriptor; import org.ourproject.kune.platf.client.actions.ui.ToolbarSeparatorDescriptor.Type; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.img.ImgConstants; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; @@ -45,6 +43,9 @@ import org.ourproject.kune.platf.client.ui.rte.inserttable.InsertTableDialog; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/EditHtmlDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,11 +1,12 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.Window; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/editor/EditHtmlEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml.editor; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogView; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.gwtext.client.widgets.form.TextArea; public class EditHtmlEditorPanel extends DefaultForm implements EditHtmlEditorView { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/edithtml/preview/EditHtmlPreviewPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,8 +1,9 @@ package org.ourproject.kune.platf.client.ui.rte.edithtml.preview; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.rte.edithtml.EditHtmlDialogView; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.HTML; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.PanelListenerAdapter; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/InsertImageDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.platf.client.ui.rte.insertimg; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.platf.client.ui.rte.insertimg.ext; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.Frame; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/InsertLinkDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/email/InsertLinkEmailPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink.email; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.widgets.form.VType; public class InsertLinkEmailPanel extends InsertLinkAbstractPanel implements InsertLinkEmailView { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.Frame; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/ext/InsertLinkExtPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.platf.client.ui.rte.insertlink.ext; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialog; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPresenter; +import cc.kune.core.client.utils.TextUtils; + public class InsertLinkExtPresenter extends InsertLinkAbstractPresenter implements InsertLinkExt { private InsertLinkExtView view; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,9 +4,10 @@ import java.util.Iterator; import java.util.List; -import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO; -import org.ourproject.kune.platf.client.ui.TextUtils; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.dto.ExtMediaDescripDTO; + public class ExternalMediaRegistry extends ArrayList<ExtMediaDescripDTO> { private static final long serialVersionUID = -9109609520119776917L; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/InsertMediaDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/abstractmedia/MediaUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,10 +1,11 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.ContentPosition; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateToken; + public class MediaUtils { public static final String DOC_URL_TAG = "###DOC_URL###"; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class InsertMediaExtPanel extends InsertMediaAbstractPanel implements InsertMediaExtView { public InsertMediaExtPanel(final InsertMediaExtPresenter presenter, final I18nTranslationService i18n, Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ext/InsertMediaExtPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,11 +1,12 @@ package org.ourproject.kune.platf.client.ui.rte.insertmedia.ext; -import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; import org.ourproject.kune.platf.client.ui.rte.insertmedia.ExternalMediaRegistry; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; +import cc.kune.core.shared.dto.ExtMediaDescripDTO; + public class InsertMediaExtPresenter extends InsertMediaAbstractPresenter implements InsertMediaExt { private InsertMediaExtView view; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/InsertSpecialCharDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,10 +1,11 @@ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.event.ButtonListenerAdapter; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/asian/InsertSpecialAsianCharPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.asian; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.occidental.AbstractInsertCharPanel; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class InsertSpecialAsianCharPanel extends AbstractInsertCharPanel implements InsertSpecialAsianCharView { private static char[] SPECIAL_CHARS = { '・', '×', '【', '】', '『', '』', '《', '》', '“', '”', '「', '」', '〈', '〉', '≪', Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/occidental/InsertSpecialOccCharPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,8 +1,9 @@ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.occidental; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class InsertSpecialOccCharPanel extends AbstractInsertCharPanel implements InsertSpecialOccCharView { private static char[] SPECIAL_CHARS = { '¡', '¢', '£', '¤', '¥', '¦', '§', '¨', '©', 'ª', '«', '¬', '', '®', '¯', Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,11 +1,12 @@ package org.ourproject.kune.platf.client.ui.rte.insertspecialchar.utf8; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialog; import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogView; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/inserttable/InsertTableDialogPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,12 +1,13 @@ package org.ourproject.kune.platf.client.ui.rte.inserttable; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.palette.SimplePalette; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.DOM; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,8 +1,9 @@ package org.ourproject.kune.platf.client.ui.rte.saving; -import org.ourproject.kune.platf.client.actions.BeforeActionListener; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; +import cc.kune.core.client.actions.BeforeActionListener; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,12 +1,13 @@ package org.ourproject.kune.platf.client.ui.rte.saving; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPanel; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPresenter; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.calclab.suco.client.events.Listener0; public class RTESavingEditorPanel extends RTEditorPanel implements RTESavingEditorView { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -5,15 +5,11 @@ import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.actions.BeforeActionListener; import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuCheckItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.shortcuts.Keyboard; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPresenter; @@ -27,6 +23,11 @@ import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.platf.client.utils.TimerWrapper; +import cc.kune.core.client.actions.BeforeActionListener; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/PlatformServerModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -24,13 +24,6 @@ import org.ourproject.kune.app.server.AbstractExtendedModule; import org.ourproject.kune.chat.server.managers.XmppManager; import org.ourproject.kune.chat.server.managers.XmppManagerDefault; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.ContentService; -import org.ourproject.kune.platf.client.rpc.GroupService; -import org.ourproject.kune.platf.client.rpc.I18nService; -import org.ourproject.kune.platf.client.rpc.SiteService; -import org.ourproject.kune.platf.client.rpc.SocialNetworkService; -import org.ourproject.kune.platf.client.rpc.UserService; import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.access.AccessRightsServiceDefault; import org.ourproject.kune.platf.server.access.AccessService; @@ -108,6 +101,14 @@ import org.ourproject.kune.platf.server.users.UserInfoService; import org.ourproject.kune.platf.server.users.UserInfoServiceDefault; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.matcher.Matchers; import com.wideplay.warp.persist.PersistenceService; import com.wideplay.warp.persist.UnitOfWork; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.client.errors.DefaultException; + public interface AccessService { Container accessToContainer(Long folderId, User user, AccessRol accessRol) throws DefaultException; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/AccessServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.DefaultException; + import com.google.inject.Inject; import com.google.inject.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,6 @@ */ package org.ourproject.kune.platf.server.access; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.Comment; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; @@ -28,6 +26,9 @@ import org.ourproject.kune.platf.server.domain.Rate; import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.StateToken; + public interface FinderService { Comment getComment(Long commentId) throws DefaultException; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/access/FinderServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,12 +22,6 @@ import javax.persistence.NoResultException; import javax.persistence.PersistenceException; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.GroupNotFoundException; -import org.ourproject.kune.platf.client.errors.NoDefaultContentException; -import org.ourproject.kune.platf.client.errors.ToolNotFoundException; import org.ourproject.kune.platf.server.content.CommentManager; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; @@ -40,6 +34,13 @@ import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.RateManager; +import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.client.errors.DefaultException; +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 com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,10 +25,11 @@ import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.server.UserSession; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.errors.UserMustBeLoggedException; + import com.google.inject.Inject; import com.google.inject.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -23,8 +23,6 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.AccessViolationException; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.access.AccessRightsService; @@ -37,6 +35,9 @@ import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.GroupManager; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/auth/SessionServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,8 +22,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ \*/ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.Comment; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.Manager; +import cc.kune.core.client.errors.DefaultException; + public interface CommentManager extends Manager<Comment, Long> { Comment addComment(User author, Long contentId, String commentText) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/CommentManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,14 +21,15 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.access.FinderService; import org.ourproject.kune.platf.server.domain.Comment; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.DefaultManager; +import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.client.errors.DefaultException; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Group; @@ -27,6 +26,8 @@ import org.ourproject.kune.platf.server.manager.Manager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.client.errors.DefaultException; + public interface ContainerManager extends Manager<Container, Long> { Container createFolder(Group group, Container parent, String name, I18nLanguage language, String typeId); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -28,8 +28,6 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.NameInUseException; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; @@ -41,6 +39,9 @@ import org.ourproject.kune.platf.server.manager.impl.ServerManagerException; import org.ourproject.kune.platf.server.utils.FilenameUtils; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.NameInUseException; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,7 +21,6 @@ import java.util.Date; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.ContentStatus; @@ -31,6 +30,8 @@ import org.ourproject.kune.platf.server.manager.Manager; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.client.errors.DefaultException; + public interface ContentManager extends Manager<Content, Long> { String[] DEF_GLOBAL_SEARCH_FIELDS = new String[] { "authors.name", "authors.shortName", "container.name", Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -28,10 +28,6 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.I18nNotFoundException; -import org.ourproject.kune.platf.client.errors.NameInUseException; -import org.ourproject.kune.platf.client.errors.UserNotFoundException; import org.ourproject.kune.platf.server.access.FinderService; import org.ourproject.kune.platf.server.domain.Container; import org.ourproject.kune.platf.server.domain.Content; @@ -48,6 +44,11 @@ import org.ourproject.kune.platf.server.manager.impl.ServerManagerException; import org.ourproject.kune.platf.server.utils.FilenameUtils; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.client.errors.NameInUseException; +import cc.kune.core.client.errors.UserNotFoundException; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,7 @@ \*/ package org.ourproject.kune.platf.server.content; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; +import cc.kune.core.client.errors.ContentNotFoundException; public final class ContentUtils { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/ChatUserParams.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import java.io.Serializable; -import com.calclab.emiteuimodule.client.SubscriptionMode; +import cc.kune.core.shared.dto.SubscriptionMode; +@Deprecated public class ChatUserParams implements Serializable { private static final long serialVersionUID = -1343712336914940957L; @@ -31,10 +32,10 @@ private boolean publishRoster; + private String chatColor; + private SubscriptionMode subscriptionMode; - private String chatColor; - public ChatUserParams() { this(null, false, SubscriptionMode.autoAcceptAll, null); }; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Container.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -48,8 +48,9 @@ import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.annotations.Store; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.name.Named; import com.wideplay.warp.persist.dao.Finder; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Content.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -51,8 +51,9 @@ import org.hibernate.search.annotations.Indexed; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.validator.NotNull; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.name.Named; import com.wideplay.warp.persist.dao.Finder; import com.wideplay.warp.persist.dao.FirstResult; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -45,9 +45,10 @@ import org.hibernate.search.annotations.Store; import org.hibernate.validator.Length; import org.hibernate.validator.Pattern; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.name.Named; import com.wideplay.warp.persist.dao.Finder; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/HasStateToken.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.server.domain; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; public interface HasStateToken { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -44,8 +44,9 @@ import org.hibernate.validator.Length; import org.hibernate.validator.NotNull; import org.hibernate.validator.Pattern; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.name.Named; import com.wideplay.warp.persist.dao.Finder; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/i18n/I18nTranslationServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.platf.server.i18n; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/init/DatabaseInitializer.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -5,8 +5,6 @@ import javax.persistence.NoResultException; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.ContentStatus; @@ -30,6 +28,9 @@ import org.ourproject.kune.platf.server.manager.UserManager; import org.ourproject.kune.platf.server.properties.DatabaseProperties; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.dto.GroupType; + import com.calclab.emiteuimodule.client.SubscriptionMode; import com.google.inject.Inject; import com.wideplay.warp.persist.TransactionType; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/GroupManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,15 +21,16 @@ import java.util.List; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.EmailAddressInUseException; -import org.ourproject.kune.platf.client.errors.GroupNameInUseException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UserMustBeLoggedException; + public interface GroupManager extends Manager<Group, Long> { void changeDefLicense(User user, Group group, String licenseShortName); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/I18nTranslationManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,10 +22,11 @@ import java.util.HashMap; import java.util.List; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.client.errors.DefaultException; + public interface I18nTranslationManager extends Manager<I18nTranslation, Long> { HashMap<String, String> getLexicon(String language); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/SocialNetworkManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,15 +19,16 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.SocialNetwork; import org.ourproject.kune.platf.server.domain.SocialNetworkData; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.sn.ParticipationData; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; + public interface SocialNetworkManager extends Manager<SocialNetwork, Long> { void acceptJoinGroup(User userLogged, Group group, Group inGroup) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,7 +7,6 @@ import javax.persistence.NoResultException; import javax.persistence.Query; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.Tag; @@ -17,6 +16,8 @@ import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.DefaultManager; +import cc.kune.core.client.utils.TextUtils; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/UserManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.platf.server.manager; -import org.ourproject.kune.platf.client.errors.I18nNotFoundException; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; import org.ourproject.kune.platf.server.sn.UserBuddiesData; +import cc.kune.core.client.errors.I18nNotFoundException; + public interface UserManager { /** * CreateUser new method with language country and timezone params 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -27,11 +27,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; public class EntityLogoDownloadManager extends HttpServlet { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -29,8 +29,6 @@ import magick.MagickException; import org.apache.commons.fileupload.FileItem; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; 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; @@ -40,6 +38,9 @@ import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; import com.wideplay.warp.persist.TransactionType; import com.wideplay.warp.persist.Transactional; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -31,8 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; 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; @@ -45,6 +43,9 @@ import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.properties.KuneProperties; +import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; /** Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,8 +26,9 @@ import net.sf.json.JSONObject; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; public abstract class FileJsonUploadManagerAbstract extends FileUploadManagerAbstract { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,8 +26,6 @@ import net.sf.json.JSONObject; import org.apache.commons.fileupload.FileItem; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRol; @@ -45,6 +43,9 @@ 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.i18n.I18nTranslationService; + import com.google.inject.Inject; import com.google.inject.servlet.RequestScoped; import com.wideplay.warp.persist.TransactionType; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -37,10 +37,11 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.ourproject.kune.platf.client.dto.StateToken; 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 com.google.inject.Inject; public abstract class FileUploadManagerAbstract extends HttpServlet { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; public class FileUtils { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/GroupManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -31,12 +31,6 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; import org.hibernate.exception.ConstraintViolationException; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.EmailAddressInUseException; -import org.ourproject.kune.platf.client.errors.GroupNameInUseException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.AdmissionType; import org.ourproject.kune.platf.server.domain.Content; @@ -53,6 +47,13 @@ import org.ourproject.kune.platf.server.tool.ServerTool; import org.ourproject.kune.platf.server.tool.ServerToolRegistry; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.dto.GroupType; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/I18nTranslationManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,13 +25,14 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.utils.TextUtils; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/PropertiesManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,12 +6,13 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.client.errors.UnknownPropertyException; import org.ourproject.kune.platf.server.domain.Properties; import org.ourproject.kune.platf.server.domain.Property; import org.ourproject.kune.platf.server.domain.PropertySetted; import org.ourproject.kune.platf.server.manager.PropertiesManager; +import cc.kune.core.client.errors.UnknownPropertyException; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -23,14 +23,6 @@ import javax.persistence.EntityManager; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.AlreadyGroupMemberException; -import org.ourproject.kune.platf.client.errors.AlreadyUserMemberException; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.LastAdminInGroupException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.server.ServerException; import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.access.AccessRightsService; @@ -47,6 +39,15 @@ import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.platf.server.sn.UserBuddiesData; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.AlreadyGroupMemberException; +import cc.kune.core.client.errors.AlreadyUserMemberException; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.LastAdminInGroupException; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/impl/UserManagerDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -34,8 +34,6 @@ import org.jivesoftware.smack.packet.RosterPacket.ItemType; import org.ourproject.kune.chat.server.managers.ChatConnection; import org.ourproject.kune.chat.server.managers.XmppManager; -import org.ourproject.kune.platf.client.errors.I18nNotFoundException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.domain.I18nCountry; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.Properties; @@ -49,6 +47,9 @@ import org.ourproject.kune.platf.server.properties.ChatProperties; import org.ourproject.kune.platf.server.sn.UserBuddiesData; +import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/DozerMapper.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,9 +25,10 @@ import net.sf.dozer.util.mapping.DozerBeanMapperSingletonWrapper; import net.sf.dozer.util.mapping.MapperIF; -import org.ourproject.kune.platf.client.dto.SearchResultDTO; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.shared.dto.SearchResultDTO; + import com.google.inject.Singleton; @Singleton Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/Mapper.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,9 +21,10 @@ import java.util.List; -import org.ourproject.kune.platf.client.dto.SearchResultDTO; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.shared.dto.SearchResultDTO; + public interface Mapper { <T> T map(Object source, Class<T> type); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/ContentJSONService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,6 @@ */ package org.ourproject.kune.platf.server.rest; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.SearchResultDTO; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; @@ -30,6 +28,9 @@ import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.dto.SearchResultDTO; + import com.google.inject.Inject; public class ContentJSONService { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/GroupJSONService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,6 @@ */ package org.ourproject.kune.platf.server.rest; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.SearchResultDTO; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.GroupManager; @@ -28,6 +26,9 @@ import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.dto.SearchResultDTO; + import com.google.inject.Inject; public class GroupJSONService { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/I18nTranslationJSONService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,6 @@ import java.util.List; -import org.ourproject.kune.platf.client.dto.I18nTranslationDTO; -import org.ourproject.kune.platf.client.dto.SearchResultDTO; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.domain.I18nTranslation; import org.ourproject.kune.platf.server.manager.I18nTranslationManager; @@ -30,6 +28,9 @@ import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.shared.dto.I18nTranslationDTO; +import cc.kune.core.shared.dto.SearchResultDTO; + import com.google.inject.Inject; public class I18nTranslationJSONService { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rest/UserJSONService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,6 @@ */ package org.ourproject.kune.platf.server.rest; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.SearchResultDTO; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.UserManager; @@ -28,6 +26,9 @@ import org.ourproject.kune.platf.server.mapper.Mapper; import org.ourproject.kune.rack.filters.rest.REST; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.dto.SearchResultDTO; + import com.google.inject.Inject; public class UserJSONService { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,26 +26,6 @@ import org.ourproject.kune.chat.server.ChatServerTool; import org.ourproject.kune.chat.server.managers.ChatConnection; import org.ourproject.kune.chat.server.managers.XmppManager; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.CommentDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.RateResultDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateNoContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; -import org.ourproject.kune.platf.client.dto.TagCountDTO; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.GroupNotFoundException; -import org.ourproject.kune.platf.client.errors.NoDefaultContentException; -import org.ourproject.kune.platf.client.errors.ToolNotFoundException; -import org.ourproject.kune.platf.client.rpc.ContentService; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.access.AccessRol; @@ -75,6 +55,27 @@ import org.ourproject.kune.platf.server.state.StateContent; import org.ourproject.kune.platf.server.state.StateService; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.client.errors.DefaultException; +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.client.rpcservices.ContentService; +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.CommentDTO; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.RateResultDTO; +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; +import cc.kune.core.shared.dto.TagCloudResultDTO; +import cc.kune.core.shared.dto.TagCountDTO; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/GroupRPC.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,6 @@ */ package org.ourproject.kune.platf.server.rpc; -import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.rpc.GroupService; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; @@ -41,6 +34,14 @@ import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.mapper.Mapper; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -24,10 +24,6 @@ import javax.persistence.NoResultException; import javax.servlet.http.HttpServletRequest; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.rpc.I18nService; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.auth.Authenticated; import org.ourproject.kune.platf.server.domain.I18nLanguage; @@ -36,6 +32,11 @@ import org.ourproject.kune.platf.server.manager.I18nTranslationManager; import org.ourproject.kune.platf.server.mapper.Mapper; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.rpcservices.I18nService; +import cc.kune.core.shared.dto.I18nLanguageDTO; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SiteRPC.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,9 +21,6 @@ import java.util.TimeZone; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.rpc.SiteService; import org.ourproject.kune.platf.server.InitData; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.manager.ExtMediaDescripManager; @@ -37,6 +34,10 @@ import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.users.UserInfoService; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.shared.dto.InitDataDTO; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/SocialNetworkRPC.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,6 @@ */ package org.ourproject.kune.platf.server.rpc; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.rpc.SocialNetworkService; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; @@ -35,6 +30,12 @@ import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.mapper.Mapper; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/UserRPC.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,14 +22,6 @@ import java.util.UUID; import org.jivesoftware.smack.util.Base64; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO; -import org.ourproject.kune.platf.client.dto.UserDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.UserAuthException; -import org.ourproject.kune.platf.client.rpc.UserService; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.access.AccessRol; import org.ourproject.kune.platf.server.auth.ActionLevel; @@ -45,6 +37,15 @@ import org.ourproject.kune.platf.server.users.UserInfo; import org.ourproject.kune.platf.server.users.UserInfoService; +import cc.kune.core.client.errors.AccessViolationException; +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.dto.StateToken; +import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; +import cc.kune.core.shared.dto.UserDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateAbstract.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,7 +21,6 @@ import java.util.List; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.server.access.AccessRights; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.SocialNetwork; @@ -29,6 +28,8 @@ import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.platf.server.sn.UserBuddiesData; +import cc.kune.core.shared.dto.StateToken; + public abstract class StateAbstract { private List<String> enabledTools; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.platf.server.state; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.access.AccessRightsService; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.domain.Container; @@ -32,6 +31,8 @@ import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.manager.TagUserContentManager; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoService.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.platf.server.users; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.client.errors.DefaultException; + public interface UserInfoService { UserInfo buildInfo(User user, String userHash) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,6 @@ */ package org.ourproject.kune.platf.server.users; -import org.ourproject.kune.platf.client.errors.DefaultException; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.User; @@ -27,6 +26,8 @@ import org.ourproject.kune.platf.server.manager.SocialNetworkManager; import org.ourproject.kune.platf.server.sn.ParticipationData; +import cc.kune.core.client.errors.DefaultException; + import com.google.inject.Inject; import com.google.inject.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/platf/server/utils/FilenameUtils.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.platf.server.utils; import org.apache.commons.lang.StringUtils; -import org.ourproject.kune.platf.client.errors.NameNotPermittedException; +import cc.kune.core.client.errors.NameNotPermittedException; + public class FilenameUtils { /** Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -24,12 +24,6 @@ import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_UPLOADEDFILE; import static org.ourproject.kune.wiki.client.WikiClientTool.TYPE_WIKIPAGE; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.wiki.client.cnt.WikiViewer; @@ -45,6 +39,13 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class WikiClientActions extends AbstractFoldableContentActions { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,15 +20,8 @@ package org.ourproject.kune.wiki.client; import org.ourproject.kune.platf.client.app.ToolGroup; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; @@ -57,6 +50,14 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.wiki.client; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; import org.ourproject.kune.workspace.client.tool.ToolSelector; +import cc.kune.core.client.i18n.I18nUITranslationService; + public class WikiClientTool extends FoldableAbstractClientTool { public static final String NAME = "wiki"; public static final String TYPE_ROOT = NAME + "." + "root"; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class WikiFolderContentPanel extends FoldableContentPanel implements WikiFolderContentView { public WikiFolderContentPanel(WorkspaceSkeleton ws, I18nTranslationService i18n) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiFolderContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,18 +20,19 @@ package org.ourproject.kune.wiki.client.cnt; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.ContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.cnt.ActionContentToolbar; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +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; public class WikiFolderContentPresenter extends FoldableContentPresenter implements WikiFolderContent { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class WikiViewerPanel extends FoldableContentPanel implements WikiViewerView { public WikiViewerPanel(final WorkspaceSkeleton ws, I18nTranslationService i18n) { super(ws, i18n); Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/cnt/WikiViewerPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,6 @@ */ package org.ourproject.kune.wiki.client.cnt; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.wiki.client.WikiClientTool; @@ -30,6 +26,11 @@ import org.ourproject.kune.workspace.client.cnt.ContentActionRegistry; import org.ourproject.kune.workspace.client.cnt.FoldableContentPresenter; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.ioc.Provider; public class WikiViewerPresenter extends FoldableContentPresenter implements WikiViewer { Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.wiki.client.ctx; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class WikiContextPresenter extends FoldableContextPresenter implements WikiContext { Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,9 +21,6 @@ import java.util.Date; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; -import org.ourproject.kune.platf.client.errors.ContentNotPermittedException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.content.ContainerManager; import org.ourproject.kune.platf.server.content.ContentManager; import org.ourproject.kune.platf.server.domain.AccessLists; @@ -39,6 +36,10 @@ import org.ourproject.kune.platf.server.tool.ServerToolRegistry; import org.ourproject.kune.platf.server.tool.ServerToolTarget; +import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.core.client.errors.ContentNotPermittedException; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; public class WikiServerTool implements ServerTool { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -31,23 +31,6 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; @@ -63,6 +46,24 @@ import org.ourproject.kune.workspace.client.upload.FileUploader; import org.ourproject.kune.workspace.client.wave.WaveInsert; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +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.AccessRolDTO; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.InitDataDTO; +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; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ActionsModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,15 +1,16 @@ package org.ourproject.kune.workspace.client; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.socialnet.ParticipateAction; import org.ourproject.kune.workspace.client.socialnet.UnjoinAction; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +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.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.decorator.NoDecoration; import com.calclab.suco.client.ioc.module.Factory; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -27,30 +27,13 @@ import org.ourproject.kune.platf.client.app.ApplicationComponentGroup; import org.ourproject.kune.platf.client.app.GroupOptionsCollection; import org.ourproject.kune.platf.client.app.UserOptionsCollection; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.StateTokenUtils; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.AuthorableRegistry; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.registry.RenamableRegistry; -import org.ourproject.kune.platf.client.rpc.ContentService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.rpc.GroupService; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.rpc.I18nServiceAsync; -import org.ourproject.kune.platf.client.rpc.SocialNetworkService; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; -import org.ourproject.kune.platf.client.services.ErrorHandler; import org.ourproject.kune.platf.client.services.ImageUtils; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; @@ -259,6 +242,24 @@ import org.ourproject.kune.workspace.client.wave.WaveInsertPanel; import org.ourproject.kune.workspace.client.wave.WaveInsertPresenter; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.rpcservices.I18nServiceAsync; +import cc.kune.core.client.rpcservices.SocialNetworkService; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.rpcservices.UserServiceAsync; +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.dto.StateTokenUtils; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.decorator.NoDecoration; import com.calclab.suco.client.ioc.decorator.Singleton; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbar.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.cnt; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ActionContentToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public class ActionContentToolbarPresenter extends ActionToolbarPresenter<StateToken> implements ActionContentToolbar { public ActionContentToolbarPresenter(ActionToolbarView<StateToken> toolbar) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,7 +20,8 @@ package org.ourproject.kune.workspace.client.cnt; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public class ContentActionRegistry extends ActionRegistry<StateToken> { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/ContentIconsRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,7 +21,7 @@ import java.util.HashMap; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; +import cc.kune.core.shared.dto.BasicMimeTypeDTO; public class ContentIconsRegistry { private final HashMap<String, String> contentTypesIcons; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.workspace.client.cnt; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.platf.client.ui.RoundedPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener0; import com.google.gwt.event.dom.client.ClickEvent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,21 +21,22 @@ import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.MediaUtils; import org.ourproject.kune.workspace.client.AbstractFoldableContentActions; +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.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; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigator.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.workspace.client.ctxnav; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.workspace.client.upload.FileUploader; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateToken; + public interface ContextNavigator { void addFileUploaderListener(FileUploader uploader); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorItem.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.ctxnav; import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.StateToken; + public class ContextNavigatorItem { private final String id; private final String parentId; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,12 +22,13 @@ import org.ourproject.kune.platf.client.actions.ActionItem; import org.ourproject.kune.platf.client.actions.ActionManager; import org.ourproject.kune.platf.client.actions.MenuItemsContainer; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.EventObject; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,21 +26,7 @@ import org.ourproject.kune.platf.client.actions.ActionItemCollection; import org.ourproject.kune.platf.client.actions.ActionRegistry; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; -import org.ourproject.kune.platf.client.dto.ContainerDTO; -import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; @@ -50,6 +36,21 @@ import org.ourproject.kune.workspace.client.title.RenameAction; import org.ourproject.kune.workspace.client.upload.FileUploader; +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.dto.BasicMimeTypeDTO; +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.ContentStatusDTO; +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; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.events.Listener2; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.ctxnav; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.ContentStatusDTO; +import cc.kune.core.shared.dto.StateToken; + public interface ContextNavigatorView extends View { void addItem(ContextNavigatorItem contextNavigatorItem); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,13 +22,14 @@ import java.util.Iterator; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.AccessListsDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.GroupListDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.IconLabel; +import cc.kune.core.shared.dto.AccessListsDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.GroupListDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextBottomToolbar.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,8 +22,9 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public class ActionContextBottomToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> { public ActionContextBottomToolbar(ActionToolbarView<StateToken> toolbar) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ActionContextTopToolbar.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,8 +22,9 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public class ActionContextTopToolbar extends ActionToolbarPresenter<StateToken> implements ActionToolbar<StateToken> { public ActionContextTopToolbar(ActionToolbarView<StateToken> toolbar) { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,7 +20,8 @@ package org.ourproject.kune.workspace.client.cxt; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public class ContextActionRegistry extends ActionRegistry<StateToken> { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditor.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.workspace.client.cxt; -import org.ourproject.kune.platf.client.dto.StateContentDTO; +import cc.kune.core.shared.dto.StateContentDTO; public interface ContextPropEditor { void attach(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,16 +22,17 @@ import java.util.Date; import java.util.List; -import org.ourproject.kune.platf.client.dto.AccessListsDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.ContextPropertyPanel; import org.ourproject.kune.workspace.client.i18n.LanguageSelector; import org.ourproject.kune.workspace.client.i18n.LanguageSelectorPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.dto.AccessListsDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.VerticalPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,21 +22,22 @@ import java.util.Date; import java.util.List; -import org.ourproject.kune.platf.client.dto.AccessListsDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.tags.TagsSummary; import org.ourproject.kune.workspace.client.title.EntitySubTitle; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.dto.AccessListsDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.core.shared.dto.TagCloudResultDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + import com.calclab.suco.client.ioc.Provider; public class ContextPropEditorPresenter implements ContextPropEditor { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,9 +22,9 @@ import java.util.Date; import java.util.List; -import org.ourproject.kune.platf.client.dto.AccessListsDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import cc.kune.core.shared.dto.AccessListsDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; public interface ContextPropEditorView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.workspace.client.cxt; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,10 +1,11 @@ package org.ourproject.kune.workspace.client.editor; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.rte.saving.RTESavingEditorPanel; +import cc.kune.core.client.i18n.I18nUITranslationService; + public class ContentEditorPanel extends RTESavingEditorPanel implements ContentEditorView { public ContentEditorPanel(final ContentEditorPresenter presenter, final I18nUITranslationService i18n, Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/ContentEditorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -9,10 +9,7 @@ import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.shortcuts.Keyboard; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditor; import org.ourproject.kune.platf.client.ui.rte.basic.RTEditorPanel; @@ -31,6 +28,10 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.title.EntityTitle; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,15 +1,16 @@ package org.ourproject.kune.workspace.client.editor.insertlocalimg; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.SearcherConstants; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; +import cc.kune.core.client.state.Session; +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; import com.gwtext.client.core.UrlParam; import com.gwtext.client.widgets.form.Field; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalimg/InsertImageLocalPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.workspace.client.editor.insertlocalimg; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.rte.insertimg.InsertImageDialog; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPresenter; +import cc.kune.core.client.state.Session; + public class InsertImageLocalPresenter extends InsertImageAbstractPresenter implements InsertImageLocal { private final Session session; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocallink/InsertLinkLocalPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,16 +19,17 @@ */ package org.ourproject.kune.workspace.client.editor.insertlocallink; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.StateTokenUtils; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.abstractlink.InsertLinkAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +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; + import com.calclab.suco.client.events.Listener; public class InsertLinkLocalPanel extends InsertLinkAbstractPanel implements InsertLinkLocalView { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,14 +1,15 @@ package org.ourproject.kune.workspace.client.editor.insertlocalmedia; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPanel; import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherField; +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; import com.gwtext.client.core.UrlParam; import com.gwtext.client.widgets.form.Field; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insertlocalmedia/InsertMediaLocalPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,11 +1,12 @@ package org.ourproject.kune.workspace.client.editor.insertlocalmedia; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.rte.insertmedia.InsertMediaDialog; import org.ourproject.kune.platf.client.ui.rte.insertmedia.abstractmedia.InsertMediaAbstractPresenter; 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 com.calclab.suco.client.ioc.Provider; public class InsertMediaLocalPresenter extends InsertMediaAbstractPresenter implements InsertMediaLocal { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,14 +25,15 @@ import org.ourproject.kune.platf.client.actions.ui.ComplexToolbar; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; +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; import com.google.gwt.user.client.ui.Image; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,12 +21,13 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; + import com.calclab.suco.client.events.Listener2; public class EntityHeaderPresenter implements EntityHeader { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,10 +21,11 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.workspace.client.themes.WsTheme; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.StateToken; + public interface EntityHeaderView { void addAction(GuiActionDescrip descriptor); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/maxmin/MaxMinWorkspacePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,11 +7,12 @@ import org.ourproject.kune.platf.client.actions.KeyStroke; import org.ourproject.kune.platf.client.actions.Shortcut; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.resources.client.ImageResource; public class MaxMinWorkspacePresenter implements MaxMinWorkspace { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -31,8 +31,6 @@ import org.ourproject.kune.platf.client.actions.ui.MenuRadioItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor; import org.ourproject.kune.platf.client.actions.ui.PushButtonDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked; import org.ourproject.kune.platf.client.services.AbstractExtendedModule; import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.img.ImgResources; @@ -41,6 +39,9 @@ import org.ourproject.kune.workspace.client.hello.HelloWorldModule.HelloWorldPanel.HelloWorldPresenter; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nTranslationServiceMocked; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.ioc.decorator.Singleton; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,17 +19,18 @@ */ package org.ourproject.kune.workspace.client.i18n; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.search.SiteBottomTrayButton; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.HorizontalPanel; import com.gwtext.client.core.EventObject; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,12 +20,13 @@ package org.ourproject.kune.workspace.client.i18n; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.I18nServiceAsync; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.I18nServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.I18nLanguageDTO; + import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelector.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.i18n; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; + public interface LanguageSelector { String getSelectedLanguage(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.workspace.client.i18n; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; import com.gwtext.client.widgets.form.ComboBox; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/LanguageSelectorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.i18n; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.I18nLanguageDTO; + public class LanguageSelectorPresenter implements LanguageSelector { private LanguageSelectorView view; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/SiteOptionsI18nTranslatorAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,10 +4,11 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteoptions.SiteOptions; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; public class SiteOptionsI18nTranslatorAction extends AbstractAction { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.workspace.client.licensefoot; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.KuneWindowUtils; import org.ourproject.kune.platf.client.ui.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.MouseOutEvent; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.workspace.client.licensefoot; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.state.StateManager; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; + import com.calclab.suco.client.events.Listener; public class EntityLicensePresenter { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicenseView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.licensefoot; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LicenseDTO; +import cc.kune.core.shared.dto.LicenseDTO; + public interface EntityLicenseView extends View { void attach(); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,14 +19,15 @@ */ package org.ourproject.kune.workspace.client.licensewizard; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +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.LicenseDTO; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.workspace.client.licensewizard; -import org.ourproject.kune.platf.client.dto.LicenseDTO; +import cc.kune.core.shared.dto.LicenseDTO; + import com.calclab.suco.client.events.Listener; public interface LicenseWizard { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.workspace.client.licensewizard; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.dialogs.WizardDialog; import org.ourproject.kune.platf.client.ui.dialogs.WizardListener; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class LicenseWizardPanel extends WizardDialog implements LicenseWizardView { public static final String LIC_WIZ_DIALOG = "k-lwp-diag"; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,14 +22,15 @@ import java.util.List; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.LicenseDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.workspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; +import cc.kune.core.client.utils.TextUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.form.Checkbox; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFlags.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.workspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.platf.client.ui.KuneWindowUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.gwtext.client.widgets.Panel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,13 +22,14 @@ import java.util.ArrayList; import java.util.List; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.Template; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.workspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.widgets.form.FieldSet; import com.gwtext.client.widgets.form.Label; import com.gwtext.client.widgets.form.Radio; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.workspace.client.licensewizard.pages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.PaddedPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,6 @@ */ package org.ourproject.kune.workspace.client.newgroup; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.platf.client.ui.KuneWindowUtils; @@ -31,6 +29,9 @@ import org.ourproject.kune.workspace.client.WorkspaceMessages; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,22 +20,23 @@ package org.ourproject.kune.workspace.client.newgroup; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.GroupNameInUseException; -import org.ourproject.kune.platf.client.errors.UIException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; import org.ourproject.kune.workspace.client.WorkspaceMessages; import org.ourproject.kune.workspace.client.site.SiteToken; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UIException; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.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; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.newgroup; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LicenseDTO; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; +import cc.kune.core.shared.dto.LicenseDTO; + public interface NewGroupView extends View { void center(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,10 +20,11 @@ package org.ourproject.kune.workspace.client.nohomepage; import org.ourproject.kune.platf.client.PlatfMessages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.skel.EntityWorkspace; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.Label; public class NoHomePagePanel implements NoHomePageView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.workspace.client.nohomepage; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateNoContentDTO; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateNoContentDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,11 +22,12 @@ import org.ourproject.kune.platf.client.PlatfMessages; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; import org.ourproject.kune.platf.client.app.GroupOptionsCollection; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class GroupOptionsPanel extends AbstractTabbedDialogPanel implements GroupOptionsView { public static final String GROUP_OP_PANEL_ID = "k-gop-diagpan"; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -23,13 +23,14 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import org.ourproject.kune.platf.client.ui.img.ImgConstants; import org.ourproject.kune.platf.client.ui.img.ImgResources; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; public class GroupOptionsPresenter extends AbstractTabbedDialogPresenter implements GroupOptions { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,11 +21,12 @@ import org.ourproject.kune.platf.client.PlatfMessages; import org.ourproject.kune.platf.client.app.UserOptionsCollection; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPanel; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class UserOptionsPanel extends AbstractTabbedDialogPanel implements UserOptionsView { public static final String USER_OP_PANEL_ID = "k-uop-diagpan"; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/UserOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -23,13 +23,14 @@ import org.ourproject.kune.platf.client.actions.Action; import org.ourproject.kune.platf.client.actions.ActionEvent; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.dialogs.tabbed.AbstractTabbedDialogPresenter; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.sitebar.siteusermenu.SiteUserOptions; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; public class UserOptionsPresenter extends AbstractTabbedDialogPresenter implements UserOptions { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,14 +19,15 @@ */ package org.ourproject.kune.workspace.client.options.license; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.options.EntityOptionsView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Image; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,13 +20,14 @@ package org.ourproject.kune.workspace.client.options.license; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; import org.ourproject.kune.workspace.client.options.EntityOptions; +import cc.kune.core.client.state.Session; +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; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicenseView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.options.license; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LicenseDTO; +import cc.kune.core.shared.dto.LicenseDTO; + public interface EntityOptionsDefLicenseView extends View { void openWindow(String url); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/GroupOptionsDefLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,13 +1,14 @@ package org.ourproject.kune.workspace.client.options.license; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; import org.ourproject.kune.workspace.client.options.EntityOptions; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/UserOptionsDefLicensePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,13 +1,14 @@ package org.ourproject.kune.workspace.client.options.license; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.licensewizard.LicenseChangeAction; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; import org.ourproject.kune.workspace.client.options.EntityOptions; +import cc.kune.core.client.state.Session; +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; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,13 +20,14 @@ package org.ourproject.kune.workspace.client.options.logo; import org.ourproject.kune.platf.client.PlatfMessages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.options.EntityOptionsView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.core.Connection; import com.gwtext.client.core.EventCallback; import com.gwtext.client.core.EventObject; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,12 +21,13 @@ import org.ourproject.kune.chat.client.ChatEngine; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.options.EntityOptions; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; + import com.calclab.suco.client.ioc.Provider; public abstract class EntityOptionsLogoPresenter implements GroupOptionsLogo, UserOptionsLogo { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.workspace.client.options.logo; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class GroupOptionsLogoPanel extends EntityOptionsLogoPanel { public static final String PANEL_ID = "k-golp-pan"; public static final String BUTTON_ID = "k-golp-sendb"; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/GroupOptionsLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,12 +1,13 @@ package org.ourproject.kune.workspace.client.options.logo; import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.options.EntityOptions; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; + 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/logo/UserOptionsLogoPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.workspace.client.options.logo; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.download.FileConstants; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class UserOptionsLogoPanel extends EntityOptionsLogoPanel { public static final String PANEL_ID = "k-uolp-pan"; public static final String BUTTON_ID = "k-uolp-sendb"; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/UserOptionsLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,15 +1,16 @@ package org.ourproject.kune.workspace.client.options.logo; import org.ourproject.kune.chat.client.ChatEngine; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.options.EntityOptions; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,7 @@ */ package org.ourproject.kune.workspace.client.options.pscape; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.BasicThumb; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; @@ -30,6 +27,10 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; 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.i18n.I18nTranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.HorizontalPanel; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,17 +1,18 @@ package org.ourproject.kune.workspace.client.options.pscape; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.options.EntityOptions; import org.ourproject.kune.workspace.client.themes.WsBackManager; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.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; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.options.pscape; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public interface EntityOptionsPublicSpaceConfView extends View { public void clearBackImage(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/GroupOptionsPublicSpaceConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,16 +19,17 @@ */ package org.ourproject.kune.workspace.client.options.pscape; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.options.EntityOptions; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.themes.WsThemeSelector; +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.StateAbstractDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/UserOptionsPublicSpaceConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,16 +19,17 @@ */ package org.ourproject.kune.workspace.client.options.pscape; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.options.EntityOptions; import org.ourproject.kune.workspace.client.themes.WsBackManager; import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.themes.WsThemeSelector; +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.UserInfoDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,12 +21,13 @@ import java.util.HashMap; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.workspace.client.options.EntityOptionsView; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.gwtext.client.widgets.ToolTip; import com.gwtext.client.widgets.form.Checkbox; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,15 +4,16 @@ import java.util.List; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; import org.ourproject.kune.workspace.client.options.EntityOptions; +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.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.options.tools; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; +import cc.kune.core.shared.dto.ToolSimpleDTO; + public interface EntityOptionsToolsConfView extends View { void add(ToolSimpleDTO tool); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/GroupOptionsToolsConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,15 +22,16 @@ import java.util.Collection; import java.util.List; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.options.EntityOptions; +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.ContentSimpleDTO; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.dto.ToolSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + 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/tools/UserOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/UserOptionsToolsConfPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,15 +22,16 @@ import java.util.Collection; import java.util.List; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.ToolSimpleDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.options.EntityOptions; +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.dto.ToolSimpleDTO; +import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.workspace.client.rate; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RateItPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,17 +19,18 @@ */ package org.ourproject.kune.workspace.client.rate; -import org.ourproject.kune.platf.client.dto.RateResultDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.dto.RateResultDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ */ package org.ourproject.kune.workspace.client.rate; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.skel.Toolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Grid; import com.google.gwt.user.client.ui.Image; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/rate/RatePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ \*/ package org.ourproject.kune.workspace.client.rate; -import org.ourproject.kune.platf.client.dto.RateResultDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; -import org.ourproject.kune.platf.client.state.StateManager; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.RateResultDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.events.Listener; public class RatePresenter { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.SearcherConstants; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.gwtext.client.widgets.form.FormPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.dto.LinkDTO; +import cc.kune.core.shared.dto.LinkDTO; + import com.calclab.suco.client.events.Listener; public interface EntityLiveSearcher { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +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; public class EntityLiveSearcherPanel implements EntityLiveSearcherView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.search; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.LinkDTO; +import cc.kune.core.shared.dto.LinkDTO; + import com.calclab.suco.client.events.Listener; public class EntityLiveSearcherPresenter implements EntityLiveSearcher { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/GroupLiveSearchPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class GroupLiveSearchPanel extends EntityLiveSearcherPanel { public GroupLiveSearchPanel(final EntityLiveSearcherPresenter presenter, final I18nTranslationService i18n, Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,13 +19,14 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.errors.UIException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.SearcherConstants; import org.ourproject.kune.platf.client.ui.AbstractSearcherPanel; import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.errors.UIException; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.user.client.ui.HorizontalPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,9 +22,10 @@ import java.util.HashMap; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.state.StateManager; + import com.calclab.suco.client.ioc.Provider; public class SiteSearcherPresenter implements SiteSearcher { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/UserLiveSearcherPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.workspace.client.search; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class UserLiveSearcherPanel extends EntityLiveSearcherPanel { public UserLiveSearcherPanel(final EntityLiveSearcherPresenter presenter, final I18nTranslationService i18n, Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ \*/ package org.ourproject.kune.workspace.client.signin; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.workspace.client.WorkspaceMessages; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.data.SimpleStore; import com.gwtext.client.data.Store; import com.gwtext.client.widgets.form.ComboBox; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,13 +20,14 @@ package org.ourproject.kune.workspace.client.signin; import org.ourproject.kune.platf.client.PlatfMessages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.platf.client.ui.dialogs.InfoDialog; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,22 +21,23 @@ import org.ourproject.kune.platf.client.PlatfMessages; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.I18nCountryDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.TimeZoneDTO; -import org.ourproject.kune.platf.client.dto.UserDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.errors.EmailAddressInUseException; -import org.ourproject.kune.platf.client.errors.GroupNameInUseException; -import org.ourproject.kune.platf.client.errors.UIException; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; -import com.calclab.emiteuimodule.client.SubscriptionMode; +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.UIException; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.I18nCountryDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.SubscriptionMode; +import cc.kune.core.shared.dto.TimeZoneDTO; +import cc.kune.core.shared.dto.UserDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,13 +21,14 @@ import java.util.Date; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.dialogs.ExtendedDialog; import org.ourproject.kune.platf.client.ui.dialogs.MessageToolbar; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Cookies; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ */ package org.ourproject.kune.workspace.client.signin; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + public class SignInAbstractPresenter { protected final Session session; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ \*/ package org.ourproject.kune.workspace.client.signin; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.form.Field; import com.gwtext.client.widgets.form.TextField; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.workspace.client.signin; import org.ourproject.kune.platf.client.PlatfMessages; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,17 +21,18 @@ import org.ourproject.kune.platf.client.PlatfMessages; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.UserDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.errors.UserAuthException; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; import org.ourproject.kune.workspace.client.site.SiteToken; +import cc.kune.core.client.errors.UserAuthException; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.UserDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.ioc.Provider; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/WorkspaceNotifyUser.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,6 +1,5 @@ package org.ourproject.kune.workspace.client.site; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.noti.ConfirmationAsk; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.noti.NotifyUser.Level; @@ -8,6 +7,8 @@ import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.events.Listener2; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.sitebar.sitelogo; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.InitDataDTO; + import com.calclab.suco.client.events.Listener; public class SiteLogoPresenter implements SiteLogo { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitenewgroup/SiteNewGroupLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ \*/ package org.ourproject.kune.workspace.client.sitebar.sitenewgroup; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.SiteToken; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.google.gwt.user.client.ui.Hyperlink; public class SiteNewGroupLinkPanel implements SiteNewGroupLinkView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,11 +20,12 @@ package org.ourproject.kune.workspace.client.sitebar.siteoptions; import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.ui.AbstractToolbar; import org.ourproject.kune.platf.client.ui.dialogs.InfoDialog; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.google.gwt.user.client.ui.Frame; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.layout.FitLayout; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -28,10 +28,11 @@ import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuSeparatorDescriptor; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.KuneWindowUtils; import org.ourproject.kune.platf.client.ui.img.ImgResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + public class SiteOptionsPresenter extends AbstractActionExtensiblePresenter implements SiteOptions { private SiteOptionsView view; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,7 @@ \*/ package org.ourproject.kune.workspace.client.sitebar.sitepublic; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; public interface SitePublicSpaceLink { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,12 +19,13 @@ \*/ package org.ourproject.kune.workspace.client.sitebar.sitepublic; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.AbstractToolbar; import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,15 +20,16 @@ package org.ourproject.kune.workspace.client.sitebar.sitepublic; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.ContentStatusDTO; -import org.ourproject.kune.platf.client.dto.GroupListDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.StateTokenUtils; -import org.ourproject.kune.platf.client.state.StateManager; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.ContentStatusDTO; +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; public class SitePublicSpaceLinkPresenter implements SitePublicSpaceLink { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.sitebar.sitesearch; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.workspace.client.search.SiteSearcher; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; public class SiteSearchPresenter implements SiteSearch { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ \*/ package org.ourproject.kune.workspace.client.sitebar.sitesign; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.SiteToken; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.google.gwt.user.client.ui.Hyperlink; public class SiteSignInLinkPanel implements SiteSignInLinkView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.sitebar.sitesign; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLink.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,7 @@ \*/ package org.ourproject.kune.workspace.client.sitebar.sitesign; -import org.ourproject.kune.platf.client.actions.BeforeActionListener; +import cc.kune.core.client.actions.BeforeActionListener; public interface SiteSignOutLink { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ \*/ package org.ourproject.kune.workspace.client.sitebar.sitesign; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.Label; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,17 +22,18 @@ import java.util.Date; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.actions.BeforeActionCollection; -import org.ourproject.kune.platf.client.actions.BeforeActionListener; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.errors.UIException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; -import org.ourproject.kune.platf.client.services.ErrorHandler; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.actions.BeforeActionCollection; +import cc.kune.core.client.actions.BeforeActionListener; +import cc.kune.core.client.errors.ErrorHandler; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.errors.UIException; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.client.rpcservices.UserServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserOptionsPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -31,14 +31,15 @@ import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.img.ImgResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserInfoDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,13 +26,14 @@ import org.ourproject.kune.platf.client.actions.MenuItemsContainer; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.AbstractToolbar; import org.ourproject.kune.platf.client.ui.BasicThumb; import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -29,26 +29,27 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.UserBuddiesDataDTO; -import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; -import org.ourproject.kune.platf.client.rpc.UserServiceAsync; import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbar; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +import cc.kune.core.client.rpcservices.UserServiceAsync; +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.dto.AccessRolDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.UserBuddiesDataDTO; +import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.actions.ActionItemCollection; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + public interface BuddiesSummaryView extends View { String NOAVATAR = ""; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + /** * The Class GroupActionRegistry stores actions over groups (mainly used in SN) */ Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummary.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ */ package org.ourproject.kune.workspace.client.socialnet; -import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.ui.MenuItem; +import cc.kune.core.shared.dto.GroupDTO; + public interface GroupMembersSummary { void addGroupOperation(MenuItem<GroupDTO> operation, boolean mustBeLogged); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,9 +22,6 @@ import org.ourproject.kune.platf.client.PlatfMessages; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.ui.AbstractToolbar; import org.ourproject.kune.platf.client.ui.gridmenu.GridDragConfiguration; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; @@ -32,6 +29,10 @@ import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; +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; import com.google.gwt.core.client.Scheduler; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -26,27 +26,8 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; import org.ourproject.kune.platf.client.actions.RadioMustBeChecked; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.AccessListsDTO; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.AdmissionTypeDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; import org.ourproject.kune.platf.client.services.ImageDescriptor; import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.MenuItem; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; @@ -55,6 +36,26 @@ import org.ourproject.kune.workspace.client.search.GroupLiveSearcher; import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbar; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.GroupServiceAsync; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +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.AccessListsDTO; +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AdmissionTypeDTO; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.dto.SocialNetworkDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; +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; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,9 +19,10 @@ \*/ package org.ourproject.kune.workspace.client.socialnet; -import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; +import cc.kune.core.shared.dto.GroupDTO; + public interface GroupMembersSummaryView { void addItem(GridItem<GroupDTO> gridItem); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipateAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,17 +1,18 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +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.AccessRolDTO; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; public class ParticipateAction extends RolAction { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,15 +21,16 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPanel; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.AbstractToolbar; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel; import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +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; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.BoxComponent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,21 +21,22 @@ import java.util.List; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.ParticipationDataDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; import org.ourproject.kune.platf.client.services.ImageUtils; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.gridmenu.GridGroup; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionParticipationToolbar; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +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.dto.GroupDTO; +import cc.kune.core.shared.dto.ParticipationDataDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryView.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,9 +20,10 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.ui.gridmenu.GridItem; +import cc.kune.core.shared.dto.GroupDTO; + public interface ParticipationSummaryView extends View { void addItem(GridItem<GroupDTO> createGridItem); 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -2,13 +2,14 @@ import org.ourproject.kune.platf.client.actions.AbstractExtendedAction; import org.ourproject.kune.platf.client.actions.ui.GuiActionDescrip; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; +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.dto.AccessRolDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener2; import com.google.gwt.resources.client.ImageResource; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/RolComparator.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,7 +1,7 @@ package org.ourproject.kune.workspace.client.socialnet; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.AccessRolDTO; public final class RolComparator { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -25,16 +25,6 @@ import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.MenuItem; import org.ourproject.kune.platf.client.ui.MenuItemCollection; import org.ourproject.kune.platf.client.ui.download.FileConstants; @@ -45,6 +35,17 @@ import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +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.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; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UnjoinAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,18 +1,19 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.actions.ActionEvent; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.SocialNetworkServiceAsync; -import org.ourproject.kune.platf.client.state.AccessRightsClientManager; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.SocialNetworkServiceAsync; +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.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; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/UserActionRegistry.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.socialnet; import org.ourproject.kune.platf.client.actions.ActionRegistry; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + /** * The Class UserActionRegistry. * Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -8,15 +8,16 @@ import org.ourproject.kune.platf.client.actions.PropertyChangeEvent; import org.ourproject.kune.platf.client.actions.PropertyChangeListener; import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.img.ImgConstants; import org.ourproject.kune.platf.client.ui.img.ImgResources; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbar.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.socialnet.toolbar; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + public interface ActionBuddiesSummaryToolbar extends ActionToolbar<UserSimpleDTO> { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionBuddiesSummaryToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + public class ActionBuddiesSummaryToolbarPresenter extends ActionToolbarPresenter<UserSimpleDTO> implements ActionBuddiesSummaryToolbar { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbar.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.socialnet.toolbar; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionGroupSummaryToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationSummaryToolbarPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -21,8 +21,9 @@ import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarPresenter; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbarView; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/toolbar/ActionParticipationToolbar.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,8 +20,9 @@ package org.ourproject.kune.workspace.client.socialnet.toolbar; import org.ourproject.kune.platf.client.actions.toolbar.ActionToolbar; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public interface ActionParticipationToolbar extends ActionToolbar<StateToken> { } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummary.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.workspace.client.tags; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; +import cc.kune.core.shared.dto.TagCloudResultDTO; public interface TagsSummary { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.workspace.client.tags; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.KuneUiUtils; import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.FlowPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,15 +20,16 @@ package org.ourproject.kune.workspace.client.tags; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; -import org.ourproject.kune.platf.client.dto.TagCountDTO; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.search.SiteSearcher; import org.ourproject.kune.workspace.client.search.SiteSearcherType; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.TagCloudResultDTO; +import cc.kune.core.shared.dto.TagCountDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,7 +1,8 @@ package org.ourproject.kune.workspace.client.themes; -import org.ourproject.kune.platf.client.dto.StateToken; +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/themes/WsBackManagerImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsBackManagerImpl.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.workspace.client.themes; import org.cobogw.gwt.user.client.CSS; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeManager.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,16 +19,17 @@ \*/ package org.ourproject.kune.workspace.client.themes; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.GroupServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.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; import com.calclab.suco.client.events.Listener2; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeSelectorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -8,10 +8,11 @@ import org.ourproject.kune.platf.client.actions.ui.CssStyleDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuDescriptor; import org.ourproject.kune.platf.client.actions.ui.MenuItemDescriptor; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,13 +22,14 @@ import java.util.Date; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; import org.ourproject.kune.platf.client.registry.AuthorableRegistry; -import org.ourproject.kune.platf.client.state.StateManager; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + import com.calclab.suco.client.events.Listener; public class EntitySubTitlePresenter implements EntitySubTitle { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,15 +20,16 @@ package org.ourproject.kune.workspace.client.title; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.registry.RenamableRegistry; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,15 +19,16 @@ */ package org.ourproject.kune.workspace.client.title; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.NameInUseException; -import org.ourproject.kune.platf.client.errors.NameNotPermittedException; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.errors.NameInUseException; +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.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Event2; import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/FoldableAbstractClientTool.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ */ package org.ourproject.kune.workspace.client.tool; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import cc.kune.core.shared.dto.BasicMimeTypeDTO; + public abstract class FoldableAbstractClientTool extends AbstractClientTool { public static final String UPLOADEDFILE_SUFFIX = "uploaded"; public static final String WAVE_SUFFIX = "wave"; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorItemPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -20,10 +20,11 @@ package org.ourproject.kune.workspace.client.tool; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.events.Listener2; public class ToolSelectorItemPresenter implements ToolSelectorItem { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -22,11 +22,12 @@ import java.util.HashMap; import java.util.List; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.errors.UIException; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import cc.kune.core.client.errors.UIException; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateAbstractDTO; + import com.allen_sauer.gwt.log.client.Log; import com.calclab.suco.client.events.Listener; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploader.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,8 +19,9 @@ \*/ package org.ourproject.kune.workspace.client.upload; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.events.Listener; public interface FileUploader { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,11 +19,12 @@ \*/ package org.ourproject.kune.workspace.client.upload; -import org.ourproject.kune.platf.client.i18n.I18nUITranslationService; -import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.utils.TextUtils; + import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -19,10 +19,11 @@ \*/ package org.ourproject.kune.workspace.client.upload; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.tool.FoldableAbstractClientTool; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.events.Event; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsert.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,6 +1,6 @@ package org.ourproject.kune.workspace.client.wave; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; public interface WaveInsert { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,9 +1,10 @@ package org.ourproject.kune.workspace.client.wave; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.client.ui.img.ImgConstants; import org.ourproject.kune.platf.client.ui.img.ImgResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; import com.google.gwt.core.client.Scheduler; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPresenter.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -2,15 +2,16 @@ import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.platf.client.View; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import org.ourproject.kune.platf.client.rpc.ContentServiceAsync; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +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.dto.StateContentDTO; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.ioc.Provider; public class WaveInsertPresenter implements WaveInsert { Modified: trunk/src/main/resources/dozerBeanMapping.xml =================================================================== --- trunk/src/main/resources/dozerBeanMapping.xml 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/main/resources/dozerBeanMapping.xml 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,69 +7,44 @@ <date-format>dd/mm/yyyy</date-format> <wildcard>true</wildcard> </configuration> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.InitDataDTO - </class-a> + <class-a> cc.kune.core.shared.dto.InitDataDTO </class-a> <class-b>org.ourproject.kune.platf.server.InitData</class-b> <field> <a>licenses</a> <b>licenses</b> - <a-hint> - org.ourproject.kune.platf.client.dto.LicenseDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.License - </b-hint> + <a-hint> cc.kune.core.shared.dto.LicenseDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.License </b-hint> </field> <field> <a>languages</a> <b>languages</b> - <a-hint> - org.ourproject.kune.platf.client.dto.I18nLanguageSimpleDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.I18nLanguage - </b-hint> + <a-hint> cc.kune.core.shared.dto.I18nLanguageSimpleDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.I18nLanguage </b-hint> </field> <field> <a>countries</a> <b>countries</b> - <a-hint> - org.ourproject.kune.platf.client.dto.I18nCountryDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.I18nCountry - </b-hint> + <a-hint> cc.kune.core.shared.dto.I18nCountryDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.I18nCountry </b-hint> </field> </mapping> - <mapping> <class-a>org.ourproject.kune.platf.server.domain.Group</class-a> - <class-b>org.ourproject.kune.platf.client.dto.GroupDTO</class-b> + <class-b>cc.kune.core.shared.dto.GroupDTO</class-b> <field type="one-way"> <a>hasLogo</a> <b>hasLogo</b> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.GroupListDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.GroupList - </class-b> + <class-a> cc.kune.core.shared.dto.GroupListDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.GroupList </class-b> <field> <a>list</a> <b>list</b> - <a-hint> - org.ourproject.kune.platf.client.dto.GroupDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.Group - </b-hint> + <a-hint> cc.kune.core.shared.dto.GroupDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.Group </b-hint> </field> <field custom-converter="org.ourproject.kune.platf.server.mapper.GroupListModeConverter"> @@ -77,141 +52,83 @@ <b>mode</b> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.AccessListsDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.AccessLists - </class-b> + <class-a> cc.kune.core.shared.dto.AccessListsDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.AccessLists </class-b> <field> <a>admins</a> <b>admins</b> - <a-hint> - org.ourproject.kune.platf.client.dto.GroupListDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.GroupList - </b-hint> + <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint> </field> <field> <a>editors</a> <b>editors</b> - <a-hint> - org.ourproject.kune.platf.client.dto.GroupListDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.GroupList - </b-hint> + <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint> </field> <field> <a>viewers</a> <b>viewers</b> - <a-hint> - org.ourproject.kune.platf.client.dto.GroupListDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.GroupList - </b-hint> + <a-hint> cc.kune.core.shared.dto.GroupListDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.GroupList </b-hint> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.AccessRightsDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.access.AccessRights - </class-b> + <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>org.ourproject.kune.platf.client.dto.StateContentDTO</class-a> + <class-a>cc.kune.core.shared.dto.StateContentDTO</class-a> <class-b>org.ourproject.kune.platf.server.state.StateContent</class-b> <field> <a>authors</a> <b>authors</b> - <a-hint> - org.ourproject.kune.platf.client.dto.UserSimpleDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.User - </b-hint> + <a-hint> cc.kune.core.shared.dto.UserSimpleDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.User </b-hint> </field> </mapping> - - <mapping> - <class-a>org.ourproject.kune.platf.client.dto.StateContainerDTO</class-a> + <mapping> + <class-a>cc.kune.core.shared.dto.StateContainerDTO</class-a> <class-b>org.ourproject.kune.platf.server.state.StateContainer</class-b> - <field> + <field> <a>tagCloudResult</a> <b>tagCloudResult</b> - <a-hint> - org.ourproject.kune.platf.client.dto.TagCloudResultDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.TagCloudResult - </b-hint> + <a-hint> cc.kune.core.shared.dto.TagCloudResultDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.TagCloudResult </b-hint> </field> </mapping> - <mapping> - <class-a>org.ourproject.kune.platf.client.dto.StateAbstractDTO</class-a> + <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> - org.ourproject.kune.platf.client.dto.StateToken - </class-a> - <class-b> - org.ourproject.kune.platf.client.dto.StateToken - </class-b> + <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> - org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.BasicMimeType - </class-b> + <class-a> cc.kune.core.shared.dto.BasicMimeTypeDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.BasicMimeType </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.LicenseDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.License - </class-b> + <class-a> cc.kune.core.shared.dto.LicenseDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.License </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ContainerSimpleDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.Container - </class-b> + <class-a> cc.kune.core.shared.dto.ContainerSimpleDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.Container </class-b> <field> <a get-method="getStateToken">stateToken</a> <b>stateToken</b> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ContentSimpleDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.Content - </class-b> + <class-a> cc.kune.core.shared.dto.ContentSimpleDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.Content </class-b> <field> <a>title</a> <b>lastRevision.title</b> @@ -221,12 +138,9 @@ <b>stateToken</b> </field> </mapping> - <mapping type="one-way"> - <class-a> - org.ourproject.kune.platf.server.domain.Content - </class-a> - <class-b>org.ourproject.kune.platf.client.dto.LinkDTO</class-b> + <class-a> org.ourproject.kune.platf.server.domain.Content </class-a> + <class-b>cc.kune.core.shared.dto.LinkDTO</class-b> <field> <a>lastRevision.title</a> <b>longName</b> @@ -240,102 +154,57 @@ <b>link</b> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ContainerDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.Container - </class-b> + <class-a> cc.kune.core.shared.dto.ContainerDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.Container </class-b> <field> <a>contents</a> <b>contents</b> - <a-hint> - org.ourproject.kune.platf.client.dto.ContentSimpleDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.Content - </b-hint> + <a-hint> cc.kune.core.shared.dto.ContentSimpleDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.Content </b-hint> </field> - <field> <a>absolutePath</a> <b>absolutePath</b> - <a-hint> - org.ourproject.kune.platf.client.dto.ContainerSimpleDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.Container - </b-hint> + <a-hint> cc.kune.core.shared.dto.ContainerSimpleDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.Container </b-hint> </field> - <field> <a>childs</a> <b>childs</b> - <a-hint> - org.ourproject.kune.platf.client.dto.ContainerSimpleDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.Container - </b-hint> + <a-hint> cc.kune.core.shared.dto.ContainerSimpleDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.Container </b-hint> </field> - <field> <a get-method="getStateToken">stateToken</a> <b>stateToken</b> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.UserInfoDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.users.UserInfo - </class-b> + <class-a> cc.kune.core.shared.dto.UserInfoDTO </class-a> + <class-b> org.ourproject.kune.platf.server.users.UserInfo </class-b> <field> <a>user</a> <b>user</b> - <a-hint> - org.ourproject.kune.platf.client.dto.UserSimpleDTO - </a-hint> - <b-hint> - org.ourproject.kune.platf.server.domain.User - </b-hint> + <a-hint> cc.kune.core.shared.dto.UserSimpleDTO </a-hint> + <b-hint> org.ourproject.kune.platf.server.domain.User </b-hint> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ParticipationDataDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.sn.ParticipationData - </class-b> + <class-a> cc.kune.core.shared.dto.ParticipationDataDTO </class-a> + <class-b> org.ourproject.kune.platf.server.sn.ParticipationData </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.I18nLanguageDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.I18nLanguage - </class-b> + <class-a> cc.kune.core.shared.dto.I18nLanguageDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.I18nLanguage </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.I18nCountryDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.I18nCountry - </class-b> + <class-a> cc.kune.core.shared.dto.I18nCountryDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.I18nCountry </class-b> </mapping> - <mapping> <class-a>org.ourproject.kune.platf.server.domain.User</class-a> - <class-b>org.ourproject.kune.platf.client.dto.UserSimpleDTO</class-b> + <class-b>cc.kune.core.shared.dto.UserSimpleDTO</class-b> <field type="one-way"> <a>hasLogo</a> <b>hasLogo</b> @@ -345,177 +214,94 @@ <b>stateToken</b> </field> </mapping> - <mapping> - <class-a>org.ourproject.kune.platf.client.dto.TagDTO</class-a> + <class-a>cc.kune.core.shared.dto.TagDTO</class-a> <class-b>org.ourproject.kune.platf.server.domain.Tag</class-b> </mapping> - -<mapping> - <class-a> - org.ourproject.kune.platf.client.dto.TagCloudResultDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.TagCloudResult - </class-b> + <mapping> + <class-a> cc.kune.core.shared.dto.TagCloudResultDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.TagCloudResult </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.TagCountDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.TagCount - </class-b> + <class-a> cc.kune.core.shared.dto.TagCountDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.TagCount </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.RateResultDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.RateResult - </class-b> + <class-a> cc.kune.core.shared.dto.RateResultDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.RateResult </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.server.domain.Comment - </class-a> - <class-b> - org.ourproject.kune.platf.client.dto.CommentDTO - </class-b> + <class-a> org.ourproject.kune.platf.server.domain.Comment </class-a> + <class-b> cc.kune.core.shared.dto.CommentDTO </class-b> <field> <a>author</a> <b>author</b> - <a-hint> - org.ourproject.kune.platf.server.domain.User - </a-hint> - <b-hint> - org.ourproject.kune.platf.client.dto.UserSimpleDTO - </b-hint> + <a-hint> org.ourproject.kune.platf.server.domain.User </a-hint> + <b-hint> cc.kune.core.shared.dto.UserSimpleDTO </b-hint> </field> - <field> <a>childs</a> <b>childs</b> - <a-hint> - org.ourproject.kune.platf.server.domain.Comment - </a-hint> - <b-hint> - org.ourproject.kune.platf.client.dto.CommentDTO - </b-hint> + <a-hint> org.ourproject.kune.platf.server.domain.Comment </a-hint> + <b-hint> cc.kune.core.shared.dto.CommentDTO </b-hint> </field> - <field type="one-way"> - <a get-method="getPositiveVotersCount"> - positiveVotersCount - </a> + <a get-method="getPositiveVotersCount"> positiveVotersCount </a> <b>positiveVotersCount</b> </field> - <field type="one-way"> - <a get-method="getNegativeVotersCount"> - negativeVotersCount - </a> + <a get-method="getNegativeVotersCount"> negativeVotersCount </a> <b>negativeVotersCount</b> </field> - <field type="one-way"> - <a get-method="getAbuseInformersCount"> - abuseInformersCount - </a> + <a get-method="getAbuseInformersCount"> abuseInformersCount </a> <b>abuseInformersCount</b> </field> </mapping> - <mapping> - <class-a>org.ourproject.kune.platf.client.dto.LinkDTO</class-a> + <class-a>cc.kune.core.shared.dto.LinkDTO</class-a> <class-b>org.ourproject.kune.platf.server.domain.User</class-b> <field> <a>longName</a> <b>name</b> </field> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ChatUserParamsDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.ChatUserParams - </class-b> + <class-a> cc.kune.core.shared.dto.ChatUserParamsDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.ChatUserParams </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO - </class-a> + <class-a> cc.kune.core.shared.dto.SocialNetworkVisibilityDTO </class-a> <class-b> - org.ourproject.kune.platf.server.domain.SocialNetworkVisibility - </class-b> + org.ourproject.kune.platf.server.domain.SocialNetworkVisibility </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.AdmissionTypeDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.AdmissionType - </class-b> + <class-a> cc.kune.core.shared.dto.AdmissionTypeDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.AdmissionType </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO - </class-a> + <class-a> cc.kune.core.shared.dto.UserBuddiesVisibilityDTO </class-a> <class-b> - org.ourproject.kune.platf.server.domain.UserBuddiesVisibility - </class-b> + org.ourproject.kune.platf.server.domain.UserBuddiesVisibility </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ContentStatusDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.ContentStatus - </class-b> + <class-a> cc.kune.core.shared.dto.ContentStatusDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.ContentStatus </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.AccessRolDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.access.AccessRol - </class-b> + <class-a> cc.kune.core.shared.dto.AccessRolDTO </class-a> + <class-b> org.ourproject.kune.platf.server.access.AccessRol </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.ToolSimpleDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.tool.ToolSimple - </class-b> + <class-a> cc.kune.core.shared.dto.ToolSimpleDTO </class-a> + <class-b> org.ourproject.kune.platf.server.tool.ToolSimple </class-b> </mapping> - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.UserBuddiesDataDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.sn.UserBuddiesData - </class-b> + <class-a> cc.kune.core.shared.dto.UserBuddiesDataDTO </class-a> + <class-b> org.ourproject.kune.platf.server.sn.UserBuddiesData </class-b> </mapping> - - <mapping> - <class-a> - org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO - </class-a> - <class-b> - org.ourproject.kune.platf.server.domain.SocialNetworkData - </class-b> + <mapping> + <class-a> cc.kune.core.shared.dto.SocialNetworkDataDTO </class-a> + <class-b> org.ourproject.kune.platf.server.domain.SocialNetworkData </class-b> </mapping> </mappings> \ No newline at end of file Copied: trunk/src/test/java/cc/kune/core/client/state (from rev 1158, trunk/src/test/java/org/ourproject/kune/platf/client/state) Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,17 +1,17 @@ -package org.ourproject.kune.platf.client.state; +package cc.kune.core.client.state; import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.actions.BeforeActionListener; -import org.ourproject.kune.platf.client.app.HistoryWrapper; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.workspace.client.site.SiteToken; +import cc.kune.core.client.actions.BeforeActionListener; +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; import com.calclab.suco.testing.events.MockedListener2; @@ -123,7 +123,7 @@ @SuppressWarnings("unchecked") @Test public void oneBeforeStateChangeListenerAddAndRemove() { - String newToken = confBeforeStateChangeListeners(false, false); + final String newToken = confBeforeStateChangeListeners(false, false); stateManager.onHistoryChanged(newToken); removeBeforeStateChangeListener(); stateManager.onHistoryChanged(newToken); @@ -133,7 +133,7 @@ @Test public void oneBeforeStateChangeListenerFalseAndResume() { - String token = confBeforeStateChangeListeners(false, true); + final String token = confBeforeStateChangeListeners(false, true); stateManager.onHistoryChanged(token); Mockito.verify(history, Mockito.never()).newItem(token); removeBeforeStateChangeListener(); @@ -179,23 +179,23 @@ @Test public void siteTokenTest() { - MockedListener0 siteTokenListener = new MockedListener0(); + final MockedListener0 siteTokenListener = new MockedListener0(); stateManager.addSiteToken("signin", siteTokenListener); stateManager.onHistoryChanged("signIn"); siteTokenListener.isCalledOnce(); } - private void changeState(String... tokens) { - for (String token : tokens) { + private void changeState(final String... tokens) { + for (final String token : tokens) { Mockito.when(state.getStateToken()).thenReturn(new StateToken(token)); stateManager.setState(state); } } - private String confBeforeStateChangeListeners(boolean value, boolean value2) { + private String confBeforeStateChangeListeners(final boolean value, final boolean value2) { stateManager.addBeforeStateChangeListener(beforeChangeListener1); stateManager.addBeforeStateChangeListener(beforeChangeListener2); - String newToken = "something"; + final String newToken = "something"; Mockito.when(beforeChangeListener1.beforeAction()).thenReturn(value); Mockito.when(beforeChangeListener2.beforeAction()).thenReturn(value2); return newToken; Modified: trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateTokenTest.java 2010-12-07 22:38:26 UTC (rev 1158) +++ trunk/src/test/java/cc/kune/core/client/state/StateTokenTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,12 +1,13 @@ -package org.ourproject.kune.platf.client.state; +package cc.kune.core.client.state; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.StateToken; +import cc.kune.core.shared.dto.StateToken; + public class StateTokenTest { @Test Modified: trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/blogs/server/BlogServerToolTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,9 +7,10 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; -import org.ourproject.kune.platf.client.errors.ContentNotPermittedException; +import cc.kune.core.client.errors.ContainerNotPermittedException; +import cc.kune.core.client.errors.ContentNotPermittedException; + public class BlogServerToolTest { // extends PersistenceTest { private BlogServerTool serverTool; Modified: trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/gallery/server/GalleryServerToolTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,8 +6,9 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.errors.ContainerNotPermittedException; +import cc.kune.core.client.errors.ContainerNotPermittedException; + public class GalleryServerToolTest { // extends PersistenceTest { private GalleryServerTool serverTool; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -5,11 +5,12 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.StateToken; + import com.calclab.suco.client.events.Listener; public class ActionRegistryTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ContentIconsRegistryTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,9 +4,10 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO; import org.ourproject.kune.workspace.client.cnt.ContentIconsRegistry; +import cc.kune.core.shared.dto.BasicMimeTypeDTO; + public class ContentIconsRegistryTest { private static final String CONTENT_TYPE_TEST = "somecontenttype"; Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/KeyStrokeTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -5,11 +5,12 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked; import org.ourproject.kune.platf.client.i18n.Resources; import org.ourproject.kune.platf.client.shortcuts.Keyboard; import org.ourproject.kune.platf.client.shortcuts.ShortcutDescriptor; +import cc.kune.core.client.i18n.I18nTranslationServiceMocked; + public class KeyStrokeTest { @Test Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ShortcutTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,9 +4,10 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked; import org.ourproject.kune.platf.client.i18n.Resources; +import cc.kune.core.client.i18n.I18nTranslationServiceMocked; + public class ShortcutTest { @Test public void altS() { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/dto/BasicMimeTypeDTOTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,6 +4,8 @@ import org.junit.Test; +import cc.kune.core.shared.dto.BasicMimeTypeDTO; + public class BasicMimeTypeDTOTest { @Test Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/KuneStringUtilsTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,6 +6,8 @@ import org.junit.Test; +import cc.kune.core.client.utils.TextUtils; + public class KuneStringUtilsTest { @Test Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,6 +4,8 @@ import org.junit.Test; +import cc.kune.core.client.utils.TextUtils; + public class TextUtilsTest { @Test public void matchDemoEmail() { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/dialogs/upload/FileUploaderPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,11 +7,12 @@ import org.junit.Test; import org.mockito.Mockito; import org.ourproject.kune.docs.client.DocumentClientTool; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.upload.FileUploaderPresenter; import org.ourproject.kune.workspace.client.upload.FileUploaderView; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.StateToken; + public class FileUploaderPresenterTest { private static final String SOMEUSER_HASH = "someuserHash"; Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/insertmedia/ExternalMediaDescriptorTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,8 +6,9 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.ExtMediaDescripDTO; +import cc.kune.core.shared.dto.ExtMediaDescripDTO; + public class ExternalMediaDescriptorTest { private ExtMediaDescripDTO ytmedia; Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/rte/saving/RTESavingEditorPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,14 +7,15 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.internal.verification.api.VerificationMode; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; -import org.ourproject.kune.platf.client.i18n.I18nTranslationServiceMocked; import org.ourproject.kune.platf.client.i18n.Resources; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.platf.client.ui.rte.img.RTEImgResources; import org.ourproject.kune.platf.client.utils.DeferredCommandWrapper; import org.ourproject.kune.platf.client.utils.TimerWrapper; +import cc.kune.core.client.i18n.I18nTranslationServiceMocked; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.calclab.suco.client.events.Listener0; import com.calclab.suco.testing.events.MockedListener; import com.calclab.suco.testing.events.MockedListener0; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/IntegrationTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,10 +1,11 @@ package org.ourproject.kune.platf.integration; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.rpc.UserService; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.properties.DatabaseProperties; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.UserService; + import com.google.inject.Inject; public abstract class IntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentCommentServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,12 +4,13 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.CommentDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.errors.DefaultException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.integration.IntegrationTestHelper; +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.dto.CommentDTO; +import cc.kune.core.shared.dto.StateContainerDTO; + public class ContentCommentServiceTest extends ContentServiceIntegrationTest { private StateContainerDTO defaultContent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceAddTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -9,18 +9,19 @@ import org.junit.Test; import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.ContainerDTO; -import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.wiki.server.WikiServerTool; +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.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 { private StateContentDTO defaultContent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceGetTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,14 +6,15 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateNoContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; import org.ourproject.kune.platf.integration.IntegrationTestHelper; +import cc.kune.core.client.errors.ContentNotFoundException; +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 { @Test 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceIntegrationTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,11 +1,12 @@ package org.ourproject.kune.platf.integration.content; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.rpc.ContentService; -import org.ourproject.kune.platf.client.rpc.UserService; import org.ourproject.kune.platf.integration.IntegrationTest; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; public abstract class ContentServiceIntegrationTest extends IntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceSaveTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,10 +4,11 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.StateContentDTO; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.TestDomainHelper; +import cc.kune.core.shared.dto.StateContentDTO; + public class ContentServiceSaveTest extends ContentServiceIntegrationTest { private StateContentDTO defaultContent; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -12,18 +12,19 @@ import org.junit.Test; import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.docs.server.DocumentServerTool; -import org.ourproject.kune.platf.client.dto.ContainerDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.StateAbstractDTO; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; -import org.ourproject.kune.platf.client.dto.TagCountDTO; -import org.ourproject.kune.platf.client.dto.UserSimpleDTO; -import org.ourproject.kune.platf.client.errors.AccessViolationException; import org.ourproject.kune.platf.integration.IntegrationTestHelper; +import cc.kune.core.client.errors.AccessViolationException; +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.TagCloudResultDTO; +import cc.kune.core.shared.dto.TagCountDTO; +import cc.kune.core.shared.dto.UserSimpleDTO; + public class ContentServiceVariousTest extends ContentServiceIntegrationTest { private StateContentDTO defaultContent; Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/kuneservice/GroupServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,17 +4,18 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; -import org.ourproject.kune.platf.client.rpc.GroupService; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.domain.AdmissionType; import org.ourproject.kune.platf.server.domain.Group; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.client.rpcservices.GroupService; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.core.shared.dto.LicenseDTO; + import com.google.inject.Inject; public class GroupServiceTest extends IntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/SiteServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -8,15 +8,16 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.InitDataDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.rpc.SiteService; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.UserSession; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.manager.I18nLanguageManager; +import cc.kune.core.client.rpcservices.SiteService; +import cc.kune.core.shared.dto.InitDataDTO; +import cc.kune.core.shared.dto.LicenseDTO; + import com.google.inject.Inject; public class SiteServiceTest extends IntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/site/UserServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -1,23 +1,11 @@ package org.ourproject.kune.platf.integration.site; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.Assert.*; import java.util.List; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.I18nCountryDTO; -import org.ourproject.kune.platf.client.dto.I18nLanguageDTO; -import org.ourproject.kune.platf.client.dto.TimeZoneDTO; -import org.ourproject.kune.platf.client.dto.UserDTO; -import org.ourproject.kune.platf.client.dto.UserInfoDTO; -import org.ourproject.kune.platf.client.errors.EmailAddressInUseException; -import org.ourproject.kune.platf.client.errors.GroupNameInUseException; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.rpc.UserService; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.domain.Group; @@ -27,7 +15,18 @@ import org.ourproject.kune.platf.server.users.UserInfo; import org.ourproject.kune.platf.server.users.UserInfoService; -import com.calclab.emiteuimodule.client.SubscriptionMode; +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.rpcservices.UserService; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.I18nCountryDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.SubscriptionMode; +import cc.kune.core.shared.dto.TimeZoneDTO; +import cc.kune.core.shared.dto.UserDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + import com.google.inject.Inject; public class UserServiceTest extends IntegrationTest { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/socialnet/SocialNetworkServiceTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,15 +4,16 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.AlreadyUserMemberException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; -import org.ourproject.kune.platf.client.rpc.SocialNetworkService; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.UserSession; +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.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; public class SocialNetworkServiceTest extends IntegrationTest { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/access/FinderTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,8 +6,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.platf.server.content.CommentManager; import org.ourproject.kune.platf.server.content.ContainerManager; @@ -19,6 +17,9 @@ import org.ourproject.kune.platf.server.manager.GroupManager; import org.ourproject.kune.platf.server.manager.RateManager; +import cc.kune.core.client.errors.ContentNotFoundException; +import cc.kune.core.shared.dto.StateToken; + public class FinderTest { private GroupManager groupManager; Modified: trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthenticatedMethodInterceptorTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,11 +6,12 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.integration.IntegrationTest; import org.ourproject.kune.platf.integration.IntegrationTestHelper; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.errors.UserMustBeLoggedException; + public class AuthenticatedMethodInterceptorTest extends IntegrationTest { private AuthenticatedMethodInterceptor auth; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/auth/AuthorizatedMethodInterceptorTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -6,13 +6,14 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.ContentNotFoundException; 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 com.wideplay.warp.persist.Transactional; public class AuthorizatedMethodInterceptorTest extends IntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/GroupManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,10 +7,6 @@ import org.apache.lucene.queryParser.ParseException; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.errors.EmailAddressInUseException; -import org.ourproject.kune.platf.client.errors.GroupNameInUseException; -import org.ourproject.kune.platf.client.errors.I18nNotFoundException; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.Group; @@ -18,6 +14,11 @@ import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.client.errors.EmailAddressInUseException; +import cc.kune.core.client.errors.GroupNameInUseException; +import cc.kune.core.client.errors.I18nNotFoundException; +import cc.kune.core.shared.dto.GroupType; + public class GroupManagerTest extends PersistencePreLoadedDataTest { @Test Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/I18nManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -9,12 +9,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.i18n.I18nTranslationService; import org.ourproject.kune.platf.server.PersistenceTest; import org.ourproject.kune.platf.server.domain.I18nCountry; import org.ourproject.kune.platf.server.domain.I18nLanguage; import org.ourproject.kune.platf.server.domain.I18nTranslation; +import cc.kune.core.shared.i18n.I18nTranslationService; + import com.google.inject.Inject; public class I18nManagerTest extends PersistenceTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/UserManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -11,12 +11,13 @@ import org.apache.lucene.queryParser.ParseException; import org.hibernate.validator.InvalidStateException; import org.junit.Test; -import org.ourproject.kune.platf.client.errors.I18nNotFoundException; import org.ourproject.kune.platf.server.PersistencePreLoadedDataTest; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.User; import org.ourproject.kune.platf.server.manager.impl.SearchResult; +import cc.kune.core.client.errors.I18nNotFoundException; + import com.google.inject.Inject; public class UserManagerTest extends PersistencePreLoadedDataTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/EntityLogoUploadManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,12 +7,13 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.errors.UserMustBeLoggedException; +import cc.kune.core.shared.dto.StateContainerDTO; + import com.google.inject.Inject; public class EntityLogoUploadManagerTest extends ContentServiceIntegrationTest { 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -11,13 +11,14 @@ import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.ui.download.ImageSize; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.server.domain.BasicMimeType; import org.ourproject.kune.platf.server.domain.Content; import org.ourproject.kune.platf.server.properties.KuneProperties; +import cc.kune.core.shared.dto.StateToken; + import com.google.inject.Inject; public class FileDownloadManagerTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -2,11 +2,12 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.errors.SessionExpiredException; -import org.ourproject.kune.platf.client.errors.UserMustBeLoggedException; import org.ourproject.kune.platf.integration.IntegrationTestHelper; import org.ourproject.kune.platf.integration.content.ContentServiceIntegrationTest; +import cc.kune.core.client.errors.SessionExpiredException; +import cc.kune.core.client.errors.UserMustBeLoggedException; + import com.google.inject.Inject; public class FileUploadManagerTest extends ContentServiceIntegrationTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/manager/impl/SocialNetworkManagerTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -7,11 +7,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.errors.AccessViolationException; -import org.ourproject.kune.platf.client.errors.AlreadyGroupMemberException; -import org.ourproject.kune.platf.client.errors.LastAdminInGroupException; import org.ourproject.kune.platf.server.PersistenceTest; import org.ourproject.kune.platf.server.domain.AdmissionType; import org.ourproject.kune.platf.server.domain.Group; @@ -20,6 +15,12 @@ import org.ourproject.kune.platf.server.sn.ParticipationData; import org.ourproject.kune.testhelper.ctx.DomainContext; +import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.AlreadyGroupMemberException; +import cc.kune.core.client.errors.LastAdminInGroupException; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.core.shared.dto.SocialNetworkRequestResult; + import com.google.inject.Inject; import com.wideplay.warp.persist.Transactional; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/platf/server/mapper/MapperTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -10,19 +10,6 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.CommentDTO; -import org.ourproject.kune.platf.client.dto.ContainerDTO; -import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO; -import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.GroupListDTO; -import org.ourproject.kune.platf.client.dto.LicenseDTO; -import org.ourproject.kune.platf.client.dto.LinkDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; -import org.ourproject.kune.platf.client.dto.SocialNetworkVisibilityDTO; -import org.ourproject.kune.platf.client.dto.StateContentDTO; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.dto.UserBuddiesVisibilityDTO; import org.ourproject.kune.platf.server.TestDomainHelper; import org.ourproject.kune.platf.server.TestHelper; import org.ourproject.kune.platf.server.access.AccessRights; @@ -45,6 +32,20 @@ import org.ourproject.kune.platf.server.sn.UserBuddiesData; import org.ourproject.kune.platf.server.state.StateContent; +import cc.kune.core.shared.dto.CommentDTO; +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.GroupDTO; +import cc.kune.core.shared.dto.GroupListDTO; +import cc.kune.core.shared.dto.LicenseDTO; +import cc.kune.core.shared.dto.LinkDTO; +import cc.kune.core.shared.dto.SocialNetworkDataDTO; +import cc.kune.core.shared.dto.SocialNetworkVisibilityDTO; +import cc.kune.core.shared.dto.StateContentDTO; +import cc.kune.core.shared.dto.StateToken; +import cc.kune.core.shared.dto.UserBuddiesVisibilityDTO; + import com.google.inject.Inject; public class MapperTest { Modified: trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/testhelper/ctx/DomainContext.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.TimeZone; -import org.ourproject.kune.platf.client.dto.GroupType; import org.ourproject.kune.platf.server.domain.AccessLists; import org.ourproject.kune.platf.server.domain.Group; import org.ourproject.kune.platf.server.domain.I18nCountry; @@ -11,6 +10,8 @@ import org.ourproject.kune.platf.server.domain.SocialNetwork; import org.ourproject.kune.platf.server.domain.User; +import cc.kune.core.shared.dto.GroupType; + public class DomainContext { private final HashMap<String, User> users; private final HashMap<String, Group> groups; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -3,13 +3,14 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.dto.GroupDTO; -import org.ourproject.kune.platf.client.dto.GroupType; -import org.ourproject.kune.platf.client.dto.StateToken; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.themes.WsThemeManager; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.GroupType; +import cc.kune.core.shared.dto.StateToken; + public class EntityLogoPresenterTest { private StateManager stateManager; Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -3,12 +3,13 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFirstFormView; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardFrdFormView; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardSndFormView; import org.ourproject.kune.workspace.client.licensewizard.pages.LicenseWizardTrdFormView; +import cc.kune.core.client.state.Session; + public class LicenseWizardPresenterTest { private LicenseWizardView view; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolActionTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,9 +4,10 @@ import org.junit.Before; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + public class RolActionTest { private AccessRightsDTO adminRights; 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-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/socialnet/RolComparatorTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -4,9 +4,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.ourproject.kune.platf.client.dto.AccessRightsDTO; -import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import cc.kune.core.shared.dto.AccessRightsDTO; +import cc.kune.core.shared.dto.AccessRolDTO; + public class RolComparatorTest { @Test Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -5,13 +5,14 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.dto.StateContainerDTO; -import org.ourproject.kune.platf.client.dto.TagCloudResultDTO; -import org.ourproject.kune.platf.client.dto.TagCountDTO; -import org.ourproject.kune.platf.client.state.Session; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.search.SiteSearcher; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.TagCloudResultDTO; +import cc.kune.core.shared.dto.TagCountDTO; + import com.calclab.suco.client.ioc.Provider; public class TagsSummaryPresenterTest { Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java 2010-12-08 20:00:05 UTC (rev 1162) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/tool/ToolSelectorPresenterTest.java 2010-12-09 16:03:51 UTC (rev 1163) @@ -3,11 +3,12 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.themes.WsThemeManager; import org.ourproject.kune.workspace.client.tool.ToolSelectorItem; import org.ourproject.kune.workspace.client.tool.ToolSelectorPresenter; +import cc.kune.core.client.state.StateManager; + public class ToolSelectorPresenterTest { private static final String TOOL1_NAME = "tool1";

1 0

r1162 - in trunk: . script src/main/java/cc/kune/core src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/ws src/main/java/cc/kune/core/public
by Vicente J. Ruiz Jurado 08 Dec '10

08 Dec '10

Author: vjrj_ Date: 2010-12-08 21:00:05 +0100 (Wed, 08 Dec 2010) New Revision: 1162 Added: trunk/pom.xml.dic11 trunk/script/mvn-eclipse.sh trunk/src/main/java/cc/kune/core/public/ws.css Modified: trunk/TROUBLESHOOT trunk/pom.xml trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/CoreEventBus.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/client/ws/CoreView.java trunk/src/main/java/cc/kune/core/public/ws.html Log: CLOSED - # 6: Common Actions integration http://kune.ourproject.org/issues/ticket/6 CLOSED - # 4: Gwt 2.1.0 and mvn cleanup http://kune.ourproject.org/issues/ticket/4 Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/TROUBLESHOOT 2010-12-08 20:00:05 UTC (rev 1162) @@ -59,6 +59,13 @@ If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. -=== Eclipse === +=== Eclipse & GWT === If you have some tests with error like "can not be found in source packages. Check the inheritance chain from your module; it may not be inheriting a required module or a module may not be adding its source path entries properly" and you have installed GWTDesigner, uncheck "client classpath": http://code.google.com/webtoolkit/tools/gwtdesigner/preferences/gwt/prefere… + + Error: Invalid version number "2.0" passed to external.gwtOnLoad(), expected "2.1"; your hosted mode bootstrap file may be out of date; if you are using -noserver try recompiling and redeploying your app + Fix: clear your browser cache + + Error: method should override method xxx (or similar) + Fix: Project --> Properties --> Java Compiler ---> Unenable project specific settings + Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/pom.xml 2010-12-08 20:00:05 UTC (rev 1162) @@ -18,6 +18,18 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </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>  <dependency> <groupId>com.google.code.guice</groupId> @@ -35,18 +47,6 @@ <version>2.0.1</version> </dependency> <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> - <dependency> <groupId>com.googlecode.mvp4g</groupId> <artifactId>mvp4g</artifactId> <version>1.2.0</version> @@ -56,13 +56,30 @@ <artifactId>mvc4g</artifactId> <version>1.0.0-jboss</version> </dependency> -  <dependency> - <groupId>org.cobogw</groupId> - <artifactId>gwt</artifactId> - <version>1.2.2</version> + <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>org.ourproject.kune.ws.armor</groupId> + <artifactId>ws-armor</artifactId> + <version>0.0.4</version> + </dependency> +  + <dependency> <groupId>com.gwtext</groupId> <artifactId>gwtext</artifactId> <version>2.0.5</version> @@ -82,11 +99,6 @@ <artifactId>gwt-voices</artifactId> <version>1.6.0</version> </dependency> - <dependency> - <groupId>org.ourproject.kune.ws.armor</groupId> - <artifactId>ws-armor</artifactId> - <version>0.0.3</version> - </dependency>  <dependency> <groupId>log4j</groupId> @@ -470,6 +482,21 @@ <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>dyndns-repo</id> @@ -589,8 +616,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> -  - <version>2.1.0</version> + <version>2.1.0-1</version> <executions> <execution> <configuration> @@ -842,4 +868,4 @@ </dependencies> </profile> </profiles> -</project> \ No newline at end of file +</project> Added: trunk/pom.xml.dic11 =================================================================== --- trunk/pom.xml.dic11 (rev 0) +++ trunk/pom.xml.dic11 2010-12-08 20:00:05 UTC (rev 1162) @@ -0,0 +1,894 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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>org.ourproject</groupId> + <artifactId>kune</artifactId> + <packaging>jar</packaging> + <version>0.0.6</version> + <description> + kune free/open/libre collaboration platform + </description> + <name>kune</name> + <url>http://kune.ourproject.org</url> + <properties> +  +  + <gwtVersion>2.1.0</gwtVersion> +  + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencies> +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0.1</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice-servlet</artifactId> + <version>2.0.1</version> + </dependency> +  + <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> + <type>jar</type> + <scope>provided</scope> + </dependency> +  + <dependency> + <groupId>org.cobogw</groupId> + <artifactId>gwt</artifactId> + <version>1.2.2</version> + </dependency> + <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> +  + <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> + <scope>compile</scope> + <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> +  +  +  + </dependency> +  + <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> +  + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + </dependency> +  + <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>3.1.0.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-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>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.2</version> + </dependency> +  + <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> +  + <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> +  + <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> +  + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>6.1.11</version> +  + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <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> +  + <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.7</version> + <scope>test</scope> + </dependency> +  +  +  +  +  +  +  + <dependency> + <groupId>org.jruby.rack</groupId> + <artifactId>jruby-rack</artifactId> + <version>0.9.4</version> + </dependency> +  + <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> +  + <pluginRepository> + <id>Codehaus Snapshots</id> + <url>http://snapshots.repository.codehaus.org/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled>  + </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>repository.jboss.org</id> + <name>JBoss Maven Repository</name> + <url>http://repository.jboss.org/maven2</url> + <layout>default</layout> + </repository> + <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>gwtext</id> + <url>http://www.gwt-ext.com/maven2/</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(a)gmail.com</email> + </developer> + <developer> + <name>Samer Hassan</name> + <email>samer2004(a)gmail.com</email> + </developer> + <developer> + <name>Vicente J. Ruiz Jurado</name> + <email>vjrj(a)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> +  + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> +  + <version>2.1.0</version> + <executions> + <execution> + <id>test</id> + <goals> + <goal>test</goal> +  +  + </goals> + </execution> + <execution> + <id>gwtcompile</id><phase>prepare-package</phase> + <goals> + <goal>compile</goal> +  + <goal>resources</goal> + </goals> + </execution> + <execution> + <configuration> + <inplace>true</inplace> +  + <soyc>false</soyc> + <style>OBF</style> + <localWorkers>2</localWorkers> + <copyWebapp>true</copyWebapp> + </configuration> + <goals> +  + <goal>compile</goal> +  + <goal>resources</goal> + </goals> + </execution> + </executions> + <configuration> + <generateDirectory>${project.build.directory}/generated-sources/gwt</generateDirectory> + <gen>${project.build.directory}/generated</gen> + <productionMode>true</productionMode> +  + <logLevel>INFO</logLevel> + <style>OBF</style> + <localWorkers>2</localWorkers> +  + <hostedWebapp>${webappDirectory}</hostedWebapp> + <runTarget>org.ourproject.kune.app.Kune/ws.html?log_level=DEBUG</runTarget> + <gwt.module>org.ourproject.kune.app.Kune</gwt.module> +  + <inplace>true</inplace> + </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>${webappDirectory}</webappDirectory> + </configuration> + </plugin> + <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.7</version> + <configuration> + <downloadSources>true</downloadSources> + <downloadJavadocs>false</downloadJavadocs> + <wtpversion>2.0</wtpversion> + <additionalBuildcommands> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + </buildCommand> + </additionalBuildcommands> + <additionalProjectnatures> + <projectnature>org.eclipse.ajdt.ui.ajnature</projectnature> + <projectnature>com.google.gwt.eclipse.core.gwtNature</projectnature> + </additionalProjectnatures> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>javadoc-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + <configuration> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.2</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> +  +  + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.14</version> + <configuration> + <contextPath>/</contextPath> +  +  + <reload>manual</reload> + <scanIntervalSeconds>0</scanIntervalSeconds> +  +  +  + </configuration> + </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> +  + <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> +  + </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.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>pertest</forkMode> +  + <skip>true</skip> + </configuration> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> +  + </plugins> +  + + <outputDirectory>${project.build.directory}/${project.build.finalName}/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> +  + <id>m2eclipse</id> + <activation> + <property> + <name>!m2e.version</name> + </property> + </activation> +  + <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> Added: trunk/script/mvn-eclipse.sh =================================================================== --- trunk/script/mvn-eclipse.sh (rev 0) +++ trunk/script/mvn-eclipse.sh 2010-12-08 20:00:05 UTC (rev 1162) @@ -0,0 +1,3 @@ +mvn eclipse:eclipse +perl -p -i -e 's/<\/classpath>//g' .classpath +echo -en " <classpathentry kind=\"con\" path=\"com.google.gwt.eclipse.core.GWT_CONTAINER\"/>\n</classpath>" >> .classpath Property changes on: trunk/script/mvn-eclipse.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-08 20:00:05 UTC (rev 1162) @@ -1,15 +1,24 @@ <?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/…"> <module rename-to="ws"> - <inherits name="com.google.gwt.user.User" /> +   <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> <public path="public" /> +  + <inherits name="com.google.gwt.user.User" /> <inherits name='com.mvp4g.Mvp4gModule' /> <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> + <inherits name="org.ourproject.common.Common" /> + <inherits name="com.extjs.gxt.ui.GXT" /> +  + <stylesheet src="ws.css" /> + <stylesheet src="fontface/stylesheet.css" /> +  <entry-point class="cc.kune.core.client.KuneEntryPoint" /> +    <set-property name="user.agent" value="safari" /> Modified: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-08 20:00:05 UTC (rev 1162) @@ -1,5 +1,7 @@ package cc.kune.core.client; +import org.ourproject.common.client.CommonGinModule; + import cc.kune.core.client.ws.CorePresenter; import cc.kune.core.client.ws.CoreView; @@ -9,10 +11,16 @@ import com.mvp4g.client.annotation.Start; import com.mvp4g.client.event.EventBus; -@Events(startView = CoreView.class, ginModules = { CoreGinModule.class }) +/** + * The Kune Core EventBus. + */ +@Events(startView = CoreView.class, ginModules = { CoreGinModule.class, CommonGinModule.class }) @Debug public interface CoreEventBus extends EventBus { + /** + * 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-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-08 20:00:05 UTC (rev 1162) @@ -6,8 +6,16 @@ import com.google.gwt.inject.client.AbstractGinModule; import com.google.inject.Singleton; +/** + * The Class Core GinModule. + */ public class CoreGinModule extends AbstractGinModule { + /* + * (non-Javadoc) + * + * @see com.google.gwt.inject.client.AbstractGinModule#configure() + */ @Override protected void configure() { bind(IBody.class).to(Body.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-08 20:00:05 UTC (rev 1162) @@ -8,6 +8,11 @@ public class KuneEntryPoint implements EntryPoint { + /* + * (non-Javadoc) + * + * @see com.google.gwt.core.client.EntryPoint#onModuleLoad() + */ @Override public void onModuleLoad() { final Mvp4gModule module = (Mvp4gModule) GWT.create(Mvp4gModule.class); 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-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-08 20:00:05 UTC (rev 1162) @@ -6,11 +6,21 @@ import com.mvp4g.client.annotation.Presenter; import com.mvp4g.client.presenter.BasePresenter; +/** + * The Class CorePresenter. + */ @Presenter(view = CoreView.class) public class CorePresenter extends BasePresenter<ICoreView, CoreEventBus> { + + /** + * The Interface ICoreView. + */ public interface ICoreView { } + /** + * On start. + */ public void onStart() { } } Modified: trunk/src/main/java/cc/kune/core/client/ws/CoreView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreView.java 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreView.java 2010-12-08 20:00:05 UTC (rev 1162) @@ -7,13 +7,25 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.InlineLabel; import com.google.inject.Inject; +/** + * The Class CoreView is where the general armor of Kune it created/attached. + */ public class CoreView extends Composite implements ICoreView { + /** + * Instantiates a new core view. + * + * @param body + * the body + */ @Inject public CoreView(final Body body) { GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); initWidget(body); + body.getEntityHeader().add(new InlineLabel("Test - a, e, i, o, u")); + body.getDocHeader().add(new InlineLabel("doc title")); } } Added: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css (rev 0) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2010-12-08 20:00:05 UTC (rev 1162) @@ -0,0 +1,304 @@ +@CHARSET "UTF-8"; + +body { + background-color: white; + color: black; + font-family: 'Droid Sans', Arial; + font-size: small; + margin: 5px; +} + +body.fontface {font: 'Droid Sans', Arial;} + +a { + color: darkblue; +} + +a:visited { + color: darkblue; +} + +.gwt-DialogBox { + border: 2px solid #AAAAAA; + background-color: white; +} + +.gwt-DialogBox .Caption { + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; +} + +.gwt-MenuBar { + background-color: #C3D9FF; + cursor: default; +} + +.gwt-MenuItem { + font-size: 80%; + margin: 1px; + cursor: default; +} + +.gwt-MenuItem-selected { + background-color: #E8EEF7; +} + +.gwt-Tree { +} + +.gwt-Tree .gwt-TreeItem { + font-size: 80%; + cursor: default; +} + +.gwt-Tree .gwt-TreeItem-selected { + background-color: #C3D9FF; +} + +.gwt-StackPanel { + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; +} + +.gwt-StackPanel .gwt-StackPanelItem { + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; +} + +.gwt-StackPanel .gwt-StackPanelItem-selected { +} + +.gwt-TabPanel { + +} + +.gwt-TabPanelBottom { + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; +} + +.gwt-TabBar { + font-size: smaller; +} + +.gwt-TabBar .gwt-TabBarFirst { + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; +} + +.gwt-TabBar .gwt-TabBarRest { + border-bottom: 1px solid #87b3ff; + padding-right: 3px; +} + +.gwt-TabBar .gwt-TabBarItem { + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; +} + +.gwt-TabBar .gwt-TabBarItem-selected { + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; +} + +.gwt-PushButton-up { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-up-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-down { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-PushButton-down-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-up { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-up-hovering { + background-color: #C3D9FF; + padding: 2px; + border: 2px solid transparent; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-down { + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-ToggleButton-down-hovering { + background-color: #C3D9FF; + padding: 2px; + background-color: #E8F1FF; + border: 2px solid transparent; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + cursor: pointer; + cursor: hand; +} + +.gwt-RichTextArea { + border: 1px solid black; + background-color: white; +} + +.gwt-RichTextToolbar { + background-color: #C3D9FF; + padding: 2px; +} + +.gwt-RichTextToolbar .gwt-PushButton-up { + margin-right: 2px; + border: 1px solid #C3D9FF; +} + +.gwt-RichTextToolbar .gwt-PushButton-up-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); +} + +.gwt-RichTextToolbar .gwt-PushButton-down { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-PushButton-down-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-up { + margin-right: 2px; + border: 1px solid #C3D9FF; +} + +.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { + margin-right: 2px; + border: 1px solid #C3D9FF; + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-down { + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); +} + +.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { + margin-right: 2px; + background-color: #E8F1FF; + border: 1px solid #C3D9FF; + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); +} + +.gwt-HorizontalSplitPanel { + border: 8px solid #C3D9FF; +} + +.gwt-HorizontalSplitPanel .splitter { + background-color: #C3D9FF; + cursor: move; +} + +.gwt-HorizontalSplitPanel .left { + background-color: #E8EEF7; +} + +.gwt-VerticalSplitPanel { + border: 8px solid #C3D9FF; +} + +.gwt-VerticalSplitPanel .splitter { + background-color: #C3D9FF; + height: 8px; + cursor: move; +} + +.gwt-SuggestBoxPopup { + border: 2px solid #C3D9FF; +} + +.gwt-SuggestBoxPopup .item { + padding: 2px; +} + +.gwt-SuggestBoxPopup .item-selected { + background-color: #C3D9FF; + padding: 2px; +} + +.gwt-DisclosurePanel { + border: 2px solid #C3D9FF; +} + +.gwt-DisclosurePanel .header { + background-color: #e8eef7; + cursor: hand; +} + +.gwt-SplitLayoutPanel { } +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { background-color: white; background: none; } +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { } Property changes on: trunk/src/main/java/cc/kune/core/public/ws.css ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-08 19:58:37 UTC (rev 1161) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-08 20:00:05 UTC (rev 1162) @@ -6,6 +6,8 @@ <script type="text/javascript" language="javascript" src="/ws/ws.nocache.js"></script> </head> + +<link href='http://fonts.googleapis.com/css?family=Droid+Sans' rel='stylesheet' type='text/css'> <body> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe>

1 0

r1161 - in kune-ws-armor/trunk: . .settings src/org/ourproject/kune/ws/armor src/org/ourproject/kune/ws/armor/client src/org/ourproject/kune/ws/armor/client/resources target target/maven-archiver war war/WEB-INF/lib
by Vicente J. Ruiz Jurado 08 Dec '10

08 Dec '10

Author: vjrj_ Date: 2010-12-08 20:58:37 +0100 (Wed, 08 Dec 2010) New Revision: 1161 Added: kune-ws-armor/trunk/.settings/com.google.appengine.eclipse.core.prefs kune-ws-armor/trunk/.settings/org.eclipse.jdt.core.prefs kune-ws-armor/trunk/.settings/org.maven.ide.eclipse.prefs kune-ws-armor/trunk/pom.xml kune-ws-armor/trunk/target/ kune-ws-armor/trunk/target/kune-ws-armor-0.0.4.jar kune-ws-armor/trunk/target/kune-ws-armor-0.0.4/ kune-ws-armor/trunk/target/maven-archiver/ kune-ws-armor/trunk/target/maven-archiver/pom.properties Removed: kune-ws-armor/trunk/war/WEB-INF/lib/gwt-servlet.jar Modified: kune-ws-armor/trunk/.classpath kune-ws-armor/trunk/.project kune-ws-armor/trunk/.settings/com.google.gwt.eclipse.core.prefs kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java kune-ws-armor/trunk/war/WsArmor.css Log: NEW - # 6: Common Actions integration http://kune.ourproject.org/issues/ticket/6 CLOSED - # 5: Guin and MVC4p integration http://kune.ourproject.org/issues/ticket/5 Modified: kune-ws-armor/trunk/.classpath =================================================================== --- kune-ws-armor/trunk/.classpath 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/.classpath 2010-12-08 19:58:37 UTC (rev 1161) @@ -2,6 +2,17 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (3)"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.0/gwt-servlet-2.1.0.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.0/gwt-servlet-2.1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.0/gwt-user-2.1.0.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.0/gwt-user-2.1.0-sources.jar"/> + <classpathentry kind="lib" path="/home/vjrj/bin/eclipse64-hel/plugins/com.google.gwt.eclipse.sdkbundle.2.1.0_2.1.0.v201010280102/gwt-2.1.0/gwt-user.jar"> + <attributes> + <attribute name="javadoc_location" value="file:/home/vjrj/bin/eclipse64-hel/plugins/com.google.gwt.eclipse.sdkbundle.2.1.0_2.1.0.v201010280102/gwt-2.1.0/doc/javadoc/"/> + </attributes> + </classpathentry> + <classpathentry kind="lib" path="/home/vjrj/bin/eclipse64-hel/plugins/com.google.gwt.eclipse.sdkbundle.2.1.0_2.1.0.v201010280102/gwt-2.1.0/gwt-dev.jar"> + <attributes> + <attribute name="javadoc_location" value="file:/home/vjrj/bin/eclipse64-hel/plugins/com.google.gwt.eclipse.sdkbundle.2.1.0_2.1.0.v201010280102/gwt-2.1.0/doc/javadoc/"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="war/WEB-INF/classes"/> </classpath> Modified: kune-ws-armor/trunk/.project =================================================================== --- kune-ws-armor/trunk/.project 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/.project 2010-12-08 19:58:37 UTC (rev 1161) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>ws-armor</name> - <comment></comment> + <name>kune-ws-armor</name> + <comment>The current armor of Kune Workspace</comment> <projects> </projects> <buildSpec> @@ -16,6 +16,11 @@ </arguments> </buildCommand> <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> <arguments> </arguments> @@ -27,6 +32,7 @@ </buildCommand> </buildSpec> <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>com.instantiations.designer.gwt.GWTNature</nature> <nature>com.google.gwt.eclipse.core.gwtNature</nature> Added: kune-ws-armor/trunk/.settings/com.google.appengine.eclipse.core.prefs =================================================================== --- kune-ws-armor/trunk/.settings/com.google.appengine.eclipse.core.prefs (rev 0) +++ kune-ws-armor/trunk/.settings/com.google.appengine.eclipse.core.prefs 2010-12-08 19:58:37 UTC (rev 1161) @@ -0,0 +1,3 @@ +#Wed Dec 08 20:22:01 CET 2010 +eclipse.preferences.version=1 +filesCopiedToWebInfLib= Property changes on: kune-ws-armor/trunk/.settings/com.google.appengine.eclipse.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: kune-ws-armor/trunk/.settings/com.google.gwt.eclipse.core.prefs =================================================================== --- kune-ws-armor/trunk/.settings/com.google.gwt.eclipse.core.prefs 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/.settings/com.google.gwt.eclipse.core.prefs 2010-12-08 19:58:37 UTC (rev 1161) @@ -1,5 +1,5 @@ -#Sun Dec 05 02:43:22 CET 2010 +#Wed Dec 08 12:57:07 CET 2010 eclipse.preferences.version=1 entryPointModules= -filesCopiedToWebInfLib=gwt-servlet.jar +filesCopiedToWebInfLib= gwtCompileSettings=PGd3dC1jb21waWxlLXNldHRpbmdzPjxsb2ctbGV2ZWw+SU5GTzwvbG9nLWxldmVsPjxvdXRwdXQtc3R5bGU+T0JGVVNDQVRFRDwvb3V0cHV0LXN0eWxlPjxleHRyYS1hcmdzPjwhW0NEQVRBW11dPjwvZXh0cmEtYXJncz48dm0tYXJncz48IVtDREFUQVstWG14NTEybV1dPjwvdm0tYXJncz48L2d3dC1jb21waWxlLXNldHRpbmdzPg\=\= Added: kune-ws-armor/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- kune-ws-armor/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ kune-ws-armor/trunk/.settings/org.eclipse.jdt.core.prefs 2010-12-08 19:58:37 UTC (rev 1161) @@ -0,0 +1,3 @@ +#Wed Dec 08 20:27:44 CET 2010 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning Property changes on: kune-ws-armor/trunk/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: kune-ws-armor/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- kune-ws-armor/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ kune-ws-armor/trunk/.settings/org.maven.ide.eclipse.prefs 2010-12-08 19:58:37 UTC (rev 1161) @@ -0,0 +1,8 @@ +#Wed Dec 08 00:31:12 CET 2010 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Property changes on: kune-ws-armor/trunk/.settings/org.maven.ide.eclipse.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: kune-ws-armor/trunk/pom.xml =================================================================== --- kune-ws-armor/trunk/pom.xml (rev 0) +++ kune-ws-armor/trunk/pom.xml 2010-12-08 19:58:37 UTC (rev 1161) @@ -0,0 +1,70 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>kune-ws-armor</groupId> + <artifactId>kune-ws-armor</artifactId> + <version>0.0.4</version> + <name>Kune Armor Main Layout</name> + <description>The current armor of Kune Workspace</description> + <properties> +  + <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> + </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> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>2.1.0-1</version> + <executions> + <execution> + <goals> + <goal>compile</goal> + <goal>test</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> + </execution> + </executions> + </plugin> + </plugins> + <outputDirectory>war/WEB-INF/classes</outputDirectory> + <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> + <sourceDirectory>src</sourceDirectory> + <testSourceDirectory>test</testSourceDirectory> + <resources> + <resource> + <directory>src</directory> + </resource> + </resources> + </build> +</project> Property changes on: kune-ws-armor/trunk/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/WsArmor.gwt.xml 2010-12-08 19:58:37 UTC (rev 1161) @@ -1,6 +1,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/…"> <module> <inherits name="com.google.gwt.user.User" /> <inherits name="com.google.gwt.user.theme.standard.Standard" /> - <entry-point class="org.ourproject.kune.ws.armor.client.WsArmor" /> +  <public path="public" /> + <source path="client" /> </module> \ No newline at end of file Modified: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/Body.ui.xml 2010-12-08 19:58:37 UTC (rev 1161) @@ -40,277 +40,7 @@ </g:east> <g:center> <g:ScrollPanel styleName="{res.style.docEditor}"> - <g:HTML wordWrap="true" width="100%" height="100%">吗 - 台湾 - 六种辅音韵尾 - 中国政府要求在中国出售的软件必须使用编码 - 过 国标 - 名词的复数形式只在代词及多音节 - 台湾和港澳三地日益加深的经济联系 - 白话 - 如上面提到的 - 个例外可能是 - 个有意思的问题是中文数据的繁简体转换 - 看 - 就有明显的区别 - 推广普通话的效率 - 虽然不同方言区的人们可能不能互相理解对方的语音 - 吗 另外, - 汉语维基百科 - 公元前世纪到世纪 - 随着中国大陆政治上的影响不断增加 - 韩语 上, 文言 - 新 唐朝和宋朝 - 历史书书经以及部分的易经 - 上古汉语存在于周朝前期和中期 - 过 - 助词等所构成的句法复杂程度却又大大地超过了以拉丁语为例的曲折性语言 - 但客家话是在北方移民南下影响中形成的 - 例如 和 四川 - 诗经集 - 无论那个年龄层次 - 相隔只有十公里的当地居民也许已经不能互相理解了, - 根据广韵所反映的 - 在现代汉语的书面语中 - 由于闽南语的内部分歧比较大 - 打 繁化 - 汉语与欧洲语言 - 大陆直至年代 - 台湾和港澳三地日益加深的经济联系 - 香港 上, 过 - 通常 公元年 - 根据根据切韵涉及到的, - 大陆称为普通话 - 助词也用来表达问句问句的语序与陈述句的语序相同 - 和 日语 华语 - 未来汉字的发展 - 汉语还有套复杂的系统用于区分方向 - 有很多文化上的保守人士认为简体中文是不纯的和 - 过 最后 看 - 辞海和辞源等汉语言工具书 - 迫使民间跨越两种书写体系的障碍 - 中国古代的文学家花费了很大的精力来总结汉语的语音体系, - 广东东部 - 揭开中文的历史是个很有趣的问题 - 在山西绝大部分以及陕西北部 - 大陆 上 然而 - 相隔只有十公里的当地居民也许已经不能互相理解了 - 本地语被认为是更加亲切而用于家庭成员及日常生活中 - 新, 通常说来 - 时态等的曲折变化 - 直到上世纪年代中期 - 了 共有 对多 - 韵书以对外语的翻译 - 菲律宾和南亚的些国家使用 - 过 通常 - 它可以分为早期 - 虽然不同方言区的人们可能不能互相理解对方的语音 - 打碎 格 成语 - 虽然他们可能不能相互理解 - 事实上也没有因为简繁字体的不通出现交流障碍 - 上, 头 - 不同于欧洲的很多具有曲折变化的语言 - 大陆的书法界有的倒是比较流行以繁体汉字来书写 - 通常 上 为例 - 极少混淆 - 通常分为闽北方言 - 港澳和海外的华人圈中 - 共有 头 - 汉语与欧洲语言 - 有人认为应看上文下理 - 繁体有些书写形式更有美感 - 澳门和海外华人中间 - 的简体转化为繁体编码就要困难的多 - 国标 看, - 莆仙方言 - 及双峰话 昨天 - 性 云南 湘方言 - 请参看汉字 上 - 大陆 体 并举出 - 看不懂 - 但在文化层面而言, - 另外 - 就有明显的区别 - 如罗曼语族语言相比 - 粤方言是汉语中声调最复杂的方言之 - 体 及 - 为基础的书面语 - 在安徽南部地区使用 - 晋语, 汉字 性 - 是个量词 - 现代方言的多样性 - 在汉语中有大量的量词 - 徽语 看 - 汉语属于独立语 - 中国国家标准的简称 - 过 以后 - 就有明显的区别 - 中文等称呼都是指汉语 - 人们使用繁体中文编码时可以很方便地转换成 - 徽语 性 - 北方方言 - 中文的词汇只有种形式而没有诸如复数 - 然而汉语之所以能统称为汉语 - 简体字危及了对古代文学的研究 - 或 汉字, 北部 - 如 文化交流 - 汉语具有很多不同的方言 - 雅言 或 南京话 - 但是在不同的场合, - 四川 上 - 它可以分为早期 - 北方话的声调较少 - 诗歌的韵律以及对外国人名的翻译中可以找到足够的信息 - 晋语 了 - 中古汉语中的 - 使用这方言的人占中国人口的, - 但是在不同的场合 - 杭州人却倾向于认为他们的方言与上海话不同 - 新 因此 文言 - 如 - 是种以孔子时代所使用的以 - 有人认为台湾识字率并不逊于中国大陆, - 汉字 吴方言 - 编码收集了汉语 - 亦令繁简变换变得困难 - 及 看 汉字编码 - 现在尚有争议 - 最新的版本是 - 昨天 体 相反 - 普通人都认识繁体汉字 - 北方方言的明显特点包括 - 汉语也曾对其周边的国家的语言文字产生过重要影响, - 头 请参看汉字 - 商务交流和快速的因特网络 - 中国南方的人都可以流利的使用本地语和普通话 - 日语 看 - 并不被中国政府很好的接受 - 操北方话的北方人般可以相互理解然而在福建 - 日语 繁化 的码 - 极少混淆 - 可能是任何人也难以预料的 - 格, 找 以后 - 极少混淆 - 编码收集了汉语 - 个人可以生产简体向繁体转换的转换软件 - 为代表 - 菲律宾和南亚的些国家使用 - 相反 打, 海南 - 中古汉语也可以由方言重建 - 粤方言是汉语中声调最复杂的方言之 - 头, 老 - 我去过书店 - 人们会自动进行语码转换 - 汉语的书写系统目前有繁体和简体两种 - 共有 走 实际上 - 因为国标在大陆使用 - 港澳和海外的华人圈中 - 平话, 看 四川 - 在汉字 - 在江苏南部, 了 - 找到 闽东方言 - 来表达疑问语气 - 并不被中国政府很好的接受 - 和 - 使用人数大约为总人口的 - 成都话为北方方言的代表 - 徽语, 打 对多 - 汉语中存在 - 内蒙古河套地区等地使用 - 通常 打 - 通常认为是赣方言的种 - 由于日常使用和文学上使用的文字不同 - 例如, 贵州 体 - 湘方言以长沙话 - 根据广韵所反映的 - 所有的国标标准都使用作为前缀 - 昨天 找 湘方言 - 指北方地区 - 四川 性 - 极少混淆 - 这些资料仍然是现代语言学家工作的基础 - 主要用于广东省 - 同时也是保留中古汉语最完整的方言 - 杭州人却倾向于认为他们的方言与上海话不同 - 共有 过, - 其中的 - 不是简化 - 江西沿江地区 - 同时 打 因此 - 和 - 使用于庄重的场合 - 普通话被认为是种更加正式的语言, - 老 - 六种辅音韵尾 - 汉语是世界上使用人数最多的种语言 - 韩语 北京话 - 客家方言 - 在山西绝大部分以及陕西北部 - 打 香港, 日语 - 阳平二声 - 因此必须说 - 中国国家标准的简称 - 老 例如 上 - 平声已分为阴平 - 因为国标在大陆使用, - 找到 不知是指 - 在另方面 - 它保存在了周德清在世纪初撰写的韵书中原音韵中 - 走 华语 体 - 另外大陆地区 - 简体字危及了对古代文学的研究, - 另外 看 湘方言 - 用手进行大量书写的情况极少 - 吗 - 使用人数约为 - 只使用末尾的语气助词 - 云南, 大陆 打 - 文化交流 - 例如在普通话中的 - 和 为例 - 使用人数约为 - 这种汉语使用于隋朝, - 头 - 四种辅音韵尾 - 两位或四位编码 - 以厦门话为代表 - 昨天 - 无论那个年龄层次 - 使用粤方言的人口大约为总数的 - 这些资料仍然是现代语言学家工作的基础 - 海南 走, 最后 - 过 - 在这七大方言内部 - 文言已经很少使用了 - 或 - 世界上大约有 - 但可以通过相同书写方式进行沟通及交流 - 打碎 - 简繁有差异的字不到 - 他主要研究汉字和形式和诗经的韵律 - 贵州 和 - 成都话为北方方言的代表 - 但可以通过相同书写方式进行沟通及交流 - 在不同的方言区的人的语言意识也有定的区别 - 性 然而, 例如 - 及 - 湘方言以长沙话 - 只使用末尾的语气助词 - 北部 - 世界上大约有 - 现代方言的多样性 - 看, 走 而不是 - 北方方言包含了大量的同音字以及相应产生的复合词 - 为例 毫无疑问 - 助词也用来表达问句问句的语序与陈述句的语序相同 - 体 国标, - 但在台湾 - 中国的不同方言的语法是相似的 - 这种方言对清浊辅音的区分是个很明显的特点 - 或 为例, 如 - 他主要研究汉字和形式和诗经的韵律 - 汉语的名词与数词连接时通常要求有量词 - 晋语</g:HTML> + <g:HTML wordWrap="true" width="100%" height="100%"></g:HTML> </g:ScrollPanel> </g:center> <g:south size="33.0"> Modified: kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java =================================================================== --- kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/src/org/ourproject/kune/ws/armor/client/resources/WsArmorResources.java 2010-12-08 19:58:37 UTC (rev 1161) @@ -43,6 +43,7 @@ String siteBar(); } + @Deprecated public static final WsArmorResources INSTANCE = GWT.create(WsArmorResources.class); @Source("def-theme-doc-arrow-down.png") Added: kune-ws-armor/trunk/target/kune-ws-armor-0.0.4.jar =================================================================== (Binary files differ) Property changes on: kune-ws-armor/trunk/target/kune-ws-armor-0.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: kune-ws-armor/trunk/target/maven-archiver/pom.properties =================================================================== --- kune-ws-armor/trunk/target/maven-archiver/pom.properties (rev 0) +++ kune-ws-armor/trunk/target/maven-archiver/pom.properties 2010-12-08 19:58:37 UTC (rev 1161) @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Dec 08 20:41:22 CET 2010 +version=0.0.4 +groupId=kune-ws-armor +artifactId=kune-ws-armor Property changes on: kune-ws-armor/trunk/target/maven-archiver/pom.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: kune-ws-armor/trunk/war/WEB-INF/lib/gwt-servlet.jar =================================================================== (Binary files differ) Modified: kune-ws-armor/trunk/war/WsArmor.css =================================================================== --- kune-ws-armor/trunk/war/WsArmor.css 2010-12-08 15:21:36 UTC (rev 1160) +++ kune-ws-armor/trunk/war/WsArmor.css 2010-12-08 19:58:37 UTC (rev 1161) @@ -1,130 +1,135 @@ -body { - background-color: white; - color: black; - font-family: 'UbuntuRegular', Arial; - font-size: small; - margin: 5px; +body { + background-color: white; + color: black; + font-family: 'UbuntuRegular', Arial; + font-size: small; + margin: 5px; } -body.fontface {font: 'UbuntuRegular', Arial;} +body.fontface { + font: 'UbuntuRegular', Arial; +} -a { - color: darkblue; +a { + color: darkblue; } -a:visited { - color: darkblue; +a:visited { + color: darkblue; } .gwt-DialogBox { - border: 2px solid #AAAAAA; - background-color: white; + border: 2px solid #AAAAAA; + background-color: white; } .gwt-DialogBox .Caption { - background-image: url(gray_gradient.gif); - background-repeat: repeat-x; - padding: 4px; - padding-bottom: 8px; - font-weight: bold; - cursor: default; + background-image: url(gray_gradient.gif); + background-repeat: repeat-x; + padding: 4px; + padding-bottom: 8px; + font-weight: bold; + cursor: default; } .gwt-MenuBar { - background-color: #C3D9FF; - cursor: default; + background-color: #C3D9FF; + cursor: default; } .gwt-MenuItem { - font-size: 80%; - margin: 1px; - cursor: default; + font-size: 80%; + margin: 1px; + cursor: default; } .gwt-MenuItem-selected { - background-color: #E8EEF7; + background-color: #E8EEF7; } .gwt-Tree { + } .gwt-Tree .gwt-TreeItem { - font-size: 80%; - cursor: default; + font-size: 80%; + cursor: default; } .gwt-Tree .gwt-TreeItem-selected { - background-color: #C3D9FF; + background-color: #C3D9FF; } .gwt-StackPanel { - background-color: white; - border: 1px solid #AAAAAA; - width: 15em; + background-color: white; + border: 1px solid #AAAAAA; + width: 15em; } .gwt-StackPanel .gwt-StackPanelItem { - background-image: url(blue_gradient.gif); - background-repeat: repeat-x; - background-color: #EEEEEE; - cursor: pointer; - cursor: hand; + background-image: url(blue_gradient.gif); + background-repeat: repeat-x; + background-color: #EEEEEE; + cursor: pointer; + cursor: hand; } .gwt-StackPanel .gwt-StackPanelItem-selected { + } .gwt-TabPanel { - + } .gwt-TabPanelBottom { - border-left: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; + border-left: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; } .gwt-TabBar { - font-size: smaller; + font-size: smaller; } .gwt-TabBar .gwt-TabBarFirst { - height: 100%; - border-bottom: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - padding-left: 3px; + height: 100%; + border-bottom: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + padding-left: 3px; } .gwt-TabBar .gwt-TabBarRest { - border-bottom: 1px solid #87b3ff; - padding-right: 3px; + border-bottom: 1px solid #87b3ff; + padding-right: 3px; } .gwt-TabBar .gwt-TabBarItem { - border-top: 1px solid #87b3ff; - border-bottom: 1px solid #87b3ff; - padding: 2px; - cursor: hand; - white-space: nowrap; - border-right: 1px solid #87b3ff; + border-top: 1px solid #87b3ff; + border-bottom: 1px solid #87b3ff; + padding: 2px; + cursor: hand; + white-space: nowrap; + border-right: 1px solid #87b3ff; } .gwt-TabBar .gwt-TabBarItem-selected { - font-weight: bold; - background-color: #e8eef7; - border-top: 1px solid #87b3ff; - border-right: 1px solid #87b3ff; - border-bottom: 1px solid #e8eef7; - padding: 2px; - cursor: default; - white-space: nowrap; + font-weight: bold; + background-color: #e8eef7; + border-top: 1px solid #87b3ff; + border-right: 1px solid #87b3ff; + border-bottom: 1px solid #e8eef7; + padding: 2px; + cursor: default; + white-space: nowrap; } .gwt-PushButton-up { background-color: #C3D9FF; padding: 2px; border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); cursor: pointer; cursor: hand; } @@ -133,7 +138,8 @@ background-color: #C3D9FF; padding: 2px; border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); cursor: pointer; cursor: hand; } @@ -142,7 +148,8 @@ background-color: #C3D9FF; padding: 2px; border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); cursor: pointer; cursor: hand; } @@ -151,7 +158,8 @@ background-color: #C3D9FF; padding: 2px; border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); cursor: pointer; cursor: hand; } @@ -160,7 +168,8 @@ background-color: #C3D9FF; padding: 2px; border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); cursor: pointer; cursor: hand; } @@ -169,7 +178,8 @@ background-color: #C3D9FF; padding: 2px; border: 2px solid transparent; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); cursor: pointer; cursor: hand; } @@ -179,7 +189,8 @@ padding: 2px; background-color: #E8F1FF; border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); cursor: pointer; cursor: hand; } @@ -189,7 +200,8 @@ padding: 2px; background-color: #E8F1FF; border: 2px solid transparent; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); cursor: pointer; cursor: hand; } @@ -212,19 +224,22 @@ .gwt-RichTextToolbar .gwt-PushButton-up-hovering { margin-right: 2px; border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-PushButton-down { margin-right: 2px; border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-PushButton-down-hovering { margin-right: 2px; border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-up { @@ -235,30 +250,33 @@ .gwt-RichTextToolbar .gwt-ToggleButton-up-hovering { margin-right: 2px; border: 1px solid #C3D9FF; - border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) rgb(232, 241, 255); + border-color: #E8F1FF rgb(157, 174, 205) rgb(157, 174, 205) + rgb(232, 241, 255); } .gwt-RichTextToolbar .gwt-ToggleButton-down { margin-right: 2px; background-color: #E8F1FF; border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-RichTextToolbar .gwt-ToggleButton-down-hovering { margin-right: 2px; background-color: #E8F1FF; border: 1px solid #C3D9FF; - border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) rgb(157, 174, 205); + border-color: #9DAECD rgb(232, 241, 255) rgb(232, 241, 255) + rgb(157, 174, 205); } .gwt-HorizontalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-HorizontalSplitPanel .splitter { - background-color: #C3D9FF; - cursor: move; + background-color: #C3D9FF; + cursor: move; } .gwt-HorizontalSplitPanel .left { @@ -266,37 +284,106 @@ } .gwt-VerticalSplitPanel { - border: 8px solid #C3D9FF; + border: 8px solid #C3D9FF; } .gwt-VerticalSplitPanel .splitter { - background-color: #C3D9FF; - height: 8px; - cursor: move; + background-color: #C3D9FF; + height: 8px; + cursor: move; } .gwt-SuggestBoxPopup { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-SuggestBoxPopup .item { - padding: 2px; + padding: 2px; } .gwt-SuggestBoxPopup .item-selected { - background-color: #C3D9FF; - padding: 2px; + background-color: #C3D9FF; + padding: 2px; } .gwt-DisclosurePanel { - border: 2px solid #C3D9FF; + border: 2px solid #C3D9FF; } .gwt-DisclosurePanel .header { - background-color: #e8eef7; - cursor: hand; + background-color: #e8eef7; + cursor: hand; } -.gwt-SplitLayoutPanel { } -.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { background-color: white; background: none; } -.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { } +.gwt-SplitLayoutPanel { + +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-HDragger { + background-color: white; + background: none; +} + +.gwt-SplitLayoutPanel .gwt-SplitLayoutPanel-VDragger { + +} + +@font-face { + font-family: 'UbuntuRegular'; + src: + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-R-webfont.eot'); + src: local('☺'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-R-webfont.woff') + format('woff'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-R-webfont.ttf') + format('truetype'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-R-webfont.svg#webfontcceGD1qN') + format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'UbuntuItalic'; + src: + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-I--webfont.eot'); + src: local('☺'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-I--webfont.woff') + format('woff'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-I--webfont.ttf') + format('truetype'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-I--webfont.svg#') + format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'UbuntuBold'; + src: + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-B---webfont.eot'); + src: local('☺'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-B---webfont.woff') + format('woff'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-B---webfont.ttf') + format('truetype'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-B---webfont.svg#') + format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'UbuntuBoldItalic'; + src: + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-BI----webfont.eot'); + src: local('☺'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-BI----webfont.woff') + format('woff'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-BI----webfont.ttf') + format('truetype'), + url('/org.ourproject.kune.ws.armor.WsArmor/fontface/Ubuntu-BI----webfont.svg#') + format('svg'); + font-weight: normal; + font-style: normal; +} \ No newline at end of file

1 0

r1160 - in trunk: . img src/main/java src/main/java/cc src/main/java/cc/kune src/main/java/cc/kune/core src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/ws src/main/java/cc/kune/core/public src/main/java/org/ourproject/kune/app src/main/java/org/ourproject/kune/app/client src/main/java/org/ourproject/kune/app/public src/main/java/org/ourproject/kune/app/public/css src/main/java/org/ourproject/kune/chat/client src/main/java/org/ourproject/kune/chat/client/ctx/room src/main/j
by Vicente J. Ruiz Jurado 08 Dec '10

08 Dec '10

Author: vjrj_ Date: 2010-12-08 16:21:36 +0100 (Wed, 08 Dec 2010) New Revision: 1160 Added: trunk/img/template-gen.svg trunk/src/main/java/cc/ trunk/src/main/java/cc/kune/ trunk/src/main/java/cc/kune/core/ trunk/src/main/java/cc/kune/core/Core.gwt.xml trunk/src/main/java/cc/kune/core/client/ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/ws/ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java trunk/src/main/java/cc/kune/core/client/ws/CoreView.java trunk/src/main/java/cc/kune/core/public/ trunk/src/main/java/cc/kune/core/public/favicon.ico trunk/src/main/java/cc/kune/core/public/ws.html Modified: trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/app/public/css/kune.css trunk/src/main/java/org/ourproject/kune/app/public/ws.html trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java trunk/war/WEB-INF/web.xml Log: CLOSED - # 5: Guin and MVC4p integration http://kune.ourproject.org/issues/ticket/5 CLOSED - # 4: Gwt 2.1.0 and mvn cleanup http://kune.ourproject.org/issues/ticket/4 Added: trunk/img/template-gen.svg =================================================================== --- trunk/img/template-gen.svg (rev 0) +++ trunk/img/template-gen.svg 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="1052.3622" + height="744.09448" + id="svg2" + version="1.1" + inkscape:version="0.48.0 r9654" + sodipodi:docname="template-gen.svg"> + <defs + id="defs4"> + <linearGradient + inkscape:collect="always" + id="linearGradient3262"> + <stop + style="stop-color:#b3b3b3;stop-opacity:1;" + offset="0" + id="stop3264" /> + <stop + style="stop-color:#b3b3b3;stop-opacity:0;" + offset="1" + id="stop3266" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3268" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3272" + gradientUnits="userSpaceOnUse" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" + gradientTransform="translate(0,358.2677)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3276" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,408.2677)" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3280" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,458.2677)" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3262" + id="linearGradient3284" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,508.2677)" + x1="22" + y1="59.094482" + x2="188" + y2="55.094482" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="554.16978" + inkscape:cy="358.47397" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1280" + inkscape:window-height="975" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-308.2677)"> + <rect + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3192" + width="621.91388" + height="676.81635" + x="209.6339" + y="336.8118" + ry="0" /> + <rect + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3198" + width="621" + height="31" + x="210" + y="29.094482" + transform="translate(0,308.2677)" /> + <text + xml:space="preserve" + style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold" + x="220" + y="358.36218" + id="text3194" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3196" + x="220" + y="358.36218">Preview</tspan></text> + <rect + y="-1013.2306" + x="-187.341" + height="676.41876" + width="174.69496" + id="rect3206" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3208" + width="6.9878192" + height="676.41876" + x="-209.63385" + y="-1013.2306" + transform="scale(-1,-1)" /> + <g + id="g3256"> + <rect + transform="scale(-1,-1)" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3210" + width="15.373183" + height="676.41876" + x="-202.0193" + y="-1013.2306" /> + <rect + transform="scale(-1,-1)" + rx="4.891449" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3212" + width="9.7828979" + height="55.902386" + x="-199.04945" + y="-402.49713" + ry="4.891449" /> + </g> + <path + transform="matrix(-1,0,0,-1,1040.28,1041.7747)" + d="m 836,353.09448 a 1.5,7 0 1 1 -3,0 1.5,7 0 1 1 3,0 z" + sodipodi:ry="7" + sodipodi:rx="1.5" + sodipodi:cy="353.09448" + sodipodi:cx="834.5" + id="path3214" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <rect + transform="scale(-1,-1)" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3228" + width="15.373183" + height="644.41876" + x="-831.01929" + y="-1013.2306" /> + <rect + transform="scale(-1,-1)" + rx="4.891449" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3230" + width="9.7828979" + height="53.257759" + x="-828.04944" + y="-431.38968" + ry="4.891449" /> + <rect + y="-1013.2306" + x="-831.01929" + height="644.41876" + width="15.373183" + id="rect3232" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + ry="4.891449" + y="-431.38968" + x="-828.04944" + height="53.257759" + width="9.7828979" + id="rect3234" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="4.891449" + transform="scale(-1,-1)" /> + <rect + transform="scale(-1,-1)" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3236" + width="15.373183" + height="644.41876" + x="-831.01929" + y="-1013.2306" /> + <rect + transform="scale(-1,-1)" + rx="4.891449" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3238" + width="9.7828979" + height="53.257759" + x="-828.04944" + y="-431.38968" + ry="4.891449" /> + <rect + y="-1013.2306" + x="-831.01929" + height="644.41876" + width="15.373183" + id="rect3240" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + ry="4.891449" + y="-431.38968" + x="-828.04944" + height="53.257759" + width="9.7828979" + id="rect3242" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="4.891449" + transform="scale(-1,-1)" /> + <g + id="g3248"> + <rect + y="-1013.2306" + x="-831.01929" + height="644.41876" + width="15.373183" + id="rect3244" + style="color:#000000;fill:#f2f2f2;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="scale(-1,-1)" /> + <rect + ry="4.891449" + y="-431.38968" + x="-828.04944" + height="53.257759" + width="9.7828979" + id="rect3246" + style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + rx="4.891449" + transform="scale(-1,-1)" /> + </g> + <rect + style="color:#000000;fill:url(#linearGradient3268);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3260" + width="168" + height="50" + x="16" + y="31.094482" + transform="translate(0,308.2677)" /> + <rect + y="389.36218" + x="16" + height="50" + width="168" + id="rect3270" + style="color:#000000;fill:url(#linearGradient3272);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:url(#linearGradient3276);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3274" + width="168" + height="50" + x="16" + y="439.36218" /> + <rect + y="489.36218" + x="16" + height="50" + width="168" + id="rect3278" + style="color:#000000;fill:url(#linearGradient3280);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:url(#linearGradient3284);fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3282" + width="168" + height="50" + x="16" + y="539.36218" /> + </g> +</svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/pom.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -1,11 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?> <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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.ourproject</groupId> + <groupId>cc</groupId> <artifactId>kune</artifactId> <packaging>jar</packaging> - <version>0.0.6</version> + <version>0.0.7</version> <description> kune free/open/libre collaboration platform </description> @@ -26,11 +25,15 @@ <version>2.0.1</version> </dependency> <dependency> + <groupId>com.googlecode.gwt.inject</groupId> + <artifactId>gin</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice-servlet</artifactId> <version>2.0.1</version> </dependency> -  <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> @@ -43,9 +46,18 @@ <version>${gwtVersion}</version> <scope>provided</scope> </dependency> -  <dependency> + <groupId>com.googlecode.mvp4g</groupId> + <artifactId>mvp4g</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>com.googlecode.mvc4g</groupId> + <artifactId>mvc4g</artifactId> + <version>1.0.0-jboss</version> + </dependency> +  + <dependency> <groupId>org.cobogw</groupId> <artifactId>gwt</artifactId> <version>1.2.2</version> @@ -70,6 +82,11 @@ <artifactId>gwt-voices</artifactId> <version>1.6.0</version> </dependency> + <dependency> + <groupId>org.ourproject.kune.ws.armor</groupId> + <artifactId>ws-armor</artifactId> + <version>0.0.3</version> + </dependency>  <dependency> <groupId>log4j</groupId> @@ -244,22 +261,21 @@ <version>1.7.0.0</version> </dependency>  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-util</artifactId> -  - <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> -  - <scope>runtime</scope> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> @@ -295,6 +311,7 @@ <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> <version>1.0.3</version> +  </dependency>  <dependency> @@ -383,8 +400,23 @@ <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> </repository> </distributionManagement> -  <pluginRepositories> +  + <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> +   <pluginRepository> @@ -420,12 +452,26 @@ </releases> </repository> <repository> - <id>repository.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>http://repository.jboss.org/maven2</url> + <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>dyndns-repo</id> <url>http://maven.dyndns.org/2</url> </repository> @@ -440,10 +486,6 @@ <url>http://kune.ourproject.org/mavenrepo/</url> </repository> <repository> - <id>gwtext</id> - <url>http://www.gwt-ext.com/maven2/</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> @@ -579,28 +621,15 @@ <wtpversion>2.0</wtpversion> </configuration> </plugin> - +  <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <version>7.2.1.v20101111</version> -  +  <configuration>   @@ -813,4 +842,4 @@ </dependencies> </profile> </profiles> -</project> +</project> \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/Core.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/core/Core.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/core/Core.gwt.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,16 @@ +<?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/…"> +<module rename-to="ws"> + <inherits name="com.google.gwt.user.User" /> +  + <source path='client' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <public path="public" /> + <inherits name='com.mvp4g.Mvp4gModule' /> + <inherits name="org.ourproject.kune.ws.armor.WsArmor" /> + <entry-point class="cc.kune.core.client.KuneEntryPoint" /> +  +  + <set-property name="user.agent" value="safari" /> +</module> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/Core.gwt.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreEventBus.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreEventBus.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,20 @@ +package cc.kune.core.client; + +import cc.kune.core.client.ws.CorePresenter; +import cc.kune.core.client.ws.CoreView; + +import com.mvp4g.client.annotation.Debug; +import com.mvp4g.client.annotation.Event; +import com.mvp4g.client.annotation.Events; +import com.mvp4g.client.annotation.Start; +import com.mvp4g.client.event.EventBus; + +@Events(startView = CoreView.class, ginModules = { CoreGinModule.class }) +@Debug +public interface CoreEventBus extends EventBus { + + @Start + @Event(handlers = CorePresenter.class) + void start(); + +} Property changes on: trunk/src/main/java/cc/kune/core/client/CoreEventBus.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,16 @@ +package cc.kune.core.client; + +import org.ourproject.kune.ws.armor.client.Body; +import org.ourproject.kune.ws.armor.client.IBody; + +import com.google.gwt.inject.client.AbstractGinModule; +import com.google.inject.Singleton; + +public class CoreGinModule extends AbstractGinModule { + + @Override + protected void configure() { + bind(IBody.class).to(Body.class).in(Singleton.class); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,18 @@ +package cc.kune.core.client; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.RootLayoutPanel; +import com.google.gwt.user.client.ui.Widget; +import com.mvp4g.client.Mvp4gModule; + +public class KuneEntryPoint implements EntryPoint { + + @Override + public void onModuleLoad() { + final Mvp4gModule module = (Mvp4gModule) GWT.create(Mvp4gModule.class); + module.createAndStartModule(); + RootLayoutPanel.get().add((Widget) module.getStartView()); + } + +} Property changes on: trunk/src/main/java/cc/kune/core/client/KuneEntryPoint.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,16 @@ +package cc.kune.core.client.ws; + +import cc.kune.core.client.CoreEventBus; +import cc.kune.core.client.ws.CorePresenter.ICoreView; + +import com.mvp4g.client.annotation.Presenter; +import com.mvp4g.client.presenter.BasePresenter; + +@Presenter(view = CoreView.class) +public class CorePresenter extends BasePresenter<ICoreView, CoreEventBus> { + public interface ICoreView { + } + + public void onStart() { + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/CorePresenter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/client/ws/CoreView.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/ws/CoreView.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/ws/CoreView.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,19 @@ +package cc.kune.core.client.ws; + +import org.ourproject.kune.ws.armor.client.Body; +import org.ourproject.kune.ws.armor.client.resources.WsArmorResources; + +import cc.kune.core.client.ws.CorePresenter.ICoreView; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Composite; +import com.google.inject.Inject; + +public class CoreView extends Composite implements ICoreView { + + @Inject + public CoreView(final Body body) { + GWT.<WsArmorResources> create(WsArmorResources.class).style().ensureInjected(); + initWidget(body); + } +} Property changes on: trunk/src/main/java/cc/kune/core/client/ws/CoreView.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/src/main/java/cc/kune/core/public/favicon.ico =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/public/ws.html =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.html (rev 0) +++ trunk/src/main/java/cc/kune/core/public/ws.html 2010-12-08 15:21:36 UTC (rev 1160) @@ -0,0 +1,13 @@ +<!doctype html> +<html> +<head> +<meta http-equiv="content-type" content="text/html; charset=UTF-8"> +<title>Kune</title> +<script type="text/javascript" language="javascript" + src="/ws/ws.nocache.js"></script> +</head> +<body> +<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> +<iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> +</body> +</html> \ No newline at end of file Property changes on: trunk/src/main/java/cc/kune/core/public/ws.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -1,5 +1,5 @@ <!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/…"> -<module rename-to="ws"> +<module rename-to="wsold"> <inherits name="com.google.gwt.i18n.I18N" /> <inherits name="com.google.gwt.user.User" /> <inherits name="com.google.gwt.resources.Resources" /> @@ -42,6 +42,7 @@  <set-property name="user.agent" value="gecko1_8" /> <inherits name="com.google.gwt.wave.Wave" /> + <inherits name="org.ourproject.kune.ws.armor.WsArmor" />  <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" />  +<link href="//fonts.googleapis.com/css?family=Droid+Sans:regular,bold" + rel="stylesheet" type="text/css"> <link rel="shortcut icon" href="images/favicon.ico" /> <title>Kune</title> <style type="text/css"> @@ -26,59 +28,64 @@ top: 0px; width: 100%; height: 100%; - background-color: #FFF; + background-color: #F2F2F2; z-index: 9999; } #kuneprogresspanel { - position: absolute; - top: 2px; -  - z-index: 9998; + position: absolute; + top: 2px; + z-index: 9998; } .kune-Progress { - background: #E5FF80; - border: 1px solid #E5FF80; - white-space: nowrap; - height: 16px; - padding: 0 3px; + background: #E5FF80; + border: 1px solid #E5FF80; + white-space: nowrap; + height: 16px; + padding: 0 3px; } +#kuneprogresspanel { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} + #kuneprogresstext { - font-family: arial, helvetica, clean, sans-serif; - font-size-adjust: none; - font-style: normal; - font-variant: normal; - font-weight: normal; - line-height: 1.22; + font-family: 'Droid Sans', arial, helvetica, clean, sans-serif; + font-size-adjust: none; + font-style: normal; + font-variant: normal; + font-weight: normal; + line-height: 1.22; } #kuneloading { - position: absolute; - left: 45%; - top: 40%; - padding: 0px; - z-index: 20001; - height: auto; - border: 1px solid #ccc; + position: absolute; + left: 45%; + top: 40%; + padding: 0px; + z-index: 20001; + height: auto; + border: 1px solid #ccc; } #kuneloading a { - color: #225588; + color: #225588; } #kuneloading .kuneloading-indicator { - background: white; - color: #444; - font: bold 13px tahoma, arial, helvetica; - padding: 5px 5px 10px 5px; - margin: 0; - height: auto; + background: white; + color: #444; + font: bold 13px 'Droid Sans', tahoma, arial, helvetica; + padding: 5px 5px 10px 5px; + margin: 0; + height: auto; } #kuneloading-msg { - font: normal 10px arial, tahoma, sans-serif; + font: normal 10px 'Droid Sans', arial, tahoma, sans-serif; } </style>  -<script type="text/javascript" id="extlocale"></script> -<script type="text/javascript"> - - // decode language passed in url - var locale = window.location.search - ? Ext.urlDecode(window.location.search.substring(1)).locale - : '' - ; - // append locale script to the head - var head = Ext.fly(document.getElementsByTagName('head')[0]); - if(locale) { - Ext.fly('extlocale').set({src:'js/ext/source/locale/ext-lang-' + locale + '.js'}); - } -</script> <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> <div id="kuneinitialcurtain"></div> <div class="" id="kuneprogresspanel" style=""> <table cellspacing="0" cellpadding="0" border="0" - style="margin-top: 5px; margin-left: 5px;" - summary="Starting"> - <tbody> - <tr> - <td height="16" align="left" class="kune-Progress" - style="vertical-align: top;"><img - style="height: 16px; width: 16px;" - src="images/spin-kune-thund-green.gif" alt="progress spin" /></td> - <td align="left" class="kune-Progress" style="vertical-align: top;"> - <div id="kuneprogresstext" class="gwt-Label">Loading</div> - </td> - <td height="16" width="100%" align="left" - style="vertical-align: top;" /> - </tr> - </tbody> + style="margin-top: 5px; margin-left: 5px;" summary="Starting"> + <tbody> + <tr> + <td height="16" align="left" class="kune-Progress" + style="vertical-align: top;"><img + style="height: 16px; width: 16px;" + src="images/spin-kune-thund-green.gif" alt="progress spin" /></td> + <td align="left" class="kune-Progress" style="vertical-align: top;"> + <div id="kuneprogresstext" class="gwt-Label">Loading</div> + </td> + <td height="16" width="100%" align="left" + style="vertical-align: top;" /> + </tr> + </tbody> </table> </div> <div id="kuneloading"> - <div class="kuneloading-indicator"> - <img src="images/kune-anim.gif" width="35" height="35" alt="kune-loading" - style="margin-right:3px;float:left;vertical-align:top;"/>kune         <br/> - <span id="kuneloading-msg">Starting...</span></div> +<div class="kuneloading-indicator"><img src="images/kune-anim.gif" + width="35" height="35" alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune         <br /> +<span id="kuneloading-msg">Starting...</span></div> </div>  -<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Loading ...';</script> +<script type="text/javascript"> + document.getElementById('kuneloading-msg').innerHTML = 'Loading ...'; +</script>  -<script type="text/javascript">document.getElementById('kuneloading-msg').innerHTML = 'Starting...';</script> +<script type="text/javascript"> + document.getElementById('kuneloading-msg').innerHTML = 'Starting...'; +</script>   Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -52,8 +52,8 @@ import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; import com.gwtext.client.core.EventObject; @@ -171,7 +171,7 @@ + chatOptions.userOptions.getUserJid().getNode()); final Room room = (Room) emiteUIProvider.get().joinRoom(roomURI); if (subject != null) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final RoomUI roomUI = (RoomUI) room.getData(ChatUI.class); if (roomUI != null) { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -24,8 +24,8 @@ import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.form.Field; import com.gwtext.client.widgets.form.FormPanel; @@ -78,7 +78,7 @@ protected void doAddRoom() { roomName.validate(); if (formPanel.getForm().isValid()) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.addRoom(roomName.getValueAsString()); reset(); @@ -108,7 +108,7 @@ dialog.add(formPanel); roomName.addListener(new FieldListenerAdapter() { @Override - public void onSpecialKey(Field field, EventObject e) { + public void onSpecialKey(final Field field, final EventObject e) { if (e.getKey() == 13) { doAddRoom(); } 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-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/cnt/GalleryFolderContentPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -27,10 +27,10 @@ import org.ourproject.kune.workspace.client.cnt.FoldableContentPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.ui.FlowPanel; public class GalleryFolderContentPanel extends FoldableContentPanel implements GalleryFolderContentView { @@ -48,7 +48,7 @@ } public void addThumb(final StateToken token, final String title, final String imgUrl) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final BasicThumb thumb = new BasicThumb(imgUrl, session.getImgCropsize(), title, TEXT_MAX_LENGHT, true, new ClickHandler() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -22,8 +22,8 @@ import java.util.HashMap; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.menu.BaseItem; import com.gwtext.client.widgets.menu.Item; @@ -43,7 +43,7 @@ public void createItemMenu(final String id, final ActionItemCollection<T> actionCollection, final Listener<ActionItem<T>> listener) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { Menu menu = null; if (actionCollection != null) { @@ -69,7 +69,7 @@ }); } - public Menu get(String id) { + public Menu get(final String id) { return contextMenus.get(id); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -30,8 +30,8 @@ import com.calclab.suco.client.events.Event0; import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window.ClosingEvent; @@ -90,7 +90,7 @@ public void onSuccess(final InitDataDTO initData) { session.setInitData(initData); session.setCurrentUserInfo(initData.getUserInfo()); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { RootPanel.get("kuneinitialcurtain").setVisible(false); RootPanel.get("kuneloading").setVisible(false); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/CustomMenu.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -45,8 +45,8 @@ import org.ourproject.kune.platf.client.ui.MenuItem; import org.ourproject.kune.platf.client.ui.MenuItemCollection; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.menu.BaseItem; import com.gwtext.client.widgets.menu.Item; @@ -74,8 +74,9 @@ item.setIcon(menuItem.getIcon()); menu.addItem(item); item.addListener(new BaseItemListenerAdapter() { + @Override public void onClick(final BaseItem item, final EventObject e) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { menuItem.fire(param); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -26,6 +26,8 @@ import org.xwiki.gwt.dom.client.Selection; import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Node; import com.google.gwt.event.dom.client.BlurEvent; @@ -33,9 +35,7 @@ import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.KeyCodes; -import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.Composite; @@ -381,7 +381,7 @@ } public void showLinkCtxMenu() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final org.xwiki.gwt.dom.client.Element selectedAnchor = LinkExecutableUtils.getSelectedAnchor(rta); if (selectedAnchor != null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -15,36 +15,36 @@ */ package org.ourproject.kune.platf.client.ui.rte.impl; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; /** * Old Mozilla-specific implementation of rich-text editing. */ public class RichTextAreaImplOldMozilla extends RichTextAreaImplMozilla { - /** - * The content window cannot be focused immediately after the content window - * has been loaded, so we need to wait for an additional deferred command. - */ - @Override - protected void onElementInitialized() { - DeferredCommand.addCommand(new Command() { - public void execute() { - RichTextAreaImplOldMozilla.super.onElementInitialized(); - } - }); - } + /** + * The content window cannot be focused immediately after the content window + * has been loaded, so we need to wait for an additional deferred command. + */ + @Override + protected void onElementInitialized() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + public void execute() { + RichTextAreaImplOldMozilla.super.onElementInitialized(); + } + }); + } - @Override - protected void setFirstFocusImpl() { - setFocusImpl(true); - } + @Override + protected void setFirstFocusImpl() { + setFocusImpl(true); + } - @Override - protected void setFocusImpl(boolean focused) { - // Old Mozilla does not support blur on the content window of an iframe. - if (focused) { - super.setFocusImpl(focused); + @Override + protected void setFocusImpl(final boolean focused) { + // Old Mozilla does not support blur on the content window of an iframe. + if (focused) { + super.setFocusImpl(focused); + } } - } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertimg/ext/InsertImageExtPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -4,8 +4,8 @@ import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.rte.insertimg.abstractimg.InsertImageAbstractPanel; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.Frame; import com.google.gwt.user.client.ui.Label; import com.gwtext.client.core.EventCallback; @@ -71,7 +71,7 @@ } public void setPreviewUrl(final String url) { - Frame previewFrame = new Frame(url); + final Frame previewFrame = new Frame(url); previewPanel.clear(); previewPanel.add(previewFrame); previewPanel.doLayout(); @@ -83,7 +83,7 @@ } private void refreshPreview() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.onPreview(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/abstractlink/InsertLinkAbstractPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -5,8 +5,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertlink.InsertLinkDialogView; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventCallback; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Component; @@ -58,7 +58,7 @@ textField.addKeyPressListener(new EventCallback() { public void execute(final EventObject e) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.onTextFieldChanged(textField.getRawValue()); } @@ -68,7 +68,7 @@ onOverField.addKeyPressListener(new EventCallback() { public void execute(final EventObject e) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.onOverFieldChanged(onOverField.getRawValue()); } @@ -86,13 +86,13 @@ super.addListener(new FormPanelListenerAdapter() { @Override public void onActivate(final Panel panel) { - LinkInfo linkInfo = presenter.getLinkInfo(); + final LinkInfo linkInfo = presenter.getLinkInfo(); updateValues(linkInfo); presenter.onActivate(); } }); - FieldSet advanced = new FieldSet(Resources.i18n.t("More options")); + final FieldSet advanced = new FieldSet(Resources.i18n.t("More options")); advanced.setCollapsible(true); advanced.setCollapsed(true); advanced.setAutoHeight(true); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertspecialchar/utf8/InsertSpecialUTF8CharPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -7,8 +7,8 @@ import org.ourproject.kune.platf.client.ui.rte.insertspecialchar.InsertSpecialCharDialogView; import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventCallback; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Position; @@ -32,7 +32,7 @@ form.setAutoWidth(true); form.setHeight(InsertSpecialCharDialogView.HEIGHT - 10); - Label label = new Label(); + final Label label = new Label(); label.setHtml(i18n.t("If you know a special character's [%s] value, enter it below.", TextUtils.generateHtmlLink("http://unicode.org/charts/", "Unicode")) + "<br/><br/>"); @@ -65,7 +65,7 @@ form.add(inputUnicodeField); form.add(previewField); - Button insert = new Button(i18n.t("Insert character")); + final Button insert = new Button(i18n.t("Insert character")); insert.addListener(new ButtonListenerAdapter() { @Override @@ -84,14 +84,14 @@ private char getCharEntered() { try { return (char) Integer.valueOf(inputUnicodeField.getRawValue()).intValue(); - } catch (Exception except) { + } catch (final Exception except) { Log.debug("Not possible to cast utf8 int to char"); } return '?'; } private void refreshPreview() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { previewField.setValue("" + getCharEntered()); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -20,8 +20,8 @@ package org.ourproject.kune.platf.client.utils; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; /** * The Class DeferredCommandWrapper is a wrapper of the GWT DeferredCommand @@ -36,7 +36,7 @@ * the listener */ public void addCommand(final Listener0 command) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { command.onEvent(); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/PrefetchUtilities.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -19,15 +19,15 @@ */ package org.ourproject.kune.platf.client.utils; -import com.google.gwt.user.client.DeferredCommand; -import com.google.gwt.user.client.IncrementalCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.RepeatingCommand; import com.google.gwt.user.client.ui.Image; public class PrefetchUtilities { public static void doTasksDeferred() { - DeferredCommand.addCommand(new IncrementalCommand() { + Scheduler.get().scheduleIncremental(new RepeatingCommand() { int i = 0; int j = 0; @@ -66,7 +66,7 @@ j++; } - boolean notFinished = i + j < lic.length + ext.length; + final boolean notFinished = i + j < lic.length + ext.length; final boolean finished = !notFinished; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherField.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -5,8 +5,8 @@ import org.ourproject.kune.platf.client.services.SearcherConstants; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.Connection; import com.gwtext.client.core.Template; import com.gwtext.client.core.UrlParam; @@ -31,7 +31,7 @@ public AbstractLiveSearcherField(final I18nTranslationService i18n, final String templateText, final String dataProxyUrl, final Listener<LinkDTO> listener) { - DataProxy dataProxy = new HttpProxy(dataProxyUrl, Connection.POST); + final DataProxy dataProxy = new HttpProxy(dataProxyUrl, Connection.POST); final JsonReader reader = new JsonReader(new RecordDef( new FieldDef[] { new StringFieldDef(SHORT_NAME_FIELD), new StringFieldDef(LONG_NAME_FIELD), @@ -67,7 +67,7 @@ super.addListener(new ComboBoxListenerAdapter() { @Override public void onSelect(final ComboBox comboBox, final Record record, final int index) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { final LinkDTO link = new LinkDTO(record.getAsString(SHORT_NAME_FIELD), record.getAsString(LONG_NAME_FIELD), record.getAsString(ICON_URL_FIELD), Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -28,8 +28,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.WindowListenerAdapter; @@ -80,7 +80,7 @@ } }); - Panel panel = new Panel(); + final Panel panel = new Panel(); panel.setBorder(false); registerForm = new RegisterForm(i18n, session); registerForm.setWidth(370); @@ -126,7 +126,7 @@ } public void reset() { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { registerForm.reset(); } @@ -134,7 +134,8 @@ } public void showWelcolmeDialog() { - InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), i18n.t("Thanks for registering"), + final InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), + i18n.t("Thanks for registering"), i18n.t("Now you can participate more actively in this site with other people and groups. " + "You can also use your personal space to publish contents. " + "Your email is not verified, please follow the instructions you will receive by email."), @@ -143,7 +144,8 @@ } public void showWelcolmeDialogNoHomepage() { - InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), i18n.t("Thanks for registering"), + final InfoDialog welcomeDialog = new InfoDialog(WELCOME_DIALOG, i18n.t("Welcome"), + i18n.t("Thanks for registering"), i18n.t("Now you can participate more actively in this site with other people and groups. " + "Your email is not verified, please follow the instructions you will receive by email."), i18n.t("Ok"), WELCOME_OK_BUTTON, true, true, 380, 210); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteprogress/SiteProgressPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -22,9 +22,9 @@ import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import com.calclab.suco.client.ioc.Provider; -import com.google.gwt.user.client.Command; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; @@ -54,7 +54,7 @@ public void hideProgress() { timeProgressMaxTime.cancel(); progressPanel.setVisible(false); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { publicLinkProvider.get().setVisible(true); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -24,8 +24,8 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import com.calclab.suco.client.events.Listener0; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.core.ExtElement; @@ -92,7 +92,7 @@ MessageBox.confirm(title, message, new MessageBox.ConfirmCallback() { public void execute(final String btnID) { if ("yes".equals(btnID)) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { onConfirmed.onEvent(); } 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-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -34,8 +34,8 @@ import com.calclab.emiteuimodule.client.users.UserGridPanel; import com.calclab.suco.client.events.Listener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; import com.gwtext.client.widgets.BoxComponent; @@ -110,7 +110,7 @@ new MessageBox.ConfirmCallback() { public void execute(final String btnID) { if (btnID.equals("yes")) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { presenter.addCollab(groupShortName); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/upload/FileUploaderDialog.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -25,8 +25,8 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.google.gwt.core.client.JavaScriptObject; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.ToolbarButton; @@ -135,7 +135,7 @@ dialog.addListener(new UploadDialogListenerAdapter() { @Override public boolean onBeforeAdd(final UploadDialog source, final String filename) { - boolean mustAdd = presenter.checkFolderChange(); + final boolean mustAdd = presenter.checkFolderChange(); if (!mustAdd) { NotifyUser.important(i18n.t("Please, wait until current uploads are finished to upload new files into another location")); } @@ -181,7 +181,7 @@ } private void setPermittedExtensions(final String[] extensions) { - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { if (dialog == null) { createDialog(false); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/wave/WaveInsertPanel.java 2010-12-08 15:21:36 UTC (rev 1160) @@ -6,8 +6,8 @@ import com.calclab.emiteuimodule.client.dialog.BasicDialogExtended; import com.calclab.emiteuimodule.client.dialog.BasicDialogListener; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.form.Field; import com.gwtext.client.widgets.form.FormPanel; @@ -62,7 +62,7 @@ createForm(); } dialog.show(); - DeferredCommand.addCommand(new Command() { + Scheduler.get().scheduleDeferred(new ScheduledCommand() { public void execute() { waveId.focus(); } Modified: trunk/war/WEB-INF/web.xml =================================================================== --- trunk/war/WEB-INF/web.xml 2010-12-07 22:43:52 UTC (rev 1159) +++ trunk/war/WEB-INF/web.xml 2010-12-08 15:21:36 UTC (rev 1160) @@ -85,83 +85,4 @@ <servlet-name>Proxy</servlet-name> <url-pattern>/http-bind/</url-pattern> </servlet-mapping> - -  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - </web-app> \ No newline at end of file

1 0

r1159 - in trunk: src/main/java/org/ourproject/kune/workspace src/main/java/org/ourproject/kune/workspace/public war war/WEB-INF/lib
by Vicente J. Ruiz Jurado 07 Dec '10

07 Dec '10

Author: vjrj_ Date: 2010-12-07 23:43:52 +0100 (Tue, 07 Dec 2010) New Revision: 1159 Added: trunk/src/main/java/org/ourproject/kune/workspace/public/ Modified: trunk/war/ trunk/war/WEB-INF/lib/ Log: some cleanup, gwt-2.1.0 Property changes on: trunk/src/main/java/org/ourproject/kune/workspace/public ___________________________________________________________________ Name: svn:ignore + js Property changes on: trunk/war ___________________________________________________________________ Name: svn:ignore - .generated ws ws-aux + wave .generated ws ws-aux org.* Property changes on: trunk/war/WEB-INF/lib ___________________________________________________________________ Name: svn:ignore - ant-1.6.5.jar antlr-2.7.6.jar aopalliance-1.0.jar asm-1.5.3.jar asm-attrs-1.5.3.jar avalon-framework-4.1.3.jar bsh-2.0b4.jar c3p0-0.9.1.2.jar cglib-2.1_3.jar classworlds-1.1-alpha-2.jar collect-1.0-rc2.jar commons-beanutils-1.7.0.jar commons-cli-1.2.jar commons-codec-1.3.jar commons-collections-3.2.jar commons-fileupload-1.1.1.jar commons-io-1.2.jar commons-lang-2.0.jar commons-logging-1.1.jar core-3.1.1.jar dom4j-1.6.1.jar dozer-4.0.jar ehcache-1.2.3.jar ejb3-persistence-1.0.2.GA.jar emite-0.4.7.jar ezmorph-1.0.3.jar freemarker-2.3.8.jar geronimo-annotation_1.0_spec-1.0.jar geronimo-spec-jta-1.0.1B-rc4.jar guice-2.0.1.jar guice-assistedinject-2.0.jar guice-servlet-2.0.1.jar gwt-1.2.2.jar gwt-log-2.6.2.jar gwt-log-3.0.1.jar gwt-servlet-2.0.0.jar gwt-user-2.0.0.jar gwt-voices-1.6.0.jar gwtext-2.0.5.jar gwtextux-0.4.0.924.jar h2-1.0.20070617.jar hibernate-3.2.1.ga.jar hibernate-annotations-3.4.0.GA.jar hibernate-commons-annotations-3.3.0.ga.jar hibernate-core-3.3.1.GA.jar hibernate-entitymanager-3.4.0.GA.jar hibernate-search-3.1.0.GA.jar hibernate-tools-3.2.3.GA.jar hibernate-validator-3.1.0.GA.jar javassist-3.4.GA.jar jettison-1.0-RC2.jar jetty-6.1.11.jar jetty-annotations-6.1.11.jar jetty-management-6.1.11.jar jetty-naming-6.1.11.jar jetty-plus-6.1.11.jar jetty-util-6.1.11.jar jline-0.9.94.jar jmagick-6.2.6-0.jar jruby-complete-1.2.0.jar jruby-rack-0.9.4.jar json-lib-2.1-jdk15.jar jsp-2.1-6.1.11.jar jsp-api-2.1-6.1.11.jar jta-1.1.jar jtidy-r8-20060801.jar junit-4.4.jar kune-wave-server-0.0.2.2.jar libidn-1.15.jar liquibase-core-1.7.0.jar liquibase-plugin-1.7.0.0.jar log4j-1.2.14.jar logkit-1.0.1.jar lucene-core-2.4.0.jar mail-1.4.jar maven-artifact-2.0.3.jar maven-artifact-2.0.jar maven-artifact-manager-2.0.jar maven-jetty-plugin-6.1.11.jar maven-model-2.0.jar maven-plugin-api-2.0.jar maven-plugin-descriptor-2.0.jar maven-plugin-tools-api-2.0.jar maven-profile-2.0.jar maven-project-2.0.jar maven-repository-metadata-2.0.jar mockito-all-1.6.jar mysql-connector-java-5.0.5.jar org.mortbay.jetty-5.1.10.jar persistence-api-1.0.jar plexus-container-default-1.0-alpha-8.jar plexus-utils-1.0.4.jar protobuf-java-2.1.0.jar selenium-core-1.0-beta-1.jar selenium-java-client-driver-1.0-beta-1.jar selenium-server-1.0-beta-1-standalone.jar selenium-server-coreless-0.9.1.jar servlet-api-2.4.jar servlet-api-2.5-6.1.11.jar slf4j-api-1.5.2.jar slf4j-log4j12-1.5.2.jar smack-3.0.4.jar smackx-3.0.4.jar smackx-debugger-3.0.4.jar start-6.1.11.jar stax-api-1.0.1.jar suco-0.6.1.jar suco-0.6.5.jar wagon-provider-api-1.0-alpha-5.jar warp-persist-2.0-SNAPSHOT.jar whack-1.0.0.jar xml-apis-1.0.b2.jar xmpp-1.0.0.jar xpp3-1.1.4c.jar xpp3_min-1.1.3.4.O.jar xpp3_xpath-1.1.4c.jar xstream-1.2.2.jar + ant-1.6.5.jar antlr-2.7.6.jar aopalliance-1.0.jar asm-1.5.3.jar asm-attrs-1.5.3.jar avalon-framework-4.1.3.jar bsh-2.0b4.jar c3p0-0.9.1.2.jar cglib-2.1_3.jar classworlds-1.1-alpha-2.jar collect-1.0-rc2.jar commons-beanutils-1.7.0.jar commons-cli-1.2.jar commons-codec-1.3.jar commons-collections-3.2.jar commons-fileupload-1.1.1.jar commons-io-1.2.jar commons-lang-2.0.jar commons-logging-1.1.jar core-3.1.1.jar dom4j-1.6.1.jar dozer-4.0.jar ehcache-1.2.3.jar ejb3-persistence-1.0.2.GA.jar emite-0.4.7.jar ezmorph-1.0.3.jar freemarker-2.3.8.jar geronimo-annotation_1.0_spec-1.0.jar geronimo-spec-jta-1.0.1B-rc4.jar guice-2.0.1.jar guice-assistedinject-2.0.jar guice-servlet-2.0.1.jar gwt-1.2.2.jar gwt-log-2.6.2.jar gwt-log-3.0.1.jar gwt-servlet-2.0.0.jar gwt-user-2.0.0.jar gwt-voices-1.6.0.jar gwtext-2.0.5.jar gwtextux-0.4.0.924.jar h2-1.0.20070617.jar hibernate-3.2.1.ga.jar hibernate-annotations-3.4.0.GA.jar hibernate-commons-annotations-3.3.0.ga.jar hibernate-core-3.3.1.GA.jar hibernate-entitymanager-3.4.0.GA.jar hibernate-search-3.1.0.GA.jar hibernate-tools-3.2.3.GA.jar hibernate-validator-3.1.0.GA.jar javassist-3.4.GA.jar jettison-1.0-RC2.jar jetty-6.1.11.jar jetty-annotations-6.1.11.jar jetty-management-6.1.11.jar jetty-naming-6.1.11.jar jetty-plus-6.1.11.jar jetty-util-6.1.11.jar jline-0.9.94.jar jmagick-6.2.6-0.jar jruby-complete-1.2.0.jar jruby-rack-0.9.4.jar json-lib-2.1-jdk15.jar jsp-2.1-6.1.11.jar jsp-api-2.1-6.1.11.jar jta-1.1.jar jtidy-r8-20060801.jar junit-4.4.jar kune-wave-server-0.0.2.2.jar libidn-1.15.jar liquibase-core-1.7.0.jar liquibase-plugin-1.7.0.0.jar log4j-1.2.14.jar logkit-1.0.1.jar lucene-core-2.4.0.jar mail-1.4.jar maven-artifact-2.0.3.jar maven-artifact-2.0.jar maven-artifact-manager-2.0.jar maven-jetty-plugin-6.1.11.jar maven-model-2.0.jar maven-plugin-api-2.0.jar maven-plugin-descriptor-2.0.jar maven-plugin-tools-api-2.0.jar maven-profile-2.0.jar maven-project-2.0.jar maven-repository-metadata-2.0.jar mockito-all-1.6.jar mysql-connector-java-5.0.5.jar org.mortbay.jetty-5.1.10.jar persistence-api-1.0.jar plexus-container-default-1.0-alpha-8.jar plexus-utils-1.0.4.jar protobuf-java-2.1.0.jar selenium-core-1.0-beta-1.jar selenium-java-client-driver-1.0-beta-1.jar selenium-server-1.0-beta-1-standalone.jar selenium-server-coreless-0.9.1.jar servlet-api-2.4.jar servlet-api-2.5-6.1.11.jar slf4j-api-1.5.2.jar slf4j-log4j12-1.5.2.jar smack-3.0.4.jar smackx-3.0.4.jar smackx-debugger-3.0.4.jar start-6.1.11.jar stax-api-1.0.1.jar suco-0.6.1.jar suco-0.6.5.jar wagon-provider-api-1.0-alpha-5.jar warp-persist-2.0-SNAPSHOT.jar whack-1.0.0.jar xml-apis-1.0.b2.jar xmpp-1.0.0.jar xpp3-1.1.4c.jar xpp3_min-1.1.3.4.O.jar xpp3_xpath-1.1.4c.jar xstream-1.2.2.jar *jar

1 0

07 Dec '10

Author: vjrj_ Date: 2010-12-07 23:38:26 +0100 (Tue, 07 Dec 2010) New Revision: 1158 Added: trunk/img/webtemplate/def-theme-doc-arrow-down.png trunk/img/webtemplate/def-theme-tools-arrow-left.png trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java Removed: trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar trunk/war/WEB-INF/lib/gwt-servlet-2.0.0-SNAPSHOT.jar trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar Modified: trunk/DEV-GUIDE trunk/INSTALL trunk/TODO trunk/TROUBLESHOOT trunk/img/webtemplate/web_template-2011.svg trunk/pom.xml trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java trunk/war/WEB-INF/ trunk/war/WEB-INF/web.xml Log: some cleanup Modified: trunk/DEV-GUIDE =================================================================== --- trunk/DEV-GUIDE 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/DEV-GUIDE 2010-12-07 22:38:26 UTC (rev 1158) @@ -164,6 +164,22 @@ ==Development Environment== +===Prerequisite: Install maven=== + +Install maven2. + +From: +http://google-web-toolkit.googlecode.com/svn/trunk/samples/expenses/README-MAVEN.txt + +Eclipse users will need to install the following plugin components: +- Google Plugin for Eclipse (instructions at http://code.google.com/eclipse/) +- m2eclipse Core +- Maven Integration for WTP (in m2eclipse extras) + Instructions for installing the maven plugins can be found here: + http://m2eclipse.sonatype.org/installing-m2eclipse.html + +Ensure Eclipse is configured to use Java 1.6. + ===Prerequisite: Install kune=== Install kune (see trunk/INSTALL file) and run kune for the first time. Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/INSTALL 2010-12-07 22:38:26 UTC (rev 1158) @@ -11,6 +11,11 @@ - Install java-jdk (>=5), maven2, mysql (> 5.0) and for example eclipse - Install gwt 1.5.3 and follow Appendix A for maven+gwt configuration +=== Wave in a Box === + +https://sites.google.com/a/waveprotocol.org/wave-protocol/code/installation +https://sites.google.com/a/waveprotocol.org/wave-protocol/federation/openfire-installation + ===MYSQL configuration=== ====Before db creation==== @@ -49,7 +54,7 @@ - Compile with maven: # (in the trunk directory) mvn compile -Dliquibase.should.run=false - mvn gwt-maven:compile + mvn gwt:compile - Copy the target to src directory (only for test): ./script/deploy_gwt.sh Modified: trunk/TODO =================================================================== --- trunk/TODO 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/TODO 2010-12-07 22:38:26 UTC (rev 1158) @@ -11,6 +11,22 @@ Use org-mode in emacs to easy manage this file * SHORT-TERM (URGENT) +** new UI library (gwt-ext is dead) +- mosaic, +- gtx +- smartclient +- +** wave client integration +*** Documentation +**** Hosted Mode support for websocket +***** Test that websocket is supported in your GWT Hosted Mode browser: +http://www.websockets.org/ +http://jimbergman.net/websocket-web-browser-test/ +***** if not: +****** Install nighty firefox (for hosted-mode and websocket support) +add-apt-repository ppa:ubuntu-mozilla-daily/ppa +apt-get update + ** Compilation in target... resolve ** tag, resolve last implementation complexity. Summary: recover the: @@ -19,14 +35,11 @@ [Tag] <-1--m-> [TagUserContent (fecha)] <-m--1-> [Content] [User] <-1-------m--^ for user bookmarks/favorites/links -** Use hibernate cache - http://ehcache.sourceforge.net/documentation/openjpa_provider.html - http://ehcache.sourceforge.net/documentation/hibernate.html ** Do something with jetty/jruby alias issue http://jetty.mortbay.org/jetty5/faq/faq_s_400-Security_t_Aliases.html ** Use of webdriver instead of plain selenium http://code.google.com/p/webdriver/ -** New Action class +** New Action (Command) class *** Things to support - [X] menu and toolbars separators (space, bar, expand) - [X] index position insertion (for buttons added by other plugins) @@ -35,6 +48,28 @@ - [X] tongle/push buttons with isPressed (initially and later)... - [X] position id, that is, if we have some toolbars and a list of actions, how to select which action in which toolbar. - [X] radio menu (with group) and check menu item +- [ ] you can set a property in a action and change it in the gui without change the action +- [ ] actions/descriptors can be reused +- [ ] shortcuts +- [ ] Presenter/View separation +- [ ] Injection +- [ ] Many items of some action/description +- [ ] a better binding +https://code.google.com/p/gwt-beans-binding/ +https://code.google.com/p/gwt-beans-binding/wiki/MoreIntroduction +*** Descripción: +Tengo una acción que se asocia a una descripción de UI y que esta se puede traducir a un tipo de Wigdet + +acción <1---m>descrip<1---m>widgets + +avatar (des) ------------> Widget + lazy-menu (des) -------> Widget + lazy-submenu (des)---> Widget + lazy-item (des) ---> Widget + action (act) + +lista de (des) ---> lista de views + ** <s> Changes in UI - [ ] 2:21 (video) add member dialog with confirmation (other way to do confirmation) - [ ] Leave this group, with green icon @@ -45,14 +80,14 @@ - [ ] 2:35 "Start a chat with this member"-> chat! and other long items - [ ] 2.41 long submenus... - [ ] scroll of licenses -** maven-gwt problem (using another plugin from codehaus) +** maven-gwt problem (using another plugin from codehaus) :ARCHIVE: mvn com.totsp.gwt:maven-googlewebtoolkit2-plugin:compile and so on. More info: http://code.google.com/p/gwt-maven/wiki/M2FAQ ** vjrj use xwiki maven repo http://maven.xwiki.org/releases/com/xpn/xwiki/platform/xwiki-web-wysiwyg/1.… -** vjrj <v> better RTE +** vjrj <v> better RTE :ARCHIVE: *** Pending **** Insert/Edit link ***** use cases @@ -72,7 +107,7 @@ http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/samples/in… http://www.mozilla.org/editor/midas-spec.html http://mozilla.org/editor/midasdemo/ -** vjrj <v> GWT 1.6 +** vjrj <v> GWT 1.6 :ARCHIVE: http://code.google.com/intl/es/webtoolkit/doc/1.6/ReleaseNotes_1_6.html#Upg… http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/3e7e… http://code.google.com/p/google-web-toolkit/wiki/WAR_Design_1_6 @@ -107,8 +142,7 @@ Properties Group - Properties - + Properties ** vjrj Styling braimstorming *** layouts - name :: greenforrest @@ -137,6 +171,9 @@ - name :: usercolor - status :: (setted|def) setted - value :: red +**** links +http://lesscss.org/ +http://xcss.antpaw.org/ https://code.google.com/p/xcssframework/ *** logos *** caching *** backgrounds @@ -172,6 +209,7 @@ 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 + Some related: https://code.google.com/p/restful-gwt/ ** vjrj <v> rails group-shortname.kune-site-domain/tool-name/folder-id/doc-id routing, maybe use: http://agilewebdevelopment.com/plugins/request_routing http://wiki.rubyonrails.org/rails/pages/Request+Routing @@ -184,6 +222,10 @@ ** vjrj <v> IconHyperlink.java and IconLabel.java to gwt1.5 * MID-TERM +** Use hibernate cache + http://ehcache.sourceforge.net/documentation/openjpa_provider.html + http://ehcache.sourceforge.net/documentation/hibernate.html + ** TODO <v> Images zoom-in/out with style="cursor: url(somezoomcursor.cur);" http://www.w3.org/TR/SVG/interact.html#Cursors http://www.w3.org/TR/CSS2/ui.html @@ -201,6 +243,8 @@ ** TODO <v> study opensocial, openstack and related http://developer.yahoo.net/blog/archives/2008/12/the_open_stack.html ** TODO <v> Use of command key ⌘ for Mac shortcuts +** TODO <s> Find the way to use: "NOYB: Privacy in online social networks" + http://www.citeulike.org/user/dartar/article/4252739 ** TODO <v,s> harden our privacy policy. Goals: - permit user/projects/contents how much private or public are - APIs public only to associated sites (in study) ( http://oauth.net ? ) Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/TROUBLESHOOT 2010-12-07 22:38:26 UTC (rev 1158) @@ -51,4 +51,14 @@ If running all the Kune test you get errors about "Too many files open" see: http://code.google.com/p/gwt-examples/wiki/gwtEclipseFaqs -about how to fix it in your system. \ No newline at end of file +about how to fix it in your system. + +=== Mysql: Caused by: java.sql.SQLException: Access denied for user 'kune'@'localhost' (using password: YES) === + +Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT senteces of the INSTALL. + +If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. + +=== Eclipse === + +If you have some tests with error like "can not be found in source packages. Check the inheritance chain from your module; it may not be inheriting a required module or a module may not be adding its source path entries properly" and you have installed GWTDesigner, uncheck "client classpath": http://code.google.com/webtoolkit/tools/gwtdesigner/preferences/gwt/prefere… Added: trunk/img/webtemplate/def-theme-doc-arrow-down.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/def-theme-doc-arrow-down.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/webtemplate/def-theme-tools-arrow-left.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/def-theme-tools-arrow-left.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/img/webtemplate/web_template-2011.svg 2010-12-07 22:38:26 UTC (rev 1158) @@ -49,18 +49,18 @@ pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" - inkscape:pageopacity="1" + inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="561.99451" - inkscape:cy="595.80311" - inkscape:current-layer="layer2" + inkscape:zoom="0.6953125" + inkscape:cx="512" + inkscape:cy="729.16854" + inkscape:current-layer="layer1" inkscape:document-units="px" showgrid="false" inkscape:window-width="1280" - inkscape:window-height="973" + inkscape:window-height="749" inkscape:window-x="0" - inkscape:window-y="24" + inkscape:window-y="1024" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="true" @@ -101,7 +101,8 @@ <g inkscape:groupmode="layer" id="layer2" - inkscape:label="browser"> + inkscape:label="browser" + sodipodi:insensitive="true"> <rect style="color:#000000;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect5254" @@ -2194,7 +2195,7 @@ </g> <g id="layer1" - inkscape:label="Layer 1" + inkscape:label="normal" inkscape:groupmode="layer" style="display:inline"> <rect @@ -2208,7 +2209,7 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <g - style="display:inline;opacity:0.5" + style="opacity:0.5;display:inline" id="g5064" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -2221,7 +2222,7 @@ inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" id="path5050" d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" - style="font-size:58.13353347999999698px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" /> + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" /> <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -2233,31 +2234,31 @@ transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5054" d="m 60.321717,411.99998 377.014613,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247000000033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5056" d="m 252.61203,788.60332 0,-377.01178" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958000000355;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5058" d="m 252.86937,597.15755 377.0124,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721000000248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5060" d="m 437.45588,596.97447 0,-377.01491" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195000000463;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> <path inkscape:connector-curvature="0" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5062" d="m 372.87905,411.27704 64.93441,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947905999999364;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> </g> </g> <g @@ -2295,7 +2296,7 @@ id="g5365"> <path transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" - d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" + d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -2305,7 +2306,7 @@ sodipodi:type="arc" /> <path transform="matrix(0.05245387,0,0,0.05245387,400.1808,-0.554549)" - d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" + d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -2329,7 +2330,7 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <text - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu" id="text5373" font-size="11" x="1626.7657" @@ -2367,7 +2368,7 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <rect - style="opacity:1;color:#000000;fill:#f4e3d7;stroke:none;stroke-width:0.99999981999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#f4e3d7;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3017" width="810" height="130" @@ -2378,16 +2379,6 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - <rect - transform="matrix(0,1,1,0,0,0)" - ry="5" - rx="5.0000005" - y="93.094986" - x="-115.88918" - height="343" - width="63" - id="rect3248" - style="opacity:0.5;color:#000000;fill:#666666;stroke:#808080;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <text xml:space="preserve" style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#cccccc;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" @@ -2440,7 +2431,7 @@ sodipodi:role="line">50x50</tspan></text> </g> <rect - style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999963999999997;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999964;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3089" width="800" height="520" @@ -2453,7 +2444,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:56px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#550000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial Bold;opacity:0.68400002" + style="font-size:56px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.68399999;fill:#550000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="91.84803" y="201.77293" id="text3096" @@ -2464,7 +2455,8 @@ sodipodi:role="line" id="tspan3098" x="91.84803" - y="201.77293">Name of Initiative</tspan></text> + y="201.77293" + style="-inkscape-font-specification:Ubuntu Bold;font-family:Ubuntu;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal">Name of the Initiative</tspan></text> <text sodipodi:linespacing="125%" id="text3073-8" @@ -2476,63 +2468,6 @@ x="-806.35638" sodipodi:role="line" id="tspan3125">centrado vertical/horizontal, tamaño y color letra, editor ??? mmm igual...</tspan></text> - <rect - style="color:#000000;fill:#4d4d4d;fill-opacity:0.98431373;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3460" - width="60.841721" - height="341.04489" - x="-114.73091" - y="94.094986" - rx="5" - ry="5" - transform="matrix(0,1,1,0,0,0)" /> - <image - y="-107.88917" - x="103.09499" - id="image3210" - xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABkAGQDASIA AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii gAooooAKY7rGpZ2Cj1JxWZqmqfZAYoQDLjknoo9ff6Vzsksksu+RmdiTgk5IH9KuMG9SHNJ2OxS7 t5DtSeJm9A4JqeuAkQFeeTn86bZ67d6VMAXMttnDRk5x9Cen8v5hunbYFPueg0VXtbmK8to7iFw0 bjKkVYrMsKKKKACiiigAooooASmSyLFE8jfdVST9AKkqjqr+Xpk59QB+ZA/rQtxM5WSVppXlc5Zi SeeB7e1M5ySSDx+VAIx1PToKDyTxj6iuowGuODxkkevSsm+HBHBPt2rWkPB4zwayb08Ec/lQxo3v A98xe50+RjgASxg9hnDfqR+tdrXmXhCUp4ngUDiRXQ8+ik/j0Fem1zzWprHYKKKKkoKKKKACiiig AqnqieZps6+ilvy5/pVymSIJI2RujAgj60LRiZw579h/OgnoScDHAFDApIyMCHUkN7GkJGB06+vT /GuowGSnCEDIH0rFvXySMkjPY9K0rqXg9ck81hXMm44BwPek2M2fBsYl8SRt/wA80duvTIx/WvSx XDeAbbMt5dEYAVY1Prnk/wAh+ddzWE3qax2CiiipKCiiigAooooAKKKKAOL8QQGx1IygHy58sMDo 3cf1/Gsh7sADnt0B6V3er2UF9p8sNwwRfvCQn7hHQ15XK7xyFCc4OMjoa3hLQyktSzc3OSew+tZ5 JcjHJz6fp70E5JyMn3NdH4MsbS81NpZ5EMkADRxHALH+97gfzIP1G7K4Ja2Ox8OaadL0aGCQYmb9 5J/vHt+AwPwrXNFJWD1NRaKKKACiiigAoo7VSvr9LKIMRuduFUd6EribLbMEUsxAA6knisu71y3g ysX71/Y4X8+/4ZrBub2e7YtMxIB4UHAH4f1qD19cdMVtGn3Ic+xLfXlxfZEj/KOQo+6P8awbu0yT gcVs4Bzkkk+9RtGrk9CMHv1rSySsiLtnLNAwONpwT370+CGVZQ6MyuDlShIII7gjp9a3mtFJJwMC nR2ip2ANKwGxpPiK4WNYr8GUY/1q8MPqOn+e9dJb3cF2m6CVXHcA4I+o6iuLVAFHtTGDKwdGZWBy GU4I+hFQ6aexam+p6BRXH6X4meKZbfUG3RkgLMeCp/2vUe/866+smmty077C0UUUhiZwMnpXHX10 by6eTtnCj2H8v/r10uqS+Tp0zDqV2/mcVyJOBwCTjsela0l1M5voB4AGMnPbvQAc4GRkY5/zxSYx xwCBSnggDk/yrYzADgdScdh0oPAPTpQc4POKOAcZJP8AKgAI5PA6dqTqAegzwAOv+NL256+nrRwA ACSfYUABxk8frTWAK46nH+fpTiMEdc5/KkY/KcZJx2PSgDKvkwDwM57d66zwhqZvNOa1kJMtsQuT 3U9PywR+ArlrwYUjjIHNS+ErkweJI4x92ZGRvbjI/UD86zmrouL1PSaKKKwNTK14/wCgKPWQA/ka 5odvpRRW9LYxnuIOh/GjFFFaEinv9f6U0nCgiiigBcdKF+YjNFFAAOWx7Udh9KKKAM27+4341U0p jHr9gV4JuIx+bYooqHsyo7nrFFFFc5sf/9k= " - height="44" - width="44" /> - <text - xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffe6d5;fill-opacity:1;stroke:none;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" - x="154.33131" - y="-98.012215" - id="text3213" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan3215" - x="154.33131" - y="-98.012215" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffe6d5;font-family:Verdana;-inkscape-font-specification:Verdana Bold">Some notice/info/alert title</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3217" - y="-80.012222" - x="154.33131" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana" - xml:space="preserve"><tspan - sodipodi:role="line" - id="tspan3221" - x="154.33131" - y="-80.012222">Lorem ipsum dolor sit amet, consectetuer</tspan><tspan - sodipodi:role="line" - x="154.33131" - y="-63.762222" - id="tspan3223">adipiscing elit.</tspan></text> - <text - xml:space="preserve" - style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:none;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" - x="433.41605" - y="-98.677803" - id="text3213-2" - sodipodi:linespacing="125%" - transform="scale(0.96997425,1.0309552)"><tspan - sodipodi:role="line" - id="tspan3215-7" - x="433.41605" - y="-98.677803" - style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff7f2a;font-family:Verdana;-inkscape-font-specification:Verdana Bold">x</tspan></text> <g id="g3877" style="fill:#a05a2c" @@ -2581,6 +2516,17 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <image + style="display:inline" + y="896.93811" + x="22.615988" + id="image15604-0" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAaCAIAAADuRDFPAAAAA3NCSVQICAjb4U/gAAAARklEQVQo kWPccewmA17A8unJRfwqGP///49fBRN+abqpYCHoUpZ///5RrOLv3790sGXouGPIuJSIFHT27FkC Kk7cLcSvAgArDTxriRhPvAAAAABJRU5ErkJggg== " + height="35.304516" + width="768.22107" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <g id="g3882" style="fill:#deaa87" @@ -2619,7 +2565,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="543.98315" y="692.14264" id="text3922" @@ -2695,7 +2641,7 @@ sodipodi:type="arc" /> <text xml:space="preserve" - style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#c8b7b7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#c8b7b7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="314.99805" y="213.47852" id="text5381" @@ -2714,7 +2660,7 @@ id="text14833" y="693.54028" x="377.75659" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#280b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -2845,7 +2791,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="22.983185" y="288.14264" id="text15331" @@ -2857,7 +2803,7 @@ sodipodi:role="line" x="22.983185" y="288.14264" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold">Editors:</tspan></text> + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold">Editors:</tspan></text> <image y="298.61829" x="280" @@ -2908,44 +2854,61 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - <g - id="g3772" - transform="matrix(1,0,0,1.0231188,0,-7.8217817)"> - <rect - y="338.32956" - x="821" - height="28.999994" - width="193" - id="rect3770" - style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" - transform="matrix(0.13329382,-0.09764957,0.03845747,0.33845395,702.43998,372.86271)" - inkscape:transform-center-y="-2.9508384" - inkscape:transform-center-x="0.48626974" - d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.3561945" - sodipodi:arg1="1.3089969" - sodipodi:r2="25.591238" - sodipodi:r1="47.539455" - sodipodi:cy="177" - sodipodi:cx="817" - sodipodi:sides="3" - id="path24758" - style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - </g> + <rect + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3770" + width="193" + height="29.670439" + x="821" + y="338.32956" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path24758" + sodipodi:sides="3" + sodipodi:cx="817" + sodipodi:cy="177" + sodipodi:r1="47.539455" + sodipodi:r2="25.591238" + sodipodi:arg1="1.3089969" + sodipodi:arg2="2.3561945" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" + inkscape:transform-center-x="0.48626974" + inkscape:transform-center-y="-2.9508384" + transform="matrix(0.13329382,-0.09990711,0.03845747,0.3462786,702.43998,373.66107)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/def-theme-tools-arrow-left.png" + transform="matrix(0.13329382,-0.09990711,0.03845747,0.3462786,-22.253699,-165.29606)" + inkscape:transform-center-y="-2.9508384" + inkscape:transform-center-x="0.48626974" + d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.3561945" + sodipodi:arg1="1.3089969" + sodipodi:r2="25.591238" + sodipodi:r1="47.539455" + sodipodi:cy="177" + sodipodi:cx="817" + sodipodi:sides="3" + id="path4530" + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> <text sodipodi:linespacing="125%" id="text3910" y="361.39798" x="832.44855" - style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -2967,7 +2930,7 @@ style="fill:#ffffff">gallery</tspan></text> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="830.96289" y="171.00255" id="text3886-8" @@ -3104,7 +3067,7 @@ id="text15696" y="199.23106" x="832.42969" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3128,17 +3091,17 @@ id="text15702" y="287.14264" x="495.33279" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" y="287.14264" x="495.33279" sodipodi:role="line" id="tspan15704">Just</tspan><tspan - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" y="307.14264" x="495.33279" sodipodi:role="line" @@ -3158,7 +3121,7 @@ id="text15823" y="687.00311" x="832.96289" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3229,7 +3192,7 @@ id="flowPara17974-3">Click here to reply</flowPara></flowRoot> </g> <text xml:space="preserve" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold;opacity:0.58959998" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.58959997;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="833" y="714.41913" id="text19962" @@ -3291,7 +3254,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="633.75659" y="726.54028" id="text22973" @@ -3358,7 +3321,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" x="399" y="129" id="text23159" @@ -3393,7 +3356,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="832.42969" y="269.2316" id="text24744" @@ -3405,26 +3368,6 @@ id="tspan24746" x="832.42969" y="269.2316">collabs (5)</tspan></text> - <g - id="g24752" - style="fill:#b3b3b3;stroke:#333333"> - <rect - ry="10" - rx="10" - y="-359.61053" - x="144.42018" - height="245.19261" - width="646.41687" - id="rect24748" - style="color:#000000;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#333333;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect24750" - width="646.41687" - height="203.1873" - x="144.42018" - y="-359.61053" /> - </g> <image y="117" x="12" @@ -3459,7 +3402,7 @@ y="157.5835" /> <text xml:space="preserve" - style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" x="795" y="163" id="text25501" @@ -3488,7 +3431,7 @@ id="text3670" y="726.54028" x="25.756592" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3546,7 +3489,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" x="175.75659" y="729.54028" id="text3814" @@ -3561,7 +3504,7 @@ sodipodi:role="line" x="175.75659" y="743.54028" - style="font-size:14px;font-style:italic;font-weight:normal;fill:#784421;-inkscape-font-specification:Arial Italic" + style="font-size:14px;font-style:italic;font-weight:normal;fill:#784421;-inkscape-font-specification:Ubuntu Italic" id="tspan3822">Average</tspan></text> <image width="16" @@ -3648,7 +3591,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:28px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="24.369394" y="245.97888" id="text3886" @@ -3665,7 +3608,7 @@ id="text3900" y="243.22296" x="802.5" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3938,7 +3881,7 @@ inkscape:export-ydpi="90" /> <text xml:space="preserve" - style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial Bold" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="29.756592" y="691.54028" id="text4986" @@ -3962,7 +3905,7 @@ id="text4994" y="692.39124" x="80.670654" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" xml:space="preserve" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" @@ -3971,13 +3914,13 @@ x="80.670654" sodipodi:role="line" id="tspan4996" /><tspan - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" y="708.39124" x="80.670654" sodipodi:role="line" id="tspan4998"><tspan id="tspan5000" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">resilence environmentalism</tspan></tspan></text> + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu">resilence environmentalism</tspan></tspan></text> <rect style="color:#000000;fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect5031" @@ -4346,7 +4289,7 @@ style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path inkscape:connector-curvature="0" - d="m 20.573805,323.77693 c 0.152924,0.57507 0.190497,1.17498 0.15438,1.76718 -0.03038,0.26753 -0.121684,0.48473 -0.291308,0.69455 -0.05586,0.0691 -0.18559,0.1635 -0.253587,0.2239 -0.0064,0.004 -0.02135,0.0183 -0.01911,0.0113 0.01018,-0.032 0.05721,-0.11837 0.05401,-0.085 -0.01041,0.10883 -0.06511,0.26591 -0.09474,0.36487 -0.07868,0.16821 -0.112655,0.33065 -0.102349,0.51384 0.01597,0.11208 0.01426,0.22748 0.03304,0.33912 0.0024,0.0144 0.02196,0.0204 0.02816,0.0336 0.01305,0.0278 0.02409,0.0565 0.03613,0.0848 -6.23e-4,-0.013 -0.01432,-0.0425 -0.0019,-0.0389 0.04858,0.0143 0.265848,0.41908 0.284445,0.45886 0.0977,0.26582 0.07306,0.56157 0.168262,0.82748 0.01231,0.0377 0.02537,0.0751 0.03692,0.113 0.01406,0.0461 0.02814,0.0923 0.03991,0.13906 0.05093,0.20228 -0.08389,-0.15547 -0.119085,-0.15324 -0.386212,0.0245 -0.742151,0.2236 -1.121497,0.30012 -0.242456,-0.51088 -0.477321,-1.02482 -0.710692,-1.53981 -0.246429,-0.55372 -0.253659,-0.99784 0.285992,-1.38235 0.04475,-0.004 0.168369,-0.15396 0.123736,-0.12156 0.02449,-0.33118 0.112354,-0.6537 0.190996,-0.97535 0.04732,-0.34253 0.21472,-0.65415 0.279775,-0.99151 0.0025,-0.20834 0.06008,-0.40976 0.06091,-0.61779 -0.149925,-0.35672 -0.312136,-0.71027 -0.478623,-1.06091 -0.26978,-0.66785 -0.465661,-1.36167 -0.582712,-2.07194 -0.01121,-0.0611 -0.02262,-0.12221 -0.03363,-0.18336 -0.03341,-0.18548 -0.04585,-0.35767 -0.05157,-0.54551 -4.45e-4,-0.0146 -0.0036,0.029 -0.0053,0.0435 -0.100414,-0.34534 -0.114979,-0.70893 -0.120994,-1.06627 0.0084,-0.37328 0.137147,-0.72506 0.207447,-1.08726 0.02507,-0.12993 -0.02975,-0.25877 -0.02843,-0.3878 7.42e-4,-0.0725 0.01112,-0.14455 0.01668,-0.21683 0.147649,-0.67103 0.638135,-0.85851 1.293095,-0.70947 0.104303,0.0237 0.182638,0.11142 0.273957,0.16712 0.487193,0.51748 0.600238,1.22058 0.756263,1.88746 0.05177,0.30153 0.140306,0.59513 0.192741,0.89647 0.0039,0.0223 -0.01959,-0.0409 -0.02986,-0.0611 0.436253,0.65055 -0.209482,1.04999 -0.669286,1.3222 -0.109503,0.0513 -0.219006,0.10261 -0.32851,0.15391 -0.08291,0.0535 -0.838974,-1.11904 -0.756065,-1.17251 l 0,0 c 0.08843,-0.0284 0.176862,-0.0567 0.265293,-0.0851 0.0051,-0.002 0.369146,-0.15174 0.406751,-0.14902 0.02297,0.002 0.02195,0.0424 0.02228,0.0654 0.01563,1.11418 -0.09589,0.13072 0.05376,0.59606 0.0054,0.0169 -0.0252,-0.025 -0.03779,-0.0374 -0.267161,-0.37013 -0.391892,-0.81677 -0.49436,-1.25688 -0.07078,-0.29586 -0.115053,-0.59632 -0.187672,-0.89135 -0.01758,-0.0714 -0.04052,-0.14145 -0.06031,-0.2123 -0.0094,-0.0337 -0.03448,-0.067 -0.02729,-0.10127 0.0034,-0.0162 0.02912,0.0155 0.04367,0.0233 0.374498,0.21284 0.518061,-0.0415 0.548405,-0.30106 -0.01397,-0.0627 -0.0091,-0.0472 0.0025,0.0721 0.01751,0.17884 0.03861,0.35811 0.02396,0.53815 -0.02971,0.31474 -0.10458,0.62065 -0.148567,0.93308 0.0024,0.30786 -0.0031,0.61647 0.02662,0.92327 0.0042,0.0545 0.0085,0.10892 0.01275,0.16338 0.0012,0.0157 -0.006,-0.0316 -0.0038,-0.0472 6.59e-4,-0.005 0.0071,0.006 0.0091,0.0103 0.01354,0.0279 0.02543,0.0566 0.03723,0.0852 0.07737,0.18792 0.06451,0.16332 0.138576,0.38357 0.174323,0.61826 0.331487,1.24175 0.549165,1.84694 0.207571,0.52126 0.44834,1.05232 0.454103,1.62306 -0.02852,0.21541 -0.08288,0.42877 -0.06521,0.6472 -0.03177,0.40698 -0.155031,0.78942 -0.274426,1.1779 -0.0847,0.25327 -0.170497,0.50873 -0.205516,0.77312 -0.05828,0.41565 -0.217814,0.73129 -0.556481,0.99078 -0.02748,0.0128 -0.06958,0.0659 -0.08243,0.0385 -0.01879,-0.0401 0.03269,-0.0829 0.04126,-0.12639 0.01344,-0.0682 0.02374,-0.13754 0.02445,-0.20703 0.001,-0.10289 -0.07245,-0.1992 0.0431,-0.013 0.03885,0.0626 0.07699,0.12564 0.11548,0.18845 0.328368,0.59093 0.625581,1.2148 0.726699,1.88937 0.0072,0.60892 0.09871,0.549 -1.087597,0.70048 -0.131349,0.0168 -0.269771,-0.54218 -0.303566,-0.63599 -0.04574,-0.19534 -0.123348,-0.48077 -0.09005,-0.66554 -0.08903,-0.12454 -0.212933,-0.29025 -0.291171,-0.43514 -0.121319,-0.27311 -0.185132,-0.55276 -0.187106,-0.85263 -0.0065,-0.30977 0.02257,-0.61728 0.153239,-0.90283 0.136806,-0.26568 0.09794,-0.6052 0.378847,-0.81451 0.05239,-0.025 0.1641,-0.15532 0.16429,-0.1245 2.78e-4,0.045 -0.07276,0.1455 -0.02998,0.13159 0.009,-0.003 0.0017,-0.0188 0.0026,-0.0282 -0.06211,-0.54199 -0.132928,-1.08628 -0.121163,-1.63282 -0.01095,-0.0914 1.281744,-0.24622 1.292691,-0.15482 z" + d="m 20.573805,323.77693 c 0.152924,0.57507 0.190497,1.17498 0.15438,1.76718 -0.03038,0.26753 -0.121684,0.48473 -0.291308,0.69455 -0.05586,0.0691 -0.18559,0.1635 -0.253587,0.2239 -0.0064,0.004 -0.02135,0.0183 -0.01911,0.0113 0.01018,-0.032 0.05721,-0.11837 0.05401,-0.085 -0.01041,0.10883 -0.06511,0.26591 -0.09474,0.36487 -0.07868,0.16821 -0.112655,0.33065 -0.102349,0.51384 0.01597,0.11208 0.01426,0.22748 0.03304,0.33912 0.0024,0.0144 0.02196,0.0204 0.02816,0.0336 0.01305,0.0278 0.02409,0.0565 0.03613,0.0848 -6.23e-4,-0.013 -0.01432,-0.0425 -0.0019,-0.0389 0.04858,0.0143 0.265848,0.41908 0.284445,0.45886 0.0977,0.26582 0.07306,0.56157 0.168262,0.82748 0.01231,0.0377 0.02537,0.0751 0.03692,0.113 0.01406,0.0461 0.02814,0.0923 0.03991,0.13906 0.05093,0.20228 -0.08389,-0.15547 -0.119085,-0.15324 -0.386212,0.0245 -0.742151,0.2236 -1.121497,0.30012 -0.242456,-0.51088 -0.477321,-1.02482 -0.710692,-1.53981 -0.246429,-0.55372 -0.253659,-0.99784 0.285992,-1.38235 0.04475,-0.004 0.168369,-0.15396 0.123736,-0.12156 0.02449,-0.33118 0.112354,-0.6537 0.190996,-0.97535 0.04732,-0.34253 0.21472,-0.65415 0.279775,-0.99151 0.0025,-0.20834 0.06008,-0.40976 0.06091,-0.61779 -0.149925,-0.35672 -0.312136,-0.71027 -0.478623,-1.06091 -0.26978,-0.66785 -0.465661,-1.36167 -0.582712,-2.07194 -0.01121,-0.0611 -0.02262,-0.12221 -0.03363,-0.18336 -0.03341,-0.18548 -0.04585,-0.35767 -0.05157,-0.54551 -4.45e-4,-0.0146 -0.0036,0.029 -0.0053,0.0435 -0.100414,-0.34534 -0.114979,-0.70893 -0.120994,-1.06627 0.0084,-0.37328 0.137147,-0.72506 0.207447,-1.08726 0.02507,-0.12993 -0.02975,-0.25877 -0.02843,-0.3878 7.42e-4,-0.0725 0.01112,-0.14455 0.01668,-0.21683 0.147649,-0.67103 0.638135,-0.85851 1.293095,-0.70947 0.104303,0.0237 0.182638,0.11142 0.273957,0.16712 0.487193,0.51748 0.600238,1.22058 0.756263,1.88746 0.05177,0.30153 0.140306,0.59513 0.192741,0.89647 0.0039,0.0223 -0.01959,-0.0409 -0.02986,-0.0611 0.436253,0.65055 -0.209482,1.04999 -0.669286,1.3222 -0.109503,0.0513 -0.219006,0.10261 -0.32851,0.15391 -0.08291,0.0535 -0.838974,-1.11904 -0.756065,-1.17251 l 0,0 c 0.08843,-0.0284 0.176862,-0.0567 0.265293,-0.0851 0.0051,-0.002 0.369146,-0.15174 0.406751,-0.14902 0.02297,0.002 0.02195,0.0424 0.02228,0.0654 0.01563,1.11418 -0.09589,0.13072 0.05376,0.59606 0.0054,0.0169 -0.0252,-0.025 -0.03779,-0.0374 -0.267161,-0.37013 -0.391892,-0.81677 -0.49436,-1.25688 -0.07078,-0.29586 -0.115053,-0.59632 -0.187672,-0.89135 -0.01758,-0.0714 -0.04052,-0.14145 -0.06031,-0.2123 -0.0094,-0.0337 -0.03448,-0.067 -0.02729,-0.10127 0.0034,-0.0162 0.02912,0.0155 0.04367,0.0233 0.374498,0.21284 0.518061,-0.0415 0.548405,-0.30106 -0.01397,-0.0627 -0.0091,-0.0472 0.0025,0.0721 0.01751,0.17884 0.03861,0.35811 0.02396,0.53815 -0.02971,0.31474 -0.10458,0.62065 -0.148567,0.93308 0.0024,0.30786 -0.0031,0.61647 0.02662,0.92327 0.0042,0.0545 0.0085,0.10892 0.01275,0.16338 0.0012,0.0157 -0.006,-0.0316 -0.0038,-0.0472 6.59e-4,-0.005 0.0071,0.006 0.0091,0.0103 0.01354,0.0279 0.02543,0.0566 0.03723,0.0852 0.07737,0.18792 0.06451,0.16332 0.138576,0.38357 0.174323,0.61826 0.331487,1.24175 0.549165,1.84694 0.207571,0.52126 0.44834,1.05232 0.454103,1.62306 -0.02852,0.21541 -0.08288,0.42877 -0.06521,0.6472 -0.03177,0.40698 -0.155031,0.78942 -0.274426,1.1779 -0.0847,0.25327 -0.170497,0.50873 -0.205516,0.77312 -0.05828,0.41565 -0.217814,0.73129 -0.556481,0.99078 -0.02748,0.0128 -0.06958,0.0659 -0.08243,0.0385 -0.01879,-0.0401 0.03269,-0.0829 0.04126,-0.12639 0.01344,-0.0682 0.02374,-0.13754 0.02445,-0.20703 10e-4,-0.10289 -0.07245,-0.1992 0.0431,-0.013 0.03885,0.0626 0.07699,0.12564 0.11548,0.18845 0.328368,0.59093 0.625581,1.2148 0.726699,1.88937 0.0072,0.60892 0.09871,0.549 -1.087597,0.70048 -0.131349,0.0168 -0.269771,-0.54218 -0.303566,-0.63599 -0.04574,-0.19534 -0.123348,-0.48077 -0.09005,-0.66554 -0.08903,-0.12454 -0.212933,-0.29025 -0.291171,-0.43514 -0.121319,-0.27311 -0.185132,-0.55276 -0.187106,-0.85263 -0.0065,-0.30977 0.02257,-0.61728 0.153239,-0.90283 0.136806,-0.26568 0.09794,-0.6052 0.378847,-0.81451 0.05239,-0.025 0.1641,-0.15532 0.16429,-0.1245 2.78e-4,0.045 -0.07276,0.1455 -0.02998,0.13159 0.009,-0.003 0.0017,-0.0188 0.0026,-0.0282 -0.06211,-0.54199 -0.132928,-1.08628 -0.121163,-1.63282 -0.01095,-0.0914 1.281744,-0.24622 1.292691,-0.15482 z" id="path3728" style="color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path @@ -4466,5 +4409,259 @@ id="path24758-0" style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#c87137;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4528" + sodipodi:sides="3" + sodipodi:cx="817" + sodipodi:cy="177" + sodipodi:r1="47.539455" + sodipodi:r2="25.591238" + sodipodi:arg1="1.3089969" + sodipodi:arg2="2.3561945" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 829.30412,222.91959 -58.22371,-58.2237 79.53506,-21.31136 z" + inkscape:transform-center-x="2.9508382" + inkscape:transform-center-y="0.4862702" + transform="matrix(-0.09990711,-0.13329382,0.3462786,-0.03845747,62.31919,-73.11654)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/def-theme-doc-arrow-down.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> </g> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="overlay" + sodipodi:insensitive="true" + style="display:none"> + <rect + style="opacity:0.68399999;color:#000000;fill:#f7ebe3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3865" + width="1017" + height="654" + x="5" + y="111" + ry="0" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="dialogs" + style="display:none"> + <rect + transform="matrix(0,1,1,0,0,0)" + ry="5" + rx="5.0000005" + y="138.96637" + x="375.22134" + height="343" + width="63" + id="rect3248" + style="opacity:0.5;color:#000000;fill:#666666;stroke:#808080;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3460" + width="60.841721" + height="341.04489" + x="376.37964" + y="139.96637" + rx="5" + ry="5" + transform="matrix(0,1,1,0,0,0)" /> + <image + style="display:inline" + y="383.22137" + x="148.96637" + id="image3210" + xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a HBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCABkAGQDASIA AhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA AAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3 ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm p6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA AwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx BhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3 uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii gAooooAKY7rGpZ2Cj1JxWZqmqfZAYoQDLjknoo9ff6Vzsksksu+RmdiTgk5IH9KuMG9SHNJ2OxS7 t5DtSeJm9A4JqeuAkQFeeTn86bZ67d6VMAXMttnDRk5x9Cen8v5hunbYFPueg0VXtbmK8to7iFw0 bjKkVYrMsKKKKACiiigAooooASmSyLFE8jfdVST9AKkqjqr+Xpk59QB+ZA/rQtxM5WSVppXlc5Zi SeeB7e1M5ySSDx+VAIx1PToKDyTxj6iuowGuODxkkevSsm+HBHBPt2rWkPB4zwayb08Ec/lQxo3v A98xe50+RjgASxg9hnDfqR+tdrXmXhCUp4ngUDiRXQ8+ik/j0Fem1zzWprHYKKKKkoKKKKACiiig AqnqieZps6+ilvy5/pVymSIJI2RujAgj60LRiZw579h/OgnoScDHAFDApIyMCHUkN7GkJGB06+vT /GuowGSnCEDIH0rFvXySMkjPY9K0rqXg9ck81hXMm44BwPek2M2fBsYl8SRt/wA80duvTIx/WvSx XDeAbbMt5dEYAVY1Prnk/wAh+ddzWE3qax2CiiipKCiiigAooooAKKKKAOL8QQGx1IygHy58sMDo 3cf1/Gsh7sADnt0B6V3er2UF9p8sNwwRfvCQn7hHQ15XK7xyFCc4OMjoa3hLQyktSzc3OSew+tZ5 JcjHJz6fp70E5JyMn3NdH4MsbS81NpZ5EMkADRxHALH+97gfzIP1G7K4Ja2Ox8OaadL0aGCQYmb9 5J/vHt+AwPwrXNFJWD1NRaKKKACiiigAoo7VSvr9LKIMRuduFUd6EribLbMEUsxAA6knisu71y3g ysX71/Y4X8+/4ZrBub2e7YtMxIB4UHAH4f1qD19cdMVtGn3Ic+xLfXlxfZEj/KOQo+6P8awbu0yT gcVs4Bzkkk+9RtGrk9CMHv1rSySsiLtnLNAwONpwT370+CGVZQ6MyuDlShIII7gjp9a3mtFJJwMC nR2ip2ANKwGxpPiK4WNYr8GUY/1q8MPqOn+e9dJb3cF2m6CVXHcA4I+o6iuLVAFHtTGDKwdGZWBy GU4I+hFQ6aexam+p6BRXH6X4meKZbfUG3RkgLMeCp/2vUe/866+smmty077C0UUUhiZwMnpXHX10 by6eTtnCj2H8v/r10uqS+Tp0zDqV2/mcVyJOBwCTjsela0l1M5voB4AGMnPbvQAc4GRkY5/zxSYx xwCBSnggDk/yrYzADgdScdh0oPAPTpQc4POKOAcZJP8AKgAI5PA6dqTqAegzwAOv+NL256+nrRwA ACSfYUABxk8frTWAK46nH+fpTiMEdc5/KkY/KcZJx2PSgDKvkwDwM57d66zwhqZvNOa1kJMtsQuT 3U9PywR+ArlrwYUjjIHNS+ErkweJI4x92ZGRvbjI/UD86zmrouL1PSaKKKwNTK14/wCgKPWQA/ka 5odvpRRW9LYxnuIOh/GjFFFaEinv9f6U0nCgiiigBcdKF+YjNFFAAOWx7Udh9KKKAM27+4341U0p jHr9gV4JuIx+bYooqHsyo7nrFFFFc5sf/9k= " + height="44" + width="44" /> + <text + xml:space="preserve" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffe6d5;fill-opacity:1;stroke:none;display:inline;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" + x="200.2027" + y="393.09833" + id="text3213" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3215" + x="200.2027" + y="393.09833" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffe6d5;font-family:Verdana;-inkscape-font-specification:Verdana Bold">Some notice/info/alert title</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3217" + y="411.09833" + x="200.2027" + style="font-size:13px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Verdana;-inkscape-font-specification:Verdana" + xml:space="preserve"><tspan + sodipodi:role="line" + id="tspan3221" + x="200.2027" + y="411.09833">Lorem ipsum dolor sit amet, consectetuer</tspan><tspan + sodipodi:role="line" + x="200.2027" + y="427.34833" + id="tspan3223">adipiscing elit.</tspan></text> + <text + xml:space="preserve" + style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff7f2a;fill-opacity:1;stroke:none;display:inline;font-family:Handmedown;-inkscape-font-specification:Verdana Bold" + x="480.7074" + y="377.68677" + id="text3213-2" + sodipodi:linespacing="125%" + transform="scale(0.96997425,1.0309552)"><tspan + sodipodi:role="line" + id="tspan3215-7" + x="480.7074" + y="377.68677" + style="font-size:11.34050751px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff7f2a;font-family:Verdana;-inkscape-font-specification:Verdana Bold">x</tspan></text> + <rect + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect24748" + width="646.41687" + height="245.19261" + x="190.29156" + y="113.49999" + rx="10" + ry="10" /> + <rect + y="113.49999" + x="190.29156" + height="201.29102" + width="646.41687" + id="rect24750" + style="color:#000000;fill:#6c5353;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3894" + width="646.41687" + height="8.5292969" + x="190.29156" + y="111" /> + <rect + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3896" + width="320" + height="32" + x="221.5" + y="148.5" + rx="5" + ry="5" /> + <rect + ry="5" + rx="5" + y="204" + x="221.5" + height="32" + width="193" + id="rect3899" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3901" + width="193" + height="32" + x="221.5" + y="259.5" + rx="5" + ry="5" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="221.40039" + y="143.76562" + id="text3903" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3905" + x="221.40039" + y="143.76562">name</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3907" + y="199.76562" + x="271.49805" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="199.76562" + x="271.49805" + id="tspan3909" + sodipodi:role="line">email</tspan></text> + <rect + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3911" + width="103.29102" + height="26" + x="218.99998" + y="325" + rx="6.9999995" + ry="7" /> + <text + xml:space="preserve" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="232.03516" + y="343.10547" + id="text3903-1" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3905-6" + x="232.03516" + y="343.10547">Continuar</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="219.83398" + y="254.76562" + id="text3958" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3960" + x="219.83398" + y="254.76562">language</tspan></text> + <rect + ry="5" + rx="4.9999995" + y="259.5" + x="391.5" + height="32" + width="23" + id="rect3962" + style="color:#000000;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3964" + y="328.44327" + x="339.50107" + style="font-size:21.83877945px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4d4d4d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve" + transform="scale(1.1657305,0.8578312)"><tspan + y="328.44327" + x="339.50107" + id="tspan3966" + sodipodi:role="line">v</tspan></text> + <rect + ry="7" + rx="6.9999995" + y="325" + x="705" + height="26" + width="103.29102" + id="rect3968" + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3970" + y="343.10547" + x="722.03516" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + xml:space="preserve"><tspan + y="343.10547" + x="722.03516" + id="tspan3972" + sodipodi:role="line">Cancelar</tspan></text> + </g> </svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/pom.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -12,11 +12,11 @@ <name>kune</name> <url>http://kune.ourproject.org</url> <properties> -  - <gwt.version>2.0.0</gwt.version> +  + <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> </properties> <dependencies>  @@ -30,30 +30,21 @@ <artifactId>guice-servlet</artifactId> <version>2.0.1</version> </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> -  <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>compile</scope> + <version>${gwtVersion}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> + <version>${gwtVersion}</version> <scope>provided</scope> </dependency> -  +  <dependency> <groupId>org.cobogw</groupId> <artifactId>gwt</artifactId> @@ -79,7 +70,6 @@ <artifactId>gwt-voices</artifactId> <version>1.6.0</version> </dependency> -  <dependency> <groupId>log4j</groupId> @@ -106,10 +96,9 @@ <artifactId>xwiki-web-gwt-dom</artifactId> <version>2.3-rc-1</version>  -  +   </dependency> -  <dependency> <groupId>com.calclab.emite</groupId> @@ -131,15 +120,13 @@ <artifactId>smackx-debugger</artifactId> <version>3.0.4</version> </dependency> - -  +  <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.0.5</version> </dependency> - -  +  <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> @@ -160,11 +147,8 @@ <artifactId>hibernate-commons-annotations</artifactId> <version>3.3.0.ga</version> </dependency> -  +  <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-search</artifactId> @@ -200,7 +184,6 @@ <artifactId>slf4j-log4j12</artifactId> <version>1.5.2</version> </dependency> -  <dependency> <groupId>com.thoughtworks.xstream</groupId> @@ -228,7 +211,6 @@ <artifactId>commons-collections</artifactId> <version>3.2</version> </dependency> -  <dependency> <groupId>commons-beanutils</groupId> @@ -250,7 +232,6 @@ <artifactId>commons-fileupload</artifactId> <version>1.1.1</version> </dependency> -  <dependency> <groupId>org.liquibase</groupId> @@ -262,21 +243,20 @@ <artifactId>liquibase-plugin</artifactId> <version>1.7.0.0</version> </dependency> - -  +  <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>maven-jetty-plugin</artifactId> -  -  - <version>6.1.11</version> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.2.1.v20101111</version> +  <scope>runtime</scope> </dependency> <dependency> @@ -285,7 +265,6 @@ <version>2.4</version> <scope>provided</scope> </dependency> -  <dependency> <groupId>org.mockito</groupId> @@ -302,25 +281,21 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.4</version> -  + <version>4.7</version> +  </dependency> -  -  -  -  -  -  - +  +  +  +  +  +   <dependency> <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> - <version>0.9.4</version> + <version>1.0.3</version> </dependency> -  <dependency> <groupId>org.waveprotocol</groupId> @@ -408,15 +383,10 @@ <url>scpexe://kune.ourproject.org/home/groups/kune/htdocs/mavenrepo/</url> </repository> </distributionManagement> -  +  <pluginRepositories> -  +  <pluginRepository> <id>Codehaus Snapshots</id> <url>http://snapshots.repository.codehaus.org/</url> @@ -427,6 +397,11 @@ <enabled>true</enabled>  </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> @@ -469,6 +444,14 @@ <url>http://www.gwt-ext.com/maven2/</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> @@ -481,7 +464,7 @@ </releases> </repository> <repository> - <id>openqa.org</id> + <id>openqa.org snapshots</id> <name>Openqa Snapshot Repository</name> <url>http://archiva.openqa.org/repository/snapshots</url> <layout>default</layout> @@ -521,7 +504,7 @@ </repositories> <issueManagement> <system>kune issues list at ourproject.org</system> - <url>http://ourproject.org/tracker/?group_id=407</url> + <url>http://kune.ourproject.org/issues/</url> </issueManagement> <developers> <developer> @@ -557,31 +540,27 @@ <configuration> <source>1.6</source> <target>1.6</target> -  +  </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> -  - <version>1.2</version> +  + <version>2.1.0</version> <executions> <execution> <configuration>  <soyc>false</soyc> <style>OBF</style> + <inline>true</inline> </configuration> <goals>  <goal>compile</goal> -  +  <goal>resources</goal> </goals> </execution> @@ -593,38 +572,50 @@ </plugin> <plugin> <artifactId>maven-eclipse-plugin</artifactId> - <version>2.3</version> + <version>2.7</version> <configuration> <downloadSources>true</downloadSources> - <downloadJavadocs>true</downloadJavadocs> - <wtpversion>1.5</wtpversion> + <downloadJavadocs>false</downloadJavadocs> + <wtpversion>2.0</wtpversion> </configuration> </plugin> + <plugin> <groupId>org.mortbay.jetty</groupId> -  -  - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.11</version> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.2.1.v20101111</version> +  <configuration> - <contextPath>/</contextPath> +  +  +  <webAppSourceDirectory>war</webAppSourceDirectory> <reload>manual</reload> <scanIntervalSeconds>0</scanIntervalSeconds> </configuration> </plugin> -  +  <plugin> <groupId>org.liquibase</groupId> <artifactId>liquibase-plugin</artifactId> @@ -641,11 +632,8 @@ <password>db4kune</password> <verbose>true</verbose> </configuration> -  +  <goals> <goal>update</goal> </goals> @@ -684,13 +672,9 @@ <include>**/LabelWrapper*.**</include> <include>**/KuneUiUtils.**</include> <include>**/View.**</include> -  +  </includes> </configuration> </execution> @@ -709,33 +693,31 @@ </execution> </executions> </plugin> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>pertest</forkMode> -  +  <skip>true</skip> </configuration> <executions> @@ -750,15 +732,12 @@ </execution> </executions> </plugin> -  +  </plugins> +  <outputDirectory>war/WEB-INF/classes</outputDirectory> <testOutputDirectory>war/WEB-INF/test-classes</testOutputDirectory> <resources> @@ -799,20 +778,6 @@ <artifactId>cobertura-maven-plugin</artifactId> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name> net.sourceforge.cobertura.datafile </name> - <value> - ${project.reporting.directory}/cobertura/cobertura.ser </value> - </property> - </systemProperties> - <forkMode>pertest</forkMode> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>jdepend-maven-plugin</artifactId> </plugin> @@ -822,4 +787,30 @@ </plugin> </plugins> </reporting> -</project> \ No newline at end of file + <profiles> + <profile> +  + <id>m2eclipse</id> + <activation> + <property> + <name>!m2e.version</name> + </property> + </activation> +  + <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/com/google/gwt/wave/Wave.gwt.xml =================================================================== --- trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/com/google/gwt/wave/Wave.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6.4//EN" - "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…">    @@ -21,4 +19,5 @@ --> <script src="wave_embed.js"/> + <source path="client" /> </module> Modified: trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java =================================================================== --- trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/com/google/gwt/wave/client/WaveEmbed.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,8 +1,8 @@ package com.google.gwt.wave.client; import com.google.gwt.core.client.GWT; -import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.GWT.UncaughtExceptionHandler; +import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.user.client.Element; import com.google.gwt.wave.client.event.HasWaveLoadHandlers; import com.google.gwt.wave.client.event.WaveLoadEvent; @@ -44,7 +44,6 @@ }-*/; // Called from JSNI - @SuppressWarnings("unused") private static void fireWaveLoadEvent(final HasWaveLoadHandlers source, final String waveId) { final UncaughtExceptionHandler ueh = GWT.getUncaughtExceptionHandler(); final WaveLoadEvent event = new WaveLoadEvent(waveId); Modified: trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/Kune.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,66 +1,50 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module rename-to="ws"> - <inherits name="com.google.gwt.i18n.I18N" /> - <inherits name="com.google.gwt.user.User" /> - <inherits name="com.google.gwt.resources.Resources" /> - -  - <inherits name="com.google.gwt.user.Debug"/> - -  - <set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" /> - - <inherits name="com.calclab.suco.Suco" /> - - <inherits name="org.ourproject.kune.platf.KunePlatform" /> - <inherits name="org.ourproject.kune.docs.KuneDocs" /> - <inherits name="org.ourproject.kune.blogs.KuneBlogs" /> - <inherits name="org.ourproject.kune.wiki.KuneWiki" /> - <inherits name="org.ourproject.kune.chat.KuneChat" /> - <inherits name="org.ourproject.kune.gallery.KuneGallery" /> - - - <inherits name="org.xwiki.gwt.dom.DOM" /> - <inherits name="org.cobogw.gwt.user.User" /> - -  - <inherits name="com.gwtext.GwtExt" /> - <script src="js/ext/adapter/ext/ext-base.js" /> - <script src="js/ext/ext-all.js" /> - - <inherits name="com.gwtextux.GwtExtUx" /> - <inherits name="com.gwtextux.UploadDialog"/> - <inherits name="com.gwtextux.ToastWindow"/> - <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> - <stylesheet src="js/UploadDialog/css/Ext.ux.UploadDialog.css" /> - <script src="js/ext-ux-all-min.js" /> - -  - <stylesheet src="css/all.css" /> - - <inherits name="com.allen_sauer.gwt.log.gwt-log" /> - <extend-property name="log_level" values="DEBUG" /> - <set-property name="log_level" value="DEBUG" /> - <set-property name="log_DivLogger" value="DISABLED" /> - <set-property name="log_FirebugLogger" value="ENABLED" /> -  - <set-configuration-property name="log_pattern" value="%d [%-5p] %m%n" /> - -  - -  - -  - - <inherits name="com.google.gwt.wave.Wave" /> - -  - <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" /> - -</module> + <inherits name="com.google.gwt.i18n.I18N" /> + <inherits name="com.google.gwt.user.User" /> + <inherits name="com.google.gwt.resources.Resources" /> +  + <inherits name="com.google.gwt.user.Debug" /> +  + <set-property name="gwt.suppressNonStaticFinalFieldWarnings" + value="true" /> + <inherits name="com.calclab.suco.Suco" /> + <inherits name="org.ourproject.kune.platf.KunePlatform" /> + <inherits name="org.ourproject.kune.docs.KuneDocs" /> + <inherits name="org.ourproject.kune.blogs.KuneBlogs" /> + <inherits name="org.ourproject.kune.wiki.KuneWiki" /> + <inherits name="org.ourproject.kune.chat.KuneChat" /> + <inherits name="org.ourproject.kune.gallery.KuneGallery" /> + <inherits name="org.xwiki.gwt.dom.DOM" /> + <inherits name="org.cobogw.gwt.user.User" /> +  + <inherits name="com.gwtext.GwtExt" /> + <script src="js/ext/adapter/ext/ext-base.js" /> + <script src="js/ext/ext-all.js" /> + <inherits name="com.gwtextux.GwtExtUx" /> + <inherits name="com.gwtextux.UploadDialog" /> + <inherits name="com.gwtextux.ToastWindow" /> + <script src="js/UploadDialog/Ext.ux.UploadDialog.packed.js" /> + <stylesheet src="js/UploadDialog/css/Ext.ux.UploadDialog.css" /> + <script src="js/ext-ux-all-min.js" /> +  + <stylesheet src="css/all.css" /> + <inherits name="com.allen_sauer.gwt.log.gwt-log" /> + <extend-property name="log_level" values="DEBUG" /> + <set-property name="log_level" value="DEBUG" /> + <set-property name="log_DivLogger" value="DISABLED" /> + <set-property name="log_FirebugLogger" value="ENABLED" /> +  + <set-configuration-property name="log_pattern" + value="%d [%-5p] %m%n" /> +  +  + <set-property name="user.agent" value="gecko1_8" /> + <inherits name="com.google.gwt.wave.Wave" /> +  + <entry-point class="org.ourproject.kune.app.client.KuneEntryPoint" /> +  + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/client/KuneEntryPoint.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -52,10 +52,12 @@ // At the moment, in runtime: Log.setCurrentLogLevel(Log.LOG_LEVEL_DEBUG); - Loader.install(new RegistryModule(), new DocumentClientModule(), new BlogClientModule(), - new WikiClientModule(), new GalleryClientModule(), new EmiteUIModule(), new ChatClientModule(), - new WorkspaceModule(), new PlatformModule()); +// Loader.install(new RegistryModule(), new DocumentClientModule(), new BlogClientModule(), +// new WikiClientModule(), new GalleryClientModule(), new EmiteUIModule(), new ChatClientModule(), +// new WorkspaceModule(), new PlatformModule()); + Loader.install(new RegistryModule(), new PlatformModule()); + // We install our HelloWorldModule Loader.install(new HelloWorldModule()); } Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2010-12-07 22:38:26 UTC (rev 1158) @@ -33,7 +33,7 @@ -moz-opacity: 0.2; opacity: 0.2; } -*/.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.kune-Content-Main blockquote{border:1px dashed #DDD;padding:10px;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; +*/.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;cursor:hand;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.kune-Content-Main blockquote{border:1px dashed #DDD;padding:10px;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000; background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2; padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette-popup{z-index:9999!important;background-color:#FFF;border:1px solid gray;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:transparent none repeat scroll 0 50%;}.k-blank-toolbar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:1px;color:#B3B3B3;background:transparent;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:transparent;border-left-width:5px;border-bottom-color:transparent;border-bottom-width:5px;}.k-entitytextlogo-border{border:2px solid #F2F2F2;}.k-entitytextlogo-no-border{border:none;}.k-entitytextlogo{height:60px;margin:0 0 4px;overflow:hidden;width:468px;}.k-entitytextlogo table{vertical-align:middle;}.k-elogo-l-l{font-size:272%;}.k-elogo-l-m{font-size:167%;}.k-elogo-l-s{font-size:108%;}.k-entitytextlogo .gwt-Label{font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-elogo-plink{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-elogop-expand{background-color:transparent;}.k-entity-default .x-layout-split,.k-entity-default .x-layout-collapsed{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split,.k-entity-green .x-layout-collapsed{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split,.k-entity-blue .x-layout-collapsed{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split,.k-entity-grey .x-layout-collapsed{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split,.k-entity-purple .x-layout-collapsed{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split,.k-entity-red .x-layout-collapsed{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split,.k-entityworkspace .x-layout-collapsed{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split,.k-entityworkspace-default .x-layout-collapsed{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split,.k-entityworkspace-green .x-layout-collapsed{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split,.k-entityworkspace-blue .x-layout-collapsed{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split,.k-entityworkspace-grey .x-layout-collapsed{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split,.k-entityworkspace-purple .x-layout-collapsed{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split,.k-entityworkspace-red .x-layout-collapsed{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:5px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-content{background:#FFF;}.k-entity-bottom div{/* line-height: 24px; */color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others *//* .x-tree-node a span, .x-dd-drag-ghost a span { Modified: trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/app/server/KuneRackModule.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -19,9 +19,6 @@ */ package org.ourproject.kune.app.server; -import org.ourproject.kune.app.server.wave.WaveContainerListener; -import org.ourproject.kune.app.server.wave.WaveInterceptorModule; -import org.ourproject.kune.app.server.wave.WavePropertiesParser; import org.ourproject.kune.blogs.server.BlogServerModule; import org.ourproject.kune.chat.server.ChatServerModule; import org.ourproject.kune.docs.server.DocumentServerModule; @@ -52,8 +49,6 @@ import org.ourproject.kune.rack.filters.RedirectFilter; import org.ourproject.kune.rack.filters.rest.RESTServicesModule; import org.ourproject.kune.wiki.server.WikiServerModule; -import org.waveprotocol.wave.examples.fedone.FlagSettings; -import org.waveprotocol.wave.examples.fedone.ServerModule; import com.google.inject.AbstractModule; import com.google.inject.Module; @@ -82,7 +77,7 @@ if (sessionScope != null) { bindScope(SessionScoped.class, sessionScope); } - bind(WavePropertiesParser.class).asEagerSingleton(); + // bind(WavePropertiesParser.class).asEagerSingleton(); } }; } @@ -92,7 +87,7 @@ installGuiceModules(builder); builder.add(KuneContainerListener.class); - builder.add(WaveContainerListener.class); + // builder.add(WaveContainerListener.class); builder.exclude("/http-bind.*"); builder.exclude("/public/.*"); @@ -129,9 +124,9 @@ builder.use(new GalleryServerModule()); builder.use(new RESTServicesModule()); builder.use(configModule); - builder.use(WavePropertiesParser.parseFlags(FlagSettings.class)); - builder.use(new WaveInterceptorModule()); - builder.use(new ServerModule()); + // builder.use(WavePropertiesParser.parseFlags(FlagSettings.class)); + // builder.use(new WaveInterceptorModule()); + // builder.use(new ServerModule()); } } Modified: trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/blogs/KuneBlogs.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/chat/KuneChat.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,6 +1,7 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> <inherits name='org.ourproject.kune.platf.KunePlatform' /> <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> + <source path="client" /> </module> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -67,10 +67,10 @@ private final WorkspaceSkeleton wskel; private ToolbarButton traybarButton; private final Provider<EmiteUIDialog> emiteUIProvider; - private final Provider<FileDownloadUtils> downloadUtils; private Collection<RosterItem> roster; private final Event0 onRosterChanged; private final KeyStroke shortcut; + private final Provider<FileDownloadUtils> downloadUtils; public ChatEngineDefault(final I18nTranslationService i18n, final WorkspaceSkeleton wskel, final Application application, final Session session, final Provider<EmiteUIDialog> emiteUIProvider, Modified: trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/docs/KuneDocs.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/gallery/KuneGallery.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/KunePlatform.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,37 +1,40 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> -  +  <inherits name='com.google.gwt.user.User' /> <inherits name='com.google.gwt.i18n.I18N' /> <inherits name="com.google.gwt.user.UserAgent" /> <inherits name="org.ourproject.kune.platf.RichText" /> + <inherits name="org.ourproject.kune.workspace.KuneWorkspace" /> <inherits name="com.google.gwt.resources.Resources" /> - <public path="public" /> <inherits name="com.google.gwt.user.UserAgent" />   -  <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplIE6"> <when-type-is class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <when-property-is name="user.agent" value="ie6" /> - <when-property-is name="user.agent" value="ie8" /> + <any> + <when-property-is name="user.agent" value="ie6" /> + <when-property-is name="user.agent" value="ie8" /> + </any> </replace-with> -  <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplMozilla"> <when-type-is class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> - <any> - <when-property-is name="user.agent" value="gecko1_8" /> - <when-property-is name="user.agent" value="gecko" /> - </any> + <when-property-is name="user.agent" value="gecko1_8" /> </replace-with> - +  + <replace-with + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplOldMozilla"> + <when-type-is + class="org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl" /> + <when-property-is name="user.agent" value="gecko" /> + </replace-with>  <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplSafari"> @@ -41,7 +44,6 @@ <when-property-is name="user.agent" value="safari" /> </any> </replace-with> -  <replace-with class="org.ourproject.kune.platf.client.ui.rte.WrappedRichTextAreaImplOpera"> @@ -51,4 +53,10 @@ <when-property-is name="user.agent" value="opera" /> </any> </replace-with> + <inherits name="com.calclab.suco.Suco" /> + <inherits name="com.gwtext.GwtExt" /> + <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> + <inherits name="org.xwiki.gwt.dom.DOM" /> + <inherits name="com.calclab.suco.Suco"/> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> </module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/RichText.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,4 +1,4 @@ - +<!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/…">    Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ui/BaseAction.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -6,8 +6,6 @@ import com.google.gwt.resources.client.ImageResource; -import com.google.gwt.resources.client.ImageResource; - public class BaseAction extends AbstractAction { public BaseAction(final String text, final String tooltip) { super(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/i18n/I18nUITranslationService.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -65,7 +65,7 @@ return formatDateWithLocale(date, false); } - public String formatDateWithLocale(final Date date, boolean shortFormat) { + public String formatDateWithLocale(final Date date, final boolean shortFormat) { String dateFormat = shortFormat ? currentLang.getDateFormatShort() : currentLang.getDateFormat(); final DateTimeFormat fmt; @@ -75,13 +75,13 @@ if (shortFormat) { fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); } else { - String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date); - String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]"; + final String abrevMonthInEnglish = DateTimeFormat.getFormat("MMM").format(date); + final String monthToTranslate = abrevMonthInEnglish + " [%NT abbreviated month]"; dateFormat = dateFormat.replaceFirst("MMM", "'" + t(monthToTranslate) + "'"); fmt = DateTimeFormat.getFormat(dateFormat + " h:mm a"); } } - String dateFormated = fmt.format(date); + final String dateFormated = fmt.format(date); return dateFormated; } @@ -100,7 +100,7 @@ final String locale = loc.getParameter("locale"); i18nService.getInitialLanguage(locale, new AsyncCallback<I18nLanguageDTO>() { public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed"); + Log.error("Workspace adaptation to your language failed: " + caught.getMessage()); } public void onSuccess(final I18nLanguageDTO result) { @@ -109,7 +109,7 @@ session.setCurrentLanguage(currentLang); i18nService.getLexicon(currentLang.getCode(), new AsyncCallback<HashMap<String, String>>() { public void onFailure(final Throwable caught) { - Log.error("Workspace adaptation to your language failed"); + Log.error("Workspace adaptation to your language failed:" + caught.getMessage()); } public void onSuccess(final HashMap<String, String> result) { @@ -198,33 +198,33 @@ */ private native void changeLocale(String newLocale) /*-{ - // Uncomment the "debugger;" line to see how to set debug statements in JSNI code - // When in web mode, if your browser has a JavaScript debugger attached, it will - // launch at this point in the code (when the user changes locale through the menu system). - // debugger; + // Uncomment the "debugger;" line to see how to set debug statements in JSNI code + // When in web mode, if your browser has a JavaScript debugger attached, it will + // launch at this point in the code (when the user changes locale through the menu system). + // debugger; - // Get the current location - var currLocation = $wnd.location.toString(); - // Get rid of any GWT History tokens that might be present - var noHistoryCurrLocArray = currLocation.split("#"); - var noHistoryCurrLoc = noHistoryCurrLocArray[0]; - var currHistory = noHistoryCurrLocArray[1]; - // Get rid of any locale string - var locArray = noHistoryCurrLoc.split("?"); - // Build the new href location and then send the browser there. - // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; - $wnd.location.href = locArray[0]+"?locale="+newLocale + // Get the current location + var currLocation = $wnd.location.toString(); + // Get rid of any GWT History tokens that might be present + var noHistoryCurrLocArray = currLocation.split("#"); + var noHistoryCurrLoc = noHistoryCurrLocArray[0]; + var currHistory = noHistoryCurrLocArray[1]; + // Get rid of any locale string + var locArray = noHistoryCurrLoc.split("?"); + // Build the new href location and then send the browser there. + // $wnd.location.href = locArray[0]+"?locale="+newLocale+"#"+currHistory; + $wnd.location.href = locArray[0]+"?locale="+newLocale - // extjs part: - // commented because the error: "Ext is not defined" - // we have to try other way - // var head = document.getElementsByTagName("head")[0]; - // var script = document.createElement('script'); - // script.id = 'localScript'; - // script.type = 'text/javascript'; - // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; - // head.appendChild(script); - }-*/; + // extjs part: + // commented because the error: "Ext is not defined" + // we have to try other way + // var head = document.getElementsByTagName("head")[0]; + // var script = document.createElement('script'); + // script.id = 'localScript'; + // script.type = 'text/javascript'; + // script.src = "js/ext/locale/ext-lang-"+newLocale+".js"; + // head.appendChild(script); + }-*/; private void fireI18nLanguageChange() { if (i18nChangeListeners != null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/PlatformModule.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -110,7 +110,6 @@ import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.Factory; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.StyleInjector; public class PlatformModule extends AbstractExtendedModule { @@ -244,7 +243,7 @@ @Override public ImgResources create() { final ImgResources instance = GWT.create(ImgResources.class); - StyleInjector.injectStylesheet(instance.css().getText()); + instance.css().ensureInjected(); return instance; } }); @@ -253,7 +252,7 @@ @Override public RTEImgResources create() { final RTEImgResources instance = GWT.create(RTEImgResources.class); - StyleInjector.injectStylesheet(instance.css().getText()); + instance.css().ensureInjected(); return instance; } }); @@ -466,6 +465,12 @@ } }); + register(ApplicationComponentGroup.class, new Factory<GlobalShortcutRegister>(GlobalShortcutRegister.class) { + @Override + public GlobalShortcutRegister create() { + return new GlobalShortcutRegister(); + } + }); i(ApplicationComponentGroup.class).createAll(); i(ToolGroup.class).createAll(); i(Application.class).start(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/ShortcutRegister.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -13,15 +13,15 @@ public class ShortcutRegister { - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private final HashMap<ShortcutDescriptor, ActionItem> shortcuts; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public ShortcutRegister() { shortcuts = new HashMap<ShortcutDescriptor, ActionItem>(); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes" }) public ActionItem get(final NativeEvent event) { final int modifiers = KeyStroke.getKeyboardModifiers(event); final boolean fnKey = (event.getKeyCode() >= Keyboard.KEY_F2 && event.getKeyCode() <= Keyboard.KEY_F12); @@ -32,7 +32,7 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public ActionItem get(final ShortcutDescriptor shortcut) { final ActionItem actionItem = shortcuts.get(shortcut); if (actionItem != null) { @@ -41,7 +41,7 @@ return actionItem; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public void put(final ShortcutDescriptor shortcut, final ActionItem actionItem) { if (shortcuts.get(shortcut) != null) { Log.warn("Shortcut" + shortcut + " already registered"); @@ -49,7 +49,7 @@ shortcuts.put(shortcut, actionItem); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes", "unchecked" }) public void put(final ShortcutDescriptor shortcut, final Listener0 listener) { final ActionDescriptor descriptor = new ActionDescriptor(AccessRolDTO.Viewer, new Listener0() { public void onEvent() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/RichTextArea.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -17,10 +17,14 @@ import org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl; import org.xwiki.gwt.dom.client.Document; +import org.xwiki.gwt.dom.client.IFrameElement; +import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.IFrameElement; -import com.google.gwt.event.dom.client.HasAllMouseHandlers; +import com.google.gwt.event.logical.shared.HasInitializeHandlers; +import com.google.gwt.event.logical.shared.InitializeEvent; +import com.google.gwt.event.logical.shared.InitializeHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.FocusWidget; import com.google.gwt.user.client.ui.HasHTML; @@ -35,20 +39,35 @@ * functionality will return <code>null</code> for the latter. * * <p> - * <img class='gallery' src='RichTextArea.png'/> + * <img class='gallery' src='doc-files/RichTextArea.png'/> * </p> * - * <h3>CSS Style Rules</h3> <ul class="css"> <li>.gwt-RichTextArea { }</li> - * </ul> + * <h3>CSS Style Rules</h3> + * <dl> + * <dt>.gwt-RichTextArea</dt> + * <dd>Applied to the rich text element.</dd> + * </dl> */ -public class RichTextArea extends FocusWidget implements HasHTML, HasAllMouseHandlers { +public class RichTextArea extends FocusWidget implements HasHTML, HasInitializeHandlers { /** + * <p> * This interface is used to access basic formatting options, when * available. If the implementation supports basic formatting, then * {@link RichTextArea#getBasicFormatter()} will return an instance of this * class. + * </p> + * <p> + * The formatter will format the user selected text in the + * {@link RichTextArea}. As a result, it will only work reliably if the + * {@link RichTextArea} is attached, visible to on the page, and has been + * focused at least once. If you just want to initialize the content of the + * {@link RichTextArea}, use {@link RichTextArea#setHTML(String)} instead. + * </p> + * + * @deprecated use {@link RichTextArea.Formatter} instead */ + @Deprecated public interface BasicFormatter { /** @@ -172,11 +191,23 @@ } /** + * <p> * This interface is used to access full formatting options, when available. * If the implementation supports full formatting, then * {@link RichTextArea#getExtendedFormatter()} will return an instance of * this class. + * </p> + * <p> + * The formatter will format the user selected text in the + * {@link RichTextArea}. As a result, it will only work reliably if the + * {@link RichTextArea} is attached, visible to on the page, and has been + * focused at least once. If you just want to initialize the content of the + * {@link RichTextArea}, use {@link RichTextArea#setHTML(String)} instead. + * </p> + * + * @deprecated use {@link RichTextArea.Formatter} instead */ + @Deprecated public interface ExtendedFormatter extends BasicFormatter { void copy(); @@ -202,11 +233,6 @@ void insertHorizontalRule(); /** - * Inserts html - */ - void insertHtml(String html); - - /** * Inserts an image element. * * @param url @@ -270,14 +296,14 @@ public static class FontSize { /** - * Represents an XX-Small font. + * Represents a Large font. */ - public static final FontSize XX_SMALL = new FontSize(1); + public static final FontSize LARGE = new FontSize(5); /** - * Represents an X-Small font. + * Represents a Medium font. */ - public static final FontSize X_SMALL = new FontSize(2); + public static final FontSize MEDIUM = new FontSize(4); /** * Represents a Small font. @@ -285,24 +311,24 @@ public static final FontSize SMALL = new FontSize(3); /** - * Represents a Medium font. + * Represents an X-Large font. */ - public static final FontSize MEDIUM = new FontSize(4); + public static final FontSize X_LARGE = new FontSize(6); /** - * Represents a Large font. + * Represents an X-Small font. */ - public static final FontSize LARGE = new FontSize(5); + public static final FontSize X_SMALL = new FontSize(2); /** - * Represents an X-Large font. + * Represents an XX-Large font. */ - public static final FontSize X_LARGE = new FontSize(6); + public static final FontSize XX_LARGE = new FontSize(7); /** - * Represents an XX-Large font. + * Represents an XX-Small font. */ - public static final FontSize XX_LARGE = new FontSize(7); + public static final FontSize XX_SMALL = new FontSize(1); private final int number; @@ -326,6 +352,223 @@ } /** + * <p> + * This interface is used to access full formatting options, when available. + * If the implementation supports full formatting, then + * {@link RichTextArea#getFormatter()} will return an instance of this + * class. + * </p> + * <p> + * The formatter will format the user selected text in the + * {@link RichTextArea}. As a result, it will only work reliably if the + * {@link RichTextArea} is attached, visible to on the page, and has been + * focused at least once. If you just want to initialize the content of the + * {@link RichTextArea}, use {@link RichTextArea#setHTML(String)} instead. + * </p> + */ + public interface Formatter extends ExtendedFormatter { + /** + * Creates a link to the supplied URL. + * + * @param url + * the URL to be linked to + */ + void createLink(String url); + + /** + * Gets the background color. + * + * @return the background color + */ + String getBackColor(); + + /** + * Gets the foreground color. + * + * @return the foreground color + */ + String getForeColor(); + + /** + * Inserts a horizontal rule. + */ + void insertHorizontalRule(); + + /** + * Inserts generic html. + * + * @param html + * the HTML to insert + */ + void insertHTML(String html); + + /** + * Inserts an image element. + * + * @param url + * the url of the image to be inserted + */ + void insertImage(String url); + + /** + * Starts an numbered list. Indentation will create nested items. + */ + void insertOrderedList(); + + /** + * Starts an bulleted list. Indentation will create nested items. + */ + void insertUnorderedList(); + + /** + * Is the current region bold? + * + * @return true if the current region is bold + */ + boolean isBold(); + + /** + * Is the current region italic? + * + * @return true if the current region is italic + */ + boolean isItalic(); + + /** + * Is the current region strikethrough? + * + * @return true if the current region is strikethrough + */ + boolean isStrikethrough(); + + /** + * Is the current region subscript? + * + * @return true if the current region is subscript + */ + boolean isSubscript(); + + /** + * Is the current region superscript? + * + * @return true if the current region is superscript + */ + boolean isSuperscript(); + + /** + * Is the current region underlined? + * + * @return true if the current region is underlined + */ + boolean isUnderlined(); + + /** + * Left indent. + */ + void leftIndent(); + + /** + * Redo an action that was just undone. + */ + void redo(); + + /** + * Removes all formatting on the selected text. + */ + void removeFormat(); + + /** + * Removes any link from the selected text. + */ + void removeLink(); + + /** + * Right indent. + */ + void rightIndent(); + + /** + * Selects all the text. + */ + void selectAll(); + + /** + * Sets the background color. + * + * @param color + * the new background color + */ + void setBackColor(String color); + + /** + * Sets the font name. + * + * @param name + * the new font name + */ + void setFontName(String name); + + /** + * Sets the font size. + * + * @param fontSize + * the new font size + */ + void setFontSize(FontSize fontSize); + + /** + * Sets the foreground color. + * + * @param color + * the new foreground color + */ + void setForeColor(String color); + + /** + * Sets the justification. + * + * @param justification + * the new justification + */ + void setJustification(Justification justification); + + /** + * Toggles bold. + */ + void toggleBold(); + + /** + * Toggles italic. + */ + void toggleItalic(); + + /** + * Toggles strikethrough. + */ + void toggleStrikethrough(); + + /** + * Toggles subscript. + */ + void toggleSubscript(); + + /** + * Toggles superscript. + */ + void toggleSuperscript(); + + /** + * Toggles underline. + */ + void toggleUnderline(); + + /** + * Undo the last action. + */ + void undo(); + } + + /** * Justification enumeration. The three values are <code>left</code>, * <code>right</code>, <code>center</code>. */ @@ -337,6 +580,11 @@ public static final Justification CENTER = new Justification("Center"); /** + * Full justification. + */ + public static final Justification FULL = new Justification("Full"); + + /** * Left justification. */ public static final Justification LEFT = new Justification("Left"); @@ -366,18 +614,24 @@ public RichTextArea() { setElement(impl.getElement()); setStyleName("gwt-RichTextArea"); + impl.setOwner(this); } + public HandlerRegistration addInitializeHandler(final InitializeHandler handler) { + return addHandler(handler, InitializeEvent.getType()); + } + /** - * Gets the basic rich text formatting interface. + * Gets the basic rich text formatting interface. Note that formatting can + * only be done when the {@link RichTextArea} is attached, visible on the + * page, and has been focused by the user. * * @return <code>null</code> if basic formatting is not supported + * @deprecated use {@link #getFormatter()} instead */ + @Deprecated public BasicFormatter getBasicFormatter() { - if ((impl instanceof BasicFormatter) && (impl.isBasicEditingSupported())) { - return (BasicFormatter) impl; - } - return null; + return getFormatter(); } /** @@ -403,13 +657,28 @@ } /** - * Gets the full rich text formatting interface. + * Gets the full rich text formatting interface. Note that formatting can + * only be done when the {@link RichTextArea} is attached, visible on the + * page, and has been focused by the user. * * @return <code>null</code> if full formatting is not supported + * @deprecated use {@link #getFormatter()} instead */ + @Deprecated public ExtendedFormatter getExtendedFormatter() { - if ((impl instanceof ExtendedFormatter) && (impl.isExtendedEditingSupported())) { - return (ExtendedFormatter) impl; + return getFormatter(); + } + + /** + * Gets the rich text formatting interface. Note that formatting can only be + * done when the {@link RichTextArea} is attached, visible on the page, and + * has been focused by the user. + * + * @return <code>null</code> if full formatting is not supported + */ + public Formatter getFormatter() { + if (impl instanceof Formatter) { + return (Formatter) impl; } return null; } @@ -423,9 +692,20 @@ } @Override + public boolean isEnabled() { + return impl.isEnabled(); + } + + @Override + public void setEnabled(final boolean enabled) { + impl.setEnabled(enabled); + } + + @Override public void setFocus(final boolean focused) { // There are different problems on each browser when you try to focus an // unattached rich text iframe, so just cut it off early. + Log.debug("Focus setted: " + focused); if (isAttached()) { impl.setFocus(focused); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplIE6.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -38,30 +38,30 @@ var _this = this; _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { - return; - } + setTimeout($entry(function() { + if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { + return; + } - // Attempt to set the iframe document's body to 'contentEditable' mode. - // There's no way to know when the body will actually be available, so - // keep trying every so often until it is. - // Note: The body seems to be missing only rarely, so please don't remove - // this retry loop just because it's hard to reproduce. - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - if (!doc.body) { - // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower - // would increase the probability of a user-visible delay. - setTimeout(arguments.callee, 50); - return; - } - var ct = "<html><head><style>@import url('" + $wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - doc.body.contentEditable = true; + // Attempt to set the iframe document's body to 'contentEditable' mode. + // There's no way to know when the body will actually be available, so + // keep trying every so often until it is. + // Note: The body seems to be missing only rarely, so please don't remove + // this retry loop just because it's hard to reproduce. + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + if (!doc.body) { + // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower + // would increase the probability of a user-visible delay. + setTimeout(arguments.callee, 50); + return; + } + var ct = "<html><head><style>@import url('" + $wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + doc.body.contentEditable = true; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1)); }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplMozilla.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -32,6 +32,7 @@ * */ public class WrappedRichTextAreaImplMozilla extends RichTextAreaImplMozilla { + boolean isFirstFocus; @Override public native void initElement() /*-{ @@ -39,38 +40,47 @@ // fully loaded. var _this = this; var iframe = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplMozilla::isFirstFocus = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = $entry(function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // patch ccs inject: + // patch ccs inject: - var doc = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document; - head=doc.getElementsByTagName('head')[0]; - link=document.createElement('link'); - link.setAttribute('rel',"stylesheet"); - link.setAttribute('type',"text/css"); - link.setAttribute('href',$wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" ); - head.appendChild(link); + var doc = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document; + head=doc.getElementsByTagName('head')[0]; + link=document.createElement('link'); + link.setAttribute('rel',"stylesheet"); + link.setAttribute('type',"text/css"); + link.setAttribute('href',$wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" ); + head.appendChild(link); - // -- patch + // -- patch - // Send notification that the iframe has finished loading. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Don't set designMode until the RTA is targeted by an event. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for an event gets around this issue. + // + // Note: These events will not conflict with the + // addEventListener('oneventtype', ...) in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.onmouseover = null; + iframe.contentWindow.document.designMode = 'On'; + }; - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - }; - }; + // Issue 1441: we also need to catch the onmouseover event because focus + // occurs after mouse down, so the cursor will not appear until the user + // clicks twice, making the RichTextArea look uneditable. Catching the + // mouseover event allows us to set design mode earlier. The focus event + // is still needed to handle tab selection. + iframe.contentWindow.onmouseover = iframe.contentWindow.onfocus; + + // Send notification that the iframe has finished loading. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }); }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplOpera.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -22,27 +22,25 @@ import org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplOpera; public class WrappedRichTextAreaImplOpera extends RichTextAreaImplOpera { - - @Override public native void initElement() /*-{ // Most browsers don't like setting designMode until slightly _after_ // the iframe becomes attached to the DOM. Any non-zero timeout will do // just fine. var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // patch css inject: - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - var ct = "<html><head><style>@import url('" + $wnd.location.protocol + "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - // -- patch + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + setTimeout($entry(function() { + // Turn on design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // patch css inject: + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" +$wnd.location.protocol+ "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }), 1); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/WrappedRichTextAreaImplSafari.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -29,21 +29,21 @@ // the iframe becomes attached to the DOM. Any non-zero timeout will do // just fine. var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + setTimeout($entry(function() { + // Turn on design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // patch css inject: - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - var ct = "<html><head><style>@import url('" +$wnd.location.protocol+ "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; - doc.write( ct ); - // -- patch + // patch css inject: + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + var ct = "<html><head><style>@import url('" +$wnd.location.protocol+ "//" + $wnd.location.host + $wnd.location.pathname + "css/richtext.css" + "');</style></head><body CONTENTEDITABLE='true'></body></html>" ; + doc.write( ct ); + // -- patch - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }), 1); }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/basic/RTEditorPanel.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -16,9 +16,8 @@ import org.ourproject.kune.platf.client.shortcuts.GlobalShortcutRegister; import org.ourproject.kune.platf.client.ui.noti.NotifyUser; import org.ourproject.kune.platf.client.ui.rte.RichTextArea; -import org.ourproject.kune.platf.client.ui.rte.RichTextArea.BasicFormatter; -import org.ourproject.kune.platf.client.ui.rte.RichTextArea.ExtendedFormatter; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Formatter; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Justification; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkExecutableUtils; import org.ourproject.kune.platf.client.ui.rte.insertlink.LinkInfo; @@ -44,8 +43,7 @@ private static final Element NO_ELEMENT = null; private final I18nUITranslationService i18n; - private final BasicFormatter basic; - private final ExtendedFormatter extended; + private final Formatter extended; private final RTEditorPresenter presenter; private final GlobalShortcutRegister globalShortcutReg; private final RTELinkPopup linkCtxMenu; @@ -60,8 +58,7 @@ this.i18n = i18n; this.globalShortcutReg = globalShortcutReg; rta = new RichTextArea(); - basic = rta.getBasicFormatter(); - extended = rta.getExtendedFormatter(); + extended = rta.getFormatter(); topBar = new ComplexToolbar(bindings); sndBar = new ComplexToolbar(bindings); sndBar.setNormalStyle(); @@ -94,7 +91,7 @@ } public boolean canBeBasic() { - return basic != null; + return extended != null; } public boolean canBeExtended() { @@ -209,7 +206,7 @@ } public void insertHtml(final String html) { - extended.insertHtml(html); + extended.insertHTML(html); } public void insertImage(final String url) { @@ -229,7 +226,7 @@ } public boolean isBold() { - return basic.isBold(); + return extended.isBold(); } public boolean isCollapsed() { @@ -241,7 +238,7 @@ } public boolean isItalic() { - return basic.isItalic(); + return extended.isItalic(); } public boolean isLink() { @@ -257,27 +254,27 @@ } public boolean isSubscript() { - return basic.isSubscript(); + return extended.isSubscript(); } public boolean isSuperscript() { - return basic.isSuperscript(); + return extended.isSuperscript(); } public boolean isUnderlined() { - return basic.isUnderlined(); + return extended.isUnderlined(); } public void justifyCenter() { - basic.setJustification(Justification.CENTER); + extended.setJustification(Justification.CENTER); } public void justifyLeft() { - basic.setJustification(Justification.LEFT); + extended.setJustification(Justification.LEFT); } public void justifyRight() { - basic.setJustification(Justification.RIGHT); + extended.setJustification(Justification.RIGHT); } public void leftIndent() { @@ -344,7 +341,7 @@ } public void selectAll() { - basic.selectAll(); + extended.selectAll(); } public void selectLink() { @@ -352,7 +349,7 @@ } public void setBackColor(final String color) { - basic.setBackColor(color); + extended.setBackColor(color); } public void setFocus(final boolean focused) { @@ -360,15 +357,15 @@ } public void setFontName(final String name) { - basic.setFontName(name); + extended.setFontName(name); } public void setFontSize(final FontSize size) { - basic.setFontSize(size); + extended.setFontSize(size); } public void setForeColor(final String color) { - basic.setForeColor(color); + extended.setForeColor(color); } public void setHTML(final String html) { @@ -397,11 +394,11 @@ } public void toggleBold() { - basic.toggleBold(); + extended.toggleBold(); } public void toggleItalic() { - basic.toggleItalic(); + extended.toggleItalic(); } public void toggleStrikethrough() { @@ -409,15 +406,15 @@ } public void toggleSubscript() { - basic.toggleSubscript(); + extended.toggleSubscript(); } public void toggleSuperscript() { - basic.toggleSuperscript(); + extended.toggleSuperscript(); } public void toggleUnderline() { - basic.toggleUnderline(); + extended.toggleUnderline(); } public void undo() { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgCssResource.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -3,7 +3,6 @@ import com.google.gwt.resources.client.CssResource; public interface RTEImgCssResource extends CssResource { - @ClassName("k-icon-alignleft") String kIconAlignleft(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/RTEImgResources.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -3,7 +3,7 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -// @PMD:REVIEWED:TooManyMethods: by vjrj on 27/05/09 0:06 +// @PMD:REVIEWED:TooManyMethods: by vjrj on 27/05/09 0:06 public interface RTEImgResources extends ClientBundle { @Source("alignleft.png") Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/img/rteimg.css 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,4 +1,4 @@ -@external k-icon-underline,k-icon-superscript,k-icon-subscript,k-icon-film,k-icon-strikeout,k-icon-removeFormat,k-icon-link,k-icon-linkbreak,k-icon-italic,k-icon-incrementindent,k-icon-images,k-icon-hfixedline,k-icon-fontheight,k-icon-fontcolor,k-icon-edithtml,k-icon-defaultnumbering,k-icon-defaultbullet,k-icon-decrementindent,k-icon-charfontname,k-icon-centerpara,k-icon-bold,k-icon-backcolor,k-icon-alignright,k-icon-alignleft,k-icon-specialchars,k-icon-copy,k-icon-cut,k-icon-insertspreadsheet,k-icon-insertsymbol,k-icon-inserttable,k-icon-paste,k-icon-redo,k-icon-save,k-icon-selectall,k-icon-undo; +@external .k-icon-underline,.k-icon-superscript,.k-icon-subscript,.k-icon-film,.k-icon-strikeout,.k-icon-removeFormat,.k-icon-link,.k-icon-linkbreak,.k-icon-italic,.k-icon-incrementindent,.k-icon-images,.k-icon-hfixedline,.k-icon-fontheight,.k-icon-fontcolor,.k-icon-edithtml,.k-icon-defaultnumbering,.k-icon-defaultbullet,.k-icon-decrementindent,.k-icon-charfontname,.k-icon-centerpara,.k-icon-bold,.k-icon-backcolor,.k-icon-alignright,.k-icon-alignleft,.k-icon-specialchars,.k-icon-copy,.k-icon-cut,.k-icon-insertspreadsheet,.k-icon-insertsymbol,.k-icon-inserttable,.k-icon-paste,.k-icon-redo,.k-icon-save,.k-icon-selectall,.k-icon-undo; @sprite div .k-icon-underline { gwt-image: "underline"; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImpl.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -15,13 +15,17 @@ */ package org.ourproject.kune.platf.client.ui.rte.impl; +import org.ourproject.kune.platf.client.ui.rte.RichTextArea; + +import com.google.gwt.event.logical.shared.HasInitializeHandlers; +import com.google.gwt.event.logical.shared.InitializeEvent; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; /** - * Base class for RichText platform implementations. The default version - * simply creates a text area with no rich text support. + * Base class for RichText platform implementations. The default version simply + * creates a text area with no rich text support. * * This is not currently used by any user-agent, but will provide a * <textarea> fallback in the event a future browser fails to implement @@ -30,9 +34,11 @@ public class RichTextAreaImpl { protected Element elem; + protected HasInitializeHandlers owner; public RichTextAreaImpl() { - // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 14:39 + // @PMD:REVIEWED:ConstructorCallsOverridableMethod: by vjrj on 21/05/09 + // 14:39 elem = createElement(); } @@ -52,30 +58,43 @@ onElementInitialized(); } - public boolean isBasicEditingSupported() { - return false; + public boolean isEnabled() { + return !elem.getPropertyBoolean("disabled"); } - public boolean isExtendedEditingSupported() { - return false; + public void setEnabled(final boolean enabled) { + elem.setPropertyBoolean("disabled", !enabled); } public native void setFocus(boolean focused) /*-{ - if (focused) { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.focus(); - } else { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.blur(); - } - }-*/; + if (focused) { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.focus(); + } else { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.blur(); + } + }-*/; - public void setHTML(String html) { + public void setHTML(final String html) { DOM.setElementProperty(elem, "value", html); } - public void setText(String text) { + public void setOwner(final HasInitializeHandlers owner) { + this.owner = owner; + } + + public void setText(final String text) { DOM.setElementProperty(elem, "value", text); } + /** + * @deprecated as of GWT 2.1, use {@link #setOwner(HasInitializeHandlers)} + * instead + */ + @Deprecated + public void setWidget(final RichTextArea richTextWidget) { + setOwner(richTextWidget); + } + public void uninitElement() { } @@ -84,11 +103,13 @@ } protected void hookEvents() { - DOM.sinkEvents(elem, Event.MOUSEEVENTS | Event.KEYEVENTS | Event.ONCHANGE - | Event.ONCLICK | Event.FOCUSEVENTS); + DOM.sinkEvents(elem, Event.MOUSEEVENTS | Event.KEYEVENTS | Event.ONCHANGE | Event.ONCLICK | Event.FOCUSEVENTS); } protected void onElementInitialized() { hookEvents(); + if (owner != null) { + InitializeEvent.fire(owner); + } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplIE6.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -25,106 +25,135 @@ @Override public Element createElement() { - Element elem = super.createElement(); + final Element elem = super.createElement(); DOM.setElementProperty(elem, "src", "javascript:''"); return elem; } @Override public native void initElement() /*-{ - var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; + var _this = this; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); - setTimeout(function() { - if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { - return; - } + setTimeout($entry(function() { + if (_this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing == false) { + return; + } - // Attempt to set the iframe document's body to 'contentEditable' mode. - // There's no way to know when the body will actually be available, so - // keep trying every so often until it is. - // Note: The body seems to be missing only rarely, so please don't remove - // this retry loop just because it's hard to reproduce. - var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var doc = elem.contentWindow.document; - if (!doc.body) { - // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower - // would increase the probability of a user-visible delay. - setTimeout(arguments.callee, 50); - return; - } - doc.body.contentEditable = true; + // Attempt to set the iframe document's body to 'contentEditable' mode. + // There's no way to know when the body will actually be available, so + // keep trying every so often until it is. + // Note: The body seems to be missing only rarely, so please don't remove + // this retry loop just because it's hard to reproduce. + var elem = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + if (!doc.body) { + // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower + // would increase the probability of a user-visible delay. + setTimeout(arguments.callee, 50); + return; + } + doc.body.contentEditable = true; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }, 1)); + }-*/; @Override + public native void insertHTML(String html) /*-{ + try { + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var doc = elem.contentWindow.document; + doc.body.focus(); + var tr = doc.selection.createRange(); + if (tr == null) { + return; + } + if ([email protected]::isOrHasChild(Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/Element;)(doc.body, tr.parentElement())) { + return; + } + tr.pasteHTML(html); + } + catch (e) { + return; + } + }-*/; + + @Override protected native String getTextImpl() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - return elem.contentWindow.document.body.innerText; - }-*/; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + return elem.contentWindow.document.body.innerText; + }-*/; @Override protected native void hookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var body = elem.contentWindow.document.body; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var body = elem.contentWindow.document.body; - var handler = function() { - if (elem.__listener) { - // Weird: this code has the context of the script frame, but we need the - // event from the edit iframe's window. - var evt = elem.contentWindow.event; - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; + var handler = $entry(function() { + if (elem.__listener) { + if (@com.google.gwt.user.client.impl.DOMImpl::isMyListener(Ljava/lang/Object;)(elem.__listener)) { + // Weird: this code has the context of the script frame, but we need the + // event from the edit iframe's window. + var evt = elem.contentWindow.event; + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + } + }); - body.onkeydown = - body.onkeyup = - body.onkeypress = - body.onmousedown = - body.onmouseup = - body.onmousemove = - body.onmouseover = - body.onmouseout = - body.onclick = handler; + body.onkeydown = + body.onkeyup = + body.onkeypress = + body.onmousedown = + body.onmouseup = + body.onmousemove = + body.onmouseover = + body.onmouseout = + body.onclick = handler; - elem.contentWindow.onfocus = - elem.contentWindow.onblur = handler; - }-*/; + elem.contentWindow.onfocus = + elem.contentWindow.onblur = handler; + }-*/; @Override + protected native boolean isEnabledImpl() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + return elem.contentWindow.document.body.contentEditable.toLowerCase() == 'true'; + }-*/; + + @Override + protected native void setEnabledImpl(boolean enabled) /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + elem.contentWindow.document.body.contentEditable = enabled; + }-*/; + + @Override protected native void setTextImpl(String text) /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - elem.contentWindow.document.body.innerText = text; - }-*/; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + elem.contentWindow.document.body.innerText = text; + }-*/; @Override protected native void unhookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var body = elem.contentWindow.document.body; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var body = elem.contentWindow.document.body; - if (body) { - // The body can be undefined in the relatively obscure case that the RTA - // is attached and detached before it has a chance to finish initializing. - body.onkeydown = - body.onkeyup = - body.onkeypress = - body.onmousedown = - body.onmouseup = - body.onmousemove = - body.onmouseover = - body.onmouseout = - body.onclick = null; + if (body) { + // The body can be undefined in the relatively obscure case that the RTA + // is attached and detached before it has a chance to finish initializing. + body.onkeydown = + body.onkeyup = + body.onkeypress = + body.onmousedown = + body.onmouseup = + body.onmousemove = + body.onmouseover = + body.onmouseout = + body.onclick = null; - elem.contentWindow.onfocus = - elem.contentWindow.onblur = null; - } - }-*/; - - @Override - boolean isRichEditingActive(Element elem) { - return true; - } + elem.contentWindow.onfocus = + elem.contentWindow.onblur = null; + } + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplMozilla.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -20,39 +20,93 @@ */ public class RichTextAreaImplMozilla extends RichTextAreaImplStandard { + /** + * Indicates that the RichTextArea has never received focus after + * initialization. + */ + boolean isFirstFocus; + @Override public native void initElement() /*-{ - // Mozilla doesn't allow designMode to be set reliably until the iframe is - // fully loaded. - var _this = this; - var iframe = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; + // Mozilla doesn't allow designMode to be set reliably until the iframe is + // fully loaded. + var _this = this; + var iframe = _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplMozilla::isFirstFocus = true; - iframe.onload = function() { - // Some Mozillae have the nasty habit of calling onload again when you set - // designMode, so let's avoid doing it more than once. - iframe.onload = null; + iframe.onload = $entry(function() { + // Some Mozillae have the nasty habit of calling onload again when you set + // designMode, so let's avoid doing it more than once. + iframe.onload = null; - // Send notification that the iframe has finished loading. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + // Don't set designMode until the RTA is targeted by an event. This is + // necessary because editing won't work on Mozilla if the iframe is + // *hidden, but attached*. Waiting for an event gets around this issue. + // + // Note: These events will not conflict with the + // addEventListener('oneventtype', ...) in RichTextAreaImplStandard. + iframe.contentWindow.onfocus = function() { + iframe.contentWindow.onfocus = null; + iframe.contentWindow.onmouseover = null; + iframe.contentWindow.document.designMode = 'On'; + }; - // Don't set designMode until the RTA actually gets focused. This is - // necessary because editing won't work on Mozilla if the iframe is - // *hidden, but attached*. Waiting for focus gets around this issue. - // - // Note: This onfocus will not conflict with the addEventListener('focus', - // ...) // in RichTextAreaImplStandard. - iframe.contentWindow.onfocus = function() { - iframe.contentWindow.onfocus = null; - iframe.contentWindow.document.designMode = 'On'; - }; - }; - }-*/; + // Issue 1441: we also need to catch the onmouseover event because focus + // occurs after mouse down, so the cursor will not appear until the user + // clicks twice, making the RichTextArea look uneditable. Catching the + // mouseover event allows us to set design mode earlier. The focus event + // is still needed to handle tab selection. + iframe.contentWindow.onmouseover = iframe.contentWindow.onfocus; + // Send notification that the iframe has finished loading. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }); + }-*/; + @Override - public void setBackColor(String color) { - // Gecko uses 'BackColor' for the *entire area's* background. 'HiliteColor' + public void setBackColor(final String color) { + // Gecko uses 'BackColor' for the *entire area's* background. + // 'HiliteColor' // does what we actually want. execCommand("HiliteColor", color); } + + /** + * Firefox will not display the caret the first time a RichTextArea is + * programmatically focused, so we need to focus, blur, and refocus the + * RichTextArea. This only needs to be done the first time after the + * RichTextArea is initialized. See issue 3503. + */ + protected native void setFirstFocusImpl() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; + + // Remove event listeners so we don't generate extra focus and blur events. + wnd.removeEventListener('focus', elem.__gwt_focusHandler, true); + wnd.removeEventListener('blur', elem.__gwt_blurHandler, true); + wnd.focus(); + wnd.blur(); + wnd.focus(); + + // Add the event listeners now that we have focus and a caret. + wnd.addEventListener('focus', elem.__gwt_focusHandler, true); + wnd.addEventListener('blur', elem.__gwt_blurHandler, true); + + // Fire a synthetic focus event. We can't move the last call to wnd.focus() + // here because firefox will not fire the focus event reliably. + var evt = document.createEvent('HTMLEvents'); + evt.initEvent('focus', false, false); + wnd.dispatchEvent(evt); + }-*/; + + @Override + protected void setFocusImpl(final boolean focused) { + if (isFirstFocus) { + isFirstFocus = false; + setFirstFocusImpl(); + } else { + super.setFocusImpl(focused); + } + } } Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java (rev 0) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOldMozilla.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -0,0 +1,50 @@ +/* + * Copyright 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.ourproject.kune.platf.client.ui.rte.impl; + +import com.google.gwt.user.client.Command; +import com.google.gwt.user.client.DeferredCommand; + +/** + * Old Mozilla-specific implementation of rich-text editing. + */ +public class RichTextAreaImplOldMozilla extends RichTextAreaImplMozilla { + /** + * The content window cannot be focused immediately after the content window + * has been loaded, so we need to wait for an additional deferred command. + */ + @Override + protected void onElementInitialized() { + DeferredCommand.addCommand(new Command() { + public void execute() { + RichTextAreaImplOldMozilla.super.onElementInitialized(); + } + }); + } + + @Override + protected void setFirstFocusImpl() { + setFocusImpl(true); + } + + @Override + protected void setFocusImpl(boolean focused) { + // Old Mozilla does not support blur on the content window of an iframe. + if (focused) { + super.setFocusImpl(focused); + } + } +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplOpera.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -28,7 +28,7 @@ } @Override - public native void setFocus(boolean focused) /*-{ + protected native void setFocusImpl(boolean focused) /*-{ // Opera needs the *iframe* focused, not its window. if (focused) { this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.focus(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplSafari.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,12 +1,12 @@ /* * Copyright 2007 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -15,214 +15,86 @@ */ package org.ourproject.kune.platf.client.ui.rte.impl; -import com.google.gwt.user.client.Element; -import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; - /** * Safari rich text platform implementation. */ public class RichTextAreaImplSafari extends RichTextAreaImplStandard { - // @PMD:REVIEWED:VariableNamingConventions: by vjrj on 21/05/09 16:12 - private static final String[] sizeNumberCSSValues = new String[] { - "medium", "xx-small", "x-small", "small", "medium", "large", "x-large", - "xx-large"}; + @Override + public void setBackColor(String color) { + // Webkit uses 'BackColor' for the *entire area's* background. 'HiliteColor' + // does what we actually want. + execCommand("HiliteColor", color); + } - private static int webKitVersion = getWebKitVersion(); + @Override + protected native String getTextImpl() /*-{ + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText; + }-*/; - /** - * WebKit v420 began suppporting full rich text editing. - */ - private static boolean extendedEditingSupported = (webKitVersion >= 420); + @Override + protected native void hookEvents() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - /** - * WebKit v420 changed BackColor to HiliteColor. - */ - private static boolean useHiliteColor = (webKitVersion >= 420); - - /** - * WebKit version up to *and including* 420 require CSS font-size values - * (e.g. 'medium', 'x-large') rather than size numbers. All subsequent - * versions use size numbers like other browsers. - */ - private static boolean oldSchoolSizeValues = (webKitVersion <= 420); - - private static native int getWebKitVersion() /*-{ - var exp = / AppleWebKit\/([\d]+)/; - var result = exp.exec(navigator.userAgent); - if (result) { - var version = parseInt(result[1]); - if (version) { - return version; - } - } - - // Intentionally conservative fallback. - return 0; - }-*/;; - - @Override - public Element createElement() { - return super.createElement(); - } - - @Override - public native boolean isBold() /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.__gwt_isBold; - }-*/; - - @Override - public boolean isExtendedEditingSupported() { - return extendedEditingSupported; - } - - @Override - public native boolean isItalic() /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.__gwt_isItalic; - }-*/; - - @Override - public native boolean isUnderlined() /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.__gwt_isUnderlined; - }-*/; - - @Override - public void setBackColor(String color) { - if (useHiliteColor) { - execCommand("HiliteColor", color); - } else { - super.setBackColor(color); + elem.__gwt_handler = function(evt) { + if (elem.__listener) { + if (@com.google.gwt.user.client.impl.DOMImpl::isMyListener(Ljava/lang/Object;)(elem.__listener)) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); } - } + } + }; - @Override - public native void setFocus(boolean focused) /*-{ - // Safari needs the *iframe* focused, not its window. - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - if (focused) { - elem.focus(); - if (elem.__gwt_restoreSelection) { - elem.__gwt_restoreSelection(); - } - } else { - elem.blur(); - } - }-*/; + wnd.addEventListener('keydown', elem.__gwt_handler, true); + wnd.addEventListener('keyup', elem.__gwt_handler, true); + wnd.addEventListener('keypress', elem.__gwt_handler, true); + wnd.addEventListener('mousedown', elem.__gwt_handler, true); + wnd.addEventListener('mouseup', elem.__gwt_handler, true); + wnd.addEventListener('mousemove', elem.__gwt_handler, true); + wnd.addEventListener('mouseover', elem.__gwt_handler, true); + wnd.addEventListener('mouseout', elem.__gwt_handler, true); + wnd.addEventListener('click', elem.__gwt_handler, true); - @Override - public void setFontSize(FontSize fontSize) { - if (oldSchoolSizeValues) { - // Safari2 only accepts css-style 'small, medium, large, etc' values. - // Setting these doesn't seem to hurt Safari3. - int number = fontSize.getNumber(); - if ((number >= 0) && (number <= 7)) { - execCommand("FontSize", sizeNumberCSSValues[number]); - } - } else { - super.setFontSize(fontSize); - } - } + // Focus/blur event handlers. For some reason, [add|remove]eventListener() + // doesn't work on the iframe element (at least not for focus/blur). Don't + // dispatch through the normal handler method, as some of the querying we do + // there interferes with focus. + wnd.onfocus = function(evt) { + if (elem.__listener) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + }; - @Override - protected native String getTextImpl() /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText; - }-*/; + wnd.onblur = function(evt) { + if (elem.__listener) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + }; + }-*/; - @Override - protected native void hookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; - var doc = wnd.document; + @Override + protected native void setTextImpl(String text) /*-{ + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText = text; + }-*/; - // Create an expando on the element to hold the selection state. - elem.__gwt_selection = { baseOffset:0, extentOffset:0, baseNode:null, - extentNode:null }; + @Override + protected native void unhookEvents() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - // A function for restoring the selection state. - elem.__gwt_restoreSelection = function() { - var sel = elem.__gwt_selection; + wnd.removeEventListener('keydown', elem.__gwt_handler, true); + wnd.removeEventListener('keyup', elem.__gwt_handler, true); + wnd.removeEventListener('keypress', elem.__gwt_handler, true); + wnd.removeEventListener('mousedown', elem.__gwt_handler, true); + wnd.removeEventListener('mouseup', elem.__gwt_handler, true); + wnd.removeEventListener('mousemove', elem.__gwt_handler, true); + wnd.removeEventListener('mouseover', elem.__gwt_handler, true); + wnd.removeEventListener('mouseout', elem.__gwt_handler, true); + wnd.removeEventListener('click', elem.__gwt_handler, true); - // wnd.getSelection is not defined if the iframe isn't attached. - if (wnd.getSelection) { - wnd.getSelection().setBaseAndExtent(sel.baseNode, sel.baseOffset, - sel.extentNode, sel.extentOffset); - } - }; + elem.__gwt_handler = null; - // Generic event dispatcher. Also stores selection state. - elem.__gwt_handler = function(evt) { - // Store the editor's selection state. - var s = wnd.getSelection(); - elem.__gwt_selection = { - baseOffset:s.baseOffset, - extentOffset:s.extentOffset, - - baseNode:s.baseNode, - extentNode:s.extentNode - }; - - // Hang on to bold/italic/underlined states. - elem.__gwt_isBold = doc.queryCommandState('Bold'); - elem.__gwt_isItalic = doc.queryCommandState('Italic'); - elem.__gwt_isUnderlined = doc.queryCommandState('Underline'); - - // Dispatch the event. - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; - - wnd.addEventListener('keydown', elem.__gwt_handler, true); - wnd.addEventListener('keyup', elem.__gwt_handler, true); - wnd.addEventListener('keypress', elem.__gwt_handler, true); - wnd.addEventListener('mousedown', elem.__gwt_handler, true); - wnd.addEventListener('mouseup', elem.__gwt_handler, true); - wnd.addEventListener('mousemove', elem.__gwt_handler, true); - wnd.addEventListener('mouseover', elem.__gwt_handler, true); - wnd.addEventListener('mouseout', elem.__gwt_handler, true); - wnd.addEventListener('click', elem.__gwt_handler, true); - - // Focus/blur event handlers. For some reason, [add|remove]eventListener() - // doesn't work on the iframe element (at least not for focus/blur). Don't - // dispatch through the normal handler method, as some of the querying we do - // there interferes with focus. - elem.onfocus = function(evt) { - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; - - elem.onblur = function(evt) { - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; - }-*/; - - @Override - protected native void setTextImpl(String text) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerText = text; - }-*/; - - @Override - protected native void unhookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; - - wnd.removeEventListener('keydown', elem.__gwt_handler, true); - wnd.removeEventListener('keyup', elem.__gwt_handler, true); - wnd.removeEventListener('keypress', elem.__gwt_handler, true); - wnd.removeEventListener('mousedown', elem.__gwt_handler, true); - wnd.removeEventListener('mouseup', elem.__gwt_handler, true); - wnd.removeEventListener('mousemove', elem.__gwt_handler, true); - wnd.removeEventListener('mouseover', elem.__gwt_handler, true); - wnd.removeEventListener('mouseout', elem.__gwt_handler, true); - wnd.removeEventListener('click', elem.__gwt_handler, true); - - elem.__gwt_restoreSelection = null; - elem.__gwt_handler = null; - - elem.onfocus = null; - elem.onblur = null; - }-*/; + elem.onfocus = null; + elem.onblur = null; + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/impl/RichTextAreaImplStandard.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -19,18 +19,27 @@ import org.ourproject.kune.platf.client.ui.rte.RichTextArea.FontSize; import org.ourproject.kune.platf.client.ui.rte.RichTextArea.Justification; +import com.google.gwt.core.client.JavaScriptException; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; /** * Basic rich text platform implementation. */ +@SuppressWarnings("deprecation") public abstract class RichTextAreaImplStandard extends RichTextAreaImpl implements RichTextArea.BasicFormatter, - RichTextArea.ExtendedFormatter { + RichTextArea.ExtendedFormatter, RichTextArea.Formatter { + /** + * The message displayed when the formatter is used before the RichTextArea + * is initialized. + */ + private static final String INACTIVE_MESSAGE = "RichTextArea formatters " + + "cannot be used until the RichTextArea is attached and focused."; /** - * Holds a cached copy of any user setHTML/setText actions until the real - * text area is fully initialized. Becomes <code>null</code> after init. + * Holds a cached copy of any user setHTML/setText/setEnabled actions until + * the real text area is fully initialized. Becomes <code>null</code> after + * init. */ private Element beforeInitPlaceholder = DOM.createDiv(); @@ -42,16 +51,26 @@ */ protected boolean initializing; + /** + * Indicates that the text area should be focused as soon as it is loaded. + */ + private boolean isPendingFocus; + + /** + * True when the element has been attached. + */ + private boolean isReady; + public void copy() { execCommand("Copy", null); } @Override public native Element createElement() /*-{ - return $doc.createElement('iframe'); - }-*/; + return $doc.createElement('iframe'); + }-*/; - public void createLink(String url) { + public void createLink(final String url) { execCommand("CreateLink", url); } @@ -83,29 +102,29 @@ @Override public native void initElement() /*-{ - // Most browsers don't like setting designMode until slightly _after_ - // the iframe becomes attached to the DOM. Any non-zero timeout will do - // just fine. - var _this = this; - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::initializing = true; - setTimeout(function() { - // Turn on design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; + // Most browsers don't like setting designMode until slightly _after_ + // the iframe becomes attached to the DOM. Any non-zero timeout will do + // just fine. + var _this = this; + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitializing()(); + setTimeout($entry(function() { + // Turn on design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.designMode = 'On'; - // Send notification that the iframe has reached design mode. - _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); - }, 1); - }-*/; + // Send notification that the iframe has reached design mode. + _this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImplStandard::onElementInitialized()(); + }), 1); + }-*/; public void insertHorizontalRule() { execCommand("InsertHorizontalRule", null); } - public void insertHtml(String html) { - execCommand("InsertHtml", html); + public void insertHTML(final String html) { + execCommand("InsertHTML", html); } - public void insertImage(String url) { + public void insertImage(final String url) { execCommand("InsertImage", url); } @@ -117,20 +136,14 @@ execCommand("InsertUnorderedList", null); } - @Override - // @PMD:REVIEWED:EmptyMethodInAbstractClassShouldBeAbstract: by vjrj on 21/05/09 13:58 - public boolean isBasicEditingSupported() { - return true; - } - public boolean isBold() { return queryCommandState("Bold"); } @Override - // @PMD:REVIEWED:EmptyMethodInAbstractClassShouldBeAbstract: by vjrj on 21/05/09 13:58 - public boolean isExtendedEditingSupported() { - return true; + public boolean isEnabled() { + return beforeInitPlaceholder == null ? isEnabledImpl() + : !beforeInitPlaceholder.getPropertyBoolean("disabled"); } public boolean isItalic() { @@ -162,7 +175,7 @@ } public void redo() { - execCommand("Redo", null); + execCommand("Redo", "false"); } public void removeFormat() { @@ -181,33 +194,45 @@ execCommand("SelectAll", null); } - public void setBackColor(String color) { + public void setBackColor(final String color) { execCommand("BackColor", color); } @Override - public native void setFocus(boolean focused) /*-{ - if (focused) { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.focus(); - } else { - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.blur(); - } - }-*/; + public void setEnabled(final boolean enabled) { + if (beforeInitPlaceholder == null) { + setEnabledImpl(enabled); + } else { + beforeInitPlaceholder.setPropertyBoolean("disabled", !enabled); + } + } - public void setFontName(String name) { + @Override + public void setFocus(final boolean focused) { + if (initializing) { + // Issue 3503: if we focus before the iframe is in design mode, the + // text + // caret will not appear. + isPendingFocus = focused; + } else { + setFocusImpl(focused); + } + } + + public void setFontName(final String name) { execCommand("FontName", name); } - public void setFontSize(FontSize fontSize) { + public void setFontSize(final FontSize fontSize) { execCommand("FontSize", Integer.toString(fontSize.getNumber())); } - public void setForeColor(String color) { + public void setForeColor(final String color) { execCommand("ForeColor", color); } @Override - public final void setHTML(String html) { + public final void setHTML(final String html) { if (beforeInitPlaceholder == null) { setHTMLImpl(html); } else { @@ -215,9 +240,11 @@ } } - public void setJustification(Justification justification) { + public void setJustification(final Justification justification) { if (justification == Justification.CENTER) { execCommand("JustifyCenter", null); + } else if (justification == Justification.FULL) { + execCommand("JustifyFull", null); } else if (justification == Justification.LEFT) { execCommand("JustifyLeft", null); } else if (justification == Justification.RIGHT) { @@ -226,7 +253,7 @@ } @Override - public final void setText(String text) { + public final void setText(final String text) { if (beforeInitPlaceholder == null) { setTextImpl(text); } else { @@ -259,11 +286,13 @@ } public void undo() { - execCommand("Undo", null); + execCommand("Undo", "false"); } @Override public void uninitElement() { + isReady = false; + // Issue 1897: initElement uses a timeout, so its possible to call this // method after calling initElement, but before the event system is in // place. @@ -275,153 +304,206 @@ // Unhook all custom event handlers when the element is detached. unhookEvents(); - // Recreate the placeholder element and store the iframe's contents in it. - // This is necessary because some browsers will wipe the iframe's contents - // when it is removed from the DOM. - String html = getHTML(); + // Recreate the placeholder element and store the iframe's contents and + // the + // enabled status in it. This is necessary because some browsers will + // wipe + // the iframe's contents when it is removed from the DOM. + final String html = getHTML(); + final boolean enabled = isEnabled(); beforeInitPlaceholder = DOM.createDiv(); DOM.setInnerHTML(beforeInitPlaceholder, html); + setEnabled(enabled); } protected native String getHTMLImpl() /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML; - }-*/; + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML; + }-*/; protected native String getTextImpl() /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent; - }-*/; + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent; + }-*/; @Override protected native void hookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - elem.__gwt_handler = function(evt) { - if (elem.__listener) { - [email protected]::onBrowserEvent(Lcom/google/gwt/user/client/Event;)(evt); - } - }; + elem.__gwt_handler = $entry(function(evt) { + if (elem.__listener) { + if (@com.google.gwt.user.client.impl.DOMImpl::isMyListener(Ljava/lang/Object;)(elem.__listener)) { + @com.google.gwt.user.client.DOM::dispatchEvent(Lcom/google/gwt/user/client/Event;Lcom/google/gwt/user/client/Element;Lcom/google/gwt/user/client/EventListener;)(evt, elem, elem.__listener); + } + } + }); - elem.__gwt_focusHandler = function(evt) { - if (elem.__gwt_isFocused) { - return; - } + elem.__gwt_focusHandler = function(evt) { + if (elem.__gwt_isFocused) { + return; + } - elem.__gwt_isFocused = true; - elem.__gwt_handler(evt); - }; + elem.__gwt_isFocused = true; + elem.__gwt_handler(evt); + }; - elem.__gwt_blurHandler = function(evt) { - if (!elem.__gwt_isFocused) { - return; - } + elem.__gwt_blurHandler = function(evt) { + if (!elem.__gwt_isFocused) { + return; + } - elem.__gwt_isFocused = false; - elem.__gwt_handler(evt); - }; + elem.__gwt_isFocused = false; + elem.__gwt_handler(evt); + }; - wnd.addEventListener('keydown', elem.__gwt_handler, true); - wnd.addEventListener('keyup', elem.__gwt_handler, true); - wnd.addEventListener('keypress', elem.__gwt_handler, true); - wnd.addEventListener('mousedown', elem.__gwt_handler, true); - wnd.addEventListener('mouseup', elem.__gwt_handler, true); - wnd.addEventListener('mousemove', elem.__gwt_handler, true); - wnd.addEventListener('mouseover', elem.__gwt_handler, true); - wnd.addEventListener('mouseout', elem.__gwt_handler, true); - wnd.addEventListener('click', elem.__gwt_handler, true); + wnd.addEventListener('keydown', elem.__gwt_handler, true); + wnd.addEventListener('keyup', elem.__gwt_handler, true); + wnd.addEventListener('keypress', elem.__gwt_handler, true); + wnd.addEventListener('mousedown', elem.__gwt_handler, true); + wnd.addEventListener('mouseup', elem.__gwt_handler, true); + wnd.addEventListener('mousemove', elem.__gwt_handler, true); + wnd.addEventListener('mouseover', elem.__gwt_handler, true); + wnd.addEventListener('mouseout', elem.__gwt_handler, true); + wnd.addEventListener('click', elem.__gwt_handler, true); - wnd.addEventListener('focus', elem.__gwt_focusHandler, true); - wnd.addEventListener('blur', elem.__gwt_blurHandler, true); - }-*/; + wnd.addEventListener('focus', elem.__gwt_focusHandler, true); + wnd.addEventListener('blur', elem.__gwt_blurHandler, true); + }-*/; + protected native boolean isEnabledImpl() /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + return elem.contentWindow.document.designMode.toUpperCase() == 'ON'; + }-*/; + @Override protected void onElementInitialized() { - // Issue 1897: This method is called after a timeout, during which time the + // Issue 1897: This method is called after a timeout, during which time + // the // element might by detached. if (!initializing) { return; } initializing = false; + isReady = true; - super.onElementInitialized(); - // When the iframe is ready, ensure cached content is set. if (beforeInitPlaceholder != null) { setHTMLImpl(DOM.getInnerHTML(beforeInitPlaceholder)); + setEnabledImpl(isEnabled()); beforeInitPlaceholder = null; } + + super.onElementInitialized(); + + // Focus on the element now that it is initialized + if (isPendingFocus) { + isPendingFocus = false; + setFocus(true); + } } + protected void onElementInitializing() { + initializing = true; + isPendingFocus = false; + } + + protected native void setEnabledImpl(boolean enabled) /*-{ + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + elem.contentWindow.document.designMode = enabled ? 'On' : 'Off'; + }-*/; + + protected native void setFocusImpl(boolean focused) /*-{ + if (focused) { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.focus(); + } else { + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.blur(); + } + }-*/; + protected native void setHTMLImpl(String html) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML = html; - }-*/; + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.innerHTML = html; + }-*/; protected native void setTextImpl(String text) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent = text; - }-*/; + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.body.textContent = text; + }-*/; protected native void unhookEvents() /*-{ - var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; - var wnd = elem.contentWindow; + var elem = this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem; + var wnd = elem.contentWindow; - wnd.removeEventListener('keydown', elem.__gwt_handler, true); - wnd.removeEventListener('keyup', elem.__gwt_handler, true); - wnd.removeEventListener('keypress', elem.__gwt_handler, true); - wnd.removeEventListener('mousedown', elem.__gwt_handler, true); - wnd.removeEventListener('mouseup', elem.__gwt_handler, true); - wnd.removeEventListener('mousemove', elem.__gwt_handler, true); - wnd.removeEventListener('mouseover', elem.__gwt_handler, true); - wnd.removeEventListener('mouseout', elem.__gwt_handler, true); - wnd.removeEventListener('click', elem.__gwt_handler, true); + wnd.removeEventListener('keydown', elem.__gwt_handler, true); + wnd.removeEventListener('keyup', elem.__gwt_handler, true); + wnd.removeEventListener('keypress', elem.__gwt_handler, true); + wnd.removeEventListener('mousedown', elem.__gwt_handler, true); + wnd.removeEventListener('mouseup', elem.__gwt_handler, true); + wnd.removeEventListener('mousemove', elem.__gwt_handler, true); + wnd.removeEventListener('mouseover', elem.__gwt_handler, true); + wnd.removeEventListener('mouseout', elem.__gwt_handler, true); + wnd.removeEventListener('click', elem.__gwt_handler, true); - wnd.removeEventListener('focus', elem.__gwt_focusHandler, true); - wnd.removeEventListener('blur', elem.__gwt_blurHandler, true); + wnd.removeEventListener('focus', elem.__gwt_focusHandler, true); + wnd.removeEventListener('blur', elem.__gwt_blurHandler, true); - elem.__gwt_handler = null; - elem.__gwt_focusHandler = null; - elem.__gwt_blurHandler = null; - }-*/; + elem.__gwt_handler = null; + elem.__gwt_focusHandler = null; + elem.__gwt_blurHandler = null; + }-*/; - void execCommand(String cmd, String param) { - if (isRichEditingActive(elem)) { - // When executing a command, focus the iframe first, since some commands + void execCommand(final String cmd, final String param) { + assert isReady : INACTIVE_MESSAGE; + if (isReady) { + // When executing a command, focus the iframe first, since some + // commands // don't take properly when it's not focused. setFocus(true); - execCommandAssumingFocus(cmd, param); + try { + execCommandAssumingFocus(cmd, param); + } catch (final JavaScriptException e) { + // In mozilla, editing throws a JS exception if the iframe is + // *hidden, but attached*. + } } } native void execCommandAssumingFocus(String cmd, String param) /*-{ - this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.execCommand(cmd, false, param); - }-*/; + this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.execCommand(cmd, false, param); + }-*/; - native boolean isRichEditingActive(Element e) /*-{ - return ((e.contentWindow.document.designMode).toUpperCase()) == 'ON'; - }-*/; - - boolean queryCommandState(String cmd) { - if (isRichEditingActive(elem)) { - // When executing a command, focus the iframe first, since some commands + boolean queryCommandState(final String cmd) { + if (isReady) { + // When executing a command, focus the iframe first, since some + // commands // don't take properly when it's not focused. setFocus(true); - return queryCommandStateAssumingFocus(cmd); - } else { - return false; + try { + return queryCommandStateAssumingFocus(cmd); + } catch (final JavaScriptException e) { + return false; + } } + return false; } native boolean queryCommandStateAssumingFocus(String cmd) /*-{ - return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandState(cmd); - }-*/; + return !!this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandState(cmd); + }-*/; - String queryCommandValue(String cmd) { - // When executing a command, focus the iframe first, since some commands - // don't take properly when it's not focused. - setFocus(true); - return queryCommandValueAssumingFocus(cmd); + String queryCommandValue(final String cmd) { + if (isReady) { + // When executing a command, focus the iframe first, since some + // commands + // don't take properly when it's not focused. + setFocus(true); + try { + return queryCommandValueAssumingFocus(cmd); + } catch (final JavaScriptException e) { + return ""; + } + } + return ""; } native String queryCommandValueAssumingFocus(String cmd) /*-{ - return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandValue(cmd); - }-*/; + return this.@org.ourproject.kune.platf.client.ui.rte.impl.RichTextAreaImpl::elem.contentWindow.document.queryCommandValue(cmd); + }-*/; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rte/insertlink/AbstractWysiwygClientTest.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -23,20 +23,19 @@ import com.google.gwt.junit.client.GWTTestCase; /** - * Base class for all WYSIWYG client tests. It returns the name of the module in {@link #getModuleName()} so you don't - * have to do it in each test. + * Base class for all WYSIWYG client tests. It returns the name of the module in + * {@link #getModuleName()} so you don't have to do it in each test. * * @version $Id$ */ -public abstract class AbstractWysiwygClientTest extends GWTTestCase -{ +public abstract class AbstractWysiwygClientTest extends GWTTestCase { /** * {@inheritDoc} * * @see GWTTestCase#getModuleName() */ - public String getModuleName() - { + @Override + public String getModuleName() { return "com.xpn.xwiki.wysiwyg.Wysiwyg"; } @@ -45,11 +44,12 @@ * * @see GWTTestCase#gwtSetUp() */ - protected void gwtSetUp() throws Exception - { + @Override + protected void gwtSetUp() throws Exception { super.gwtSetUp(); - // We have to remove the default body border because it affects the range detection in IE. + // We have to remove the default body border because it affects the + // range detection in IE. Document.get().getBody().getStyle().setProperty("borderStyle", "none"); } } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/OutermostCallInterceptor.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -43,7 +43,7 @@ private final MethodInterceptor interceptor; - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") private final ThreadLocal count = new ThreadLocal() { @Override protected Integer initialValue() { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/TagUserContentManagerDefault.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -28,44 +28,45 @@ private final TagUserContent finder; @Inject - public TagUserContentManagerDefault(Provider<EntityManager> provider, TagManager tagManager, TagUserContent finder) { + public TagUserContentManagerDefault(final Provider<EntityManager> provider, final TagManager tagManager, + final TagUserContent finder) { super(provider, TagUserContent.class); this.provider = provider; this.tagManager = tagManager; this.finder = finder; } - public List<Tag> find(User user, Content content) { + public List<Tag> find(final User user, final Content content) { return finder.findTags(user, content); } - public TagCloudResult getTagCloudResultByGroup(Group group) { + public TagCloudResult getTagCloudResultByGroup(final Group group) { return new TagCloudResult(getSummaryByGroup(group), getMaxCount(group), getMinCount(group)); } - public String getTagsAsString(User user, Content content) { + public String getTagsAsString(final User user, final Content content) { String tagConcatenated = ""; if (user.getId() != null) { // FIXME: User must be persisted (this fails on tests) - List<Tag> tags = find(user, content); - for (Tag tag : tags) { + final List<Tag> tags = find(user, content); + for (final Tag tag : tags) { tagConcatenated += " " + tag.getName(); } } return tagConcatenated.replaceFirst(" ", ""); } - public void remove(User user, Content content) { - for (TagUserContent item : finder.find(user, content)) { + public void remove(final User user, final Content content) { + for (final TagUserContent item : finder.find(user, content)) { provider.get().remove(item); } } - public void setTags(User user, Content content, String tags) { + public void setTags(final User user, final Content content, final String tags) { final ArrayList<String> tagsStripped = TextUtils.splitTags(tags); final ArrayList<Tag> tagList = new ArrayList<Tag>(); - for (String tagString : tagsStripped) { + for (final String tagString : tagsStripped) { Tag tag; try { tag = tagManager.findByTagName(tagString); @@ -78,33 +79,31 @@ } } remove(user, content); - for (Tag tag : tagList) { - TagUserContent tagUserContent = new TagUserContent(tag, user, content); + for (final Tag tag : tagList) { + final TagUserContent tagUserContent = new TagUserContent(tag, user, content); persist(tagUserContent); } } - @SuppressWarnings("unchecked") - private int getMaxCount(Group group) { - Query q = provider.get().createNamedQuery(TagUserContent.TAGSMAXGROUPED); + private int getMaxCount(final Group group) { + final Query q = provider.get().createNamedQuery(TagUserContent.TAGSMAXGROUPED); q.setParameter("group", group); - List resultList = q.getResultList(); + final List resultList = q.getResultList(); return (resultList.size() == 0 ? 0 : ((Long) resultList.get(0)).intValue()); } - @SuppressWarnings("unchecked") - private int getMinCount(Group group) { - Query q = provider.get().createNamedQuery(TagUserContent.TAGSMINGROUPED); + @SuppressWarnings("rawtypes") + private int getMinCount(final Group group) { + final Query q = provider.get().createNamedQuery(TagUserContent.TAGSMINGROUPED); q.setParameter("group", group); - List resultList = q.getResultList(); + final List resultList = q.getResultList(); return (resultList.size() == 0 ? 0 : ((Long) resultList.get(0)).intValue()); } - @SuppressWarnings("unchecked") private List<TagCount> getSummaryByGroup(final Group group) { - Query q = provider.get().createNamedQuery(TagUserContent.TAGSGROUPED); + final Query q = provider.get().createNamedQuery(TagUserContent.TAGSGROUPED); q.setParameter("group", group); - List<TagCount> results = q.getResultList(); + final List<TagCount> results = q.getResultList(); return results; } } 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-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileUploadManagerAbstract.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -59,7 +59,7 @@ protected abstract void beforeRespond(final HttpServletResponse response, final Writer w) throws IOException; @Override - @SuppressWarnings( { "unchecked", "deprecation" }) + @SuppressWarnings({ "rawtypes", "deprecation" }) protected void doPost(final HttpServletRequest req, final HttpServletResponse response) throws ServletException, IOException { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/mapper/GroupListModeConverter.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -39,7 +39,7 @@ add(GroupListMode.NOBODY); } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Object convert(final Object destination, final Object source, final Class destinationClass, final Class sourceClass) { if (source == null) { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/I18nRPC.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -105,7 +105,7 @@ String translation = null; try { translation = getTranslationWrapper(language, text); - } catch (SessionExpiredException e) { + } catch (final SessionExpiredException e) { } return translation; } Modified: trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/wiki/KuneWiki.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,5 +1,6 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name='org.ourproject.kune.workspace.KuneWorkspace' /> + <source path="client" /> +</module> \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/workspace/KuneWorkspace.gwt.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,6 +1,17 @@ -<!DOCTYPE document SYSTEM "http://google-web-toolkit.googlecode.com/svn/tags/1.6.4/distro-source/core/…"> +<!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/…"> <module> - <inherits name='org.ourproject.kune.platf.KunePlatform' /> - <inherits name="com.google.gwt.core.Core" /> - -</module> + <inherits name='org.ourproject.kune.platf.KunePlatform' /> + <inherits name="org.ourproject.kune.chat.KuneChat" /> + <inherits name="com.google.gwt.core.Core" /> + <stylesheet src="js/ext/resources/css/ext-all.css" /> + <script src="js/ext/adapter/ext/ext-base.js" /> + <script src="js/ext/ext-all.js" /> + <inherits name="com.gwtext.GwtExt" /> + <inherits name="com.calclab.suco.Suco" /> + <inherits name="com.calclab.emiteuimodule.EmiteUIModule" /> + <inherits name="com.gwtextux.GwtExtUx" /> + <inherits name="com.gwtextux.UploadDialog" /> + <inherits name="com.gwtextux.ToastWindow" /> + <inherits name="com.google.gwt.wave.Wave" /> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java"/> +</module> \ No newline at end of file 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-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -1081,13 +1081,6 @@ } }); - register(ApplicationComponentGroup.class, new Factory<GlobalShortcutRegister>(GlobalShortcutRegister.class) { - @Override - public GlobalShortcutRegister create() { - return new GlobalShortcutRegister(); - } - }); - register(InsertLinkGroup.class, new Factory<InsertLinkLocal>(InsertLinkLocal.class) { @Override public InsertLinkLocal create() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -44,9 +44,10 @@ mainFitPanel = new Panel(); mainFitPanel.setLayout(new FitLayout()); mainFitPanel.setBorder(false); - mainFitPanel.setWidth(150); + // 150 for small screens + mainFitPanel.setWidth(165); - Panel anchorLayoutPanel = new Panel(); + final Panel anchorLayoutPanel = new Panel(); anchorLayoutPanel.setLayout(new AnchorLayout()); anchorLayoutPanel.setBorder(false); @@ -104,8 +105,8 @@ private void openFirstIfActiveNotVisible() { if (accordionLayout.getActiveItem() != null && accordionLayout.getActiveItem().isHidden()) { - for (Component compo : entitySummary.getComponents()) { - Panel panel = (Panel) compo; + for (final Component compo : entitySummary.getComponents()) { + final Panel panel = (Panel) compo; if (panel.isVisible()) { // First visible if (panel.isCollapsed()) { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/HttpServletRequestMocked.java 2010-12-07 22:38:26 UTC (rev 1158) @@ -20,7 +20,7 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getAttributeNames() { return null; } @@ -58,12 +58,12 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getHeaderNames() { return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getHeaders(final String arg0) { return null; } @@ -84,7 +84,7 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getLocales() { return null; } @@ -105,12 +105,12 @@ return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Map getParameterMap() { return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") public Enumeration getParameterNames() { return null; } Property changes on: trunk/war/WEB-INF ___________________________________________________________________ Name: svn:ignore - classes test-classes + classes lib/* lib test-classes Name: svn:inore + lib lib/* Deleted: trunk/war/WEB-INF/lib/gwt-log-2.5.3.jar =================================================================== (Binary files differ) Deleted: trunk/war/WEB-INF/lib/gwt-servlet-1.6.4.jar =================================================================== (Binary files differ) Deleted: trunk/war/WEB-INF/lib/gwt-servlet-2.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Deleted: trunk/war/WEB-INF/lib/gwt-user-1.6.4.jar =================================================================== (Binary files differ) Modified: trunk/war/WEB-INF/web.xml =================================================================== --- trunk/war/WEB-INF/web.xml 2010-12-07 20:20:37 UTC (rev 1157) +++ trunk/war/WEB-INF/web.xml 2010-12-07 22:38:26 UTC (rev 1158) @@ -1,16 +1,19 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="utf-8"?> <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee +http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> +  +  +  <display-name>ws</display-name> <description>kune workspace</description> -  <welcome-file-list> <welcome-file>ws.html</welcome-file> </welcome-file-list> - <context-param> <param-name>jruby.standalone</param-name> <param-value>true</param-value> @@ -29,57 +32,42 @@ <param-name>rails.env</param-name> <param-value>production</param-value> </context-param> - <context-param> <param-name>jruby.max.runtimes</param-name> <param-value>1</param-value> </context-param> - <context-param> <param-name>public.root</param-name> <param-value>/public/</param-value> </context-param> - - <filter> <filter-name>RackFilter</filter-name> - <filter-class>org.jruby.rack.RackFilter - </filter-class> + <filter-class>org.jruby.rack.RackFilter</filter-class> </filter> <filter-mapping> <filter-name>RackFilter</filter-name> <url-pattern>/public/*</url-pattern> </filter-mapping> - <listener> - <listener-class>org.jruby.rack.rails.RailsServletContextListener - </listener-class> + <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class> </listener> - - <filter> <filter-name>rack</filter-name> - <filter-class> - org.ourproject.kune.rack.RackServletFilter - </filter-class> + <filter-class>org.ourproject.kune.rack.RackServletFilter</filter-class> <init-param> - <param-name>org.ourproject.kune.rack.RackModule - </param-name> + <param-name>org.ourproject.kune.rack.RackModule</param-name> <param-value> org.ourproject.kune.app.server.KuneRackModule </param-value> </init-param> </filter> - <filter-mapping> <filter-name>rack</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> - <servlet> <servlet-name>Proxy</servlet-name> - <servlet-class>de.spieleck.servlets.ProxyServlet - </servlet-class> + <servlet-class>de.spieleck.servlets.ProxyServlet</servlet-class> <init-param> <param-name>remotePath</param-name> <param-value>/http-bind/</param-value> @@ -97,27 +85,83 @@ <servlet-name>Proxy</servlet-name> <url-pattern>/http-bind/</url-pattern> </servlet-mapping> - <servlet> - <servlet-name>remoteLoggerServiceImpl - </servlet-name> - <servlet-class> - com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>remoteLoggerServiceImpl - </servlet-name> - <url-pattern>/ws/gwt-log</url-pattern> - </servlet-mapping> - - <servlet> - <servlet-name>jUnitHostImpl</servlet-name> - <servlet-class>com.google.gwt.junit.server.JUnitHostImpl - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>jUnitHostImpl</servlet-name> - <url-pattern>/ws/junithost</url-pattern> - </servlet-mapping> - -</web-app> + +  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +</web-app> \ No newline at end of file

1 0