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> <!-- Available versions: http://repo1.maven.org/maven2/com/google/gwt/gwt-dev/ --> @@ -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> <!-- hibernate JPA --> <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> + <!-- =roo --> + </dependency> + <dependency> <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + <!-- =roo --> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + <!-- =roo --> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.5.2</version> + <version>${slf4j.version}</version> + <!-- =roo --> </dependency> <!-- REST: xml and json (stax) --> <dependency> @@ -304,8 +323,9 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.7</version> - <!-- <scope>test</scope> --> + <version>4.8.1</version> + <!-- =roo --> + <scope>test</scope> </dependency> <!-- <dependency> --> <!-- <groupId>org.openqa.selenium.client-drivers</groupId> --> @@ -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>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_resultt... +@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-defi... + @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", "[email protected]", "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", "[email protected]", "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", "[email protected]", "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); }