Author: chris.laprun(a)jboss.com Date: 2007-10-27 21:09:21 -0400 (Sat, 27 Oct 2007) New Revision: 8785 Modified: branches/JBoss_Portal_Branch_2_6/api/build.bat branches/JBoss_Portal_Branch_2_6/api/build.sh branches/JBoss_Portal_Branch_2_6/api/build.xml branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalRuntimeContext.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalURL.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventContext.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventListener.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/navstate/NavigationalStateContext.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNode.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNodeURL.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventContext.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/PortalSession.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/event/PortalSessionEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserAuthenticationEvent.java branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserEvent.java branches/JBoss_Portal_Branch_2_6/cms/build.bat branches/JBoss_Portal_Branch_2_6/cms/build.sh branches/JBoss_Portal_Branch_2_6/cms/build.xml branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMS.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/Command.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ApprovalWorkflowInterceptor.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MakeLiveVersionCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/SearchCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/ClusteredCacheListener.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMS.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSObject.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSUser.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/File.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Folder.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResult.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResultURL.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManager.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProvider.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/CMSPermission.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Criteria.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermRoleAssoc.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermUserAssoc.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Permission.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PortalCMSSecurityContext.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/FileUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishServlet.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/Content.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/PublishAssignmentHandler.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/TaskExceptionHandler.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/CMSInterceptorStackFactory.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/IdentityDataLoader.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/SecureCommandTestCase.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestManageAccess.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestReadAccess.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestWriteAccess.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/AbstractWorkflowTestCase.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestApprovedPublish.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestDeniedPublish.java branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestWorkflowEnvironment.java branches/JBoss_Portal_Branch_2_6/cms/src/resources/hibernate/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-security.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/index.html branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/private/license.html branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/project.html branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/support.html branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/datasource/ports01-ds.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/datasource/ports02-ds.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/domain-identity.hbm.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-ehcache.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/fs-repository.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/repository.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/log4j.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/pm-cache.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/standardidentity-config.xml branches/JBoss_Portal_Branch_2_6/core-admin/build.bat branches/JBoss_Portal_Branch_2_6/core-admin/build.sh branches/JBoss_Portal_Branch_2_6/core-admin/build.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AssignContentToWindowAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/ContentTypeConverter.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/PortalObjectIdConverter.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portal.taglib.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSConstants.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/aspect/IdentityBindingInterceptor.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSEditorConstants.java branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/ehcache.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_es.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-web.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portal-lib.tld branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java Log: Updated svn properties Property changes on: branches/JBoss_Portal_Branch_2_6/api/build.bat ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/build.sh ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/build.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalRuntimeContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalRuntimeContext.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalRuntimeContext.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -29,7 +29,7 @@ * The portal runtime context which provides access to runtime objects. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalRuntimeContext { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalRuntimeContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalURL.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalURL.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,25 +26,23 @@ * Base interface for portal urls. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalURL { /** - * Affect the authentication mode of the transport protocol that the URL will designate. - * A null value indicates that it should reuse the value of the incoming transport. + * Affect the authentication mode of the transport protocol that the URL will designate. A null value indicates that + * it should reuse the value of the incoming transport. */ void setAuthenticated(Boolean wantAuthenticated); /** - * Affect the security mode of the transport protocol that the URL will designate. - * A null value indicates that it should reuse the value of the incoming transport. + * Affect the security mode of the transport protocol that the URL will designate. A null value indicates that it + * should reuse the value of the incoming transport. */ void setSecure(Boolean wantSecure); - /** - * Affet the URL generation by creating either a relative or an absolute URL. - */ + /** Affet the URL generation by creating either a relative or an absolute URL. */ void setRelative(boolean relative); /** Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/PortalURL.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEvent.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventContext.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventContext.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalEventContext { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventListener.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventListener.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalEventListener { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/event/PortalEventListener.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/navstate/NavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/navstate/NavigationalStateContext.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/navstate/NavigationalStateContext.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.api.navstate; +import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import org.jboss.portal.api.node.PortalNode; /** * Provide access to a portion of the navigational state managed by the portal. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface NavigationalStateContext { @@ -46,7 +46,7 @@ /** * Updates the window state of a window. * - * @param window the window to update + * @param window the window to update * @param windowState the new window state value * @throws IllegalArgumentException */ @@ -65,7 +65,7 @@ * Updates the mode of a window. * * @param window the window to update - * @param mode the new mode value + * @param mode the new mode value * @throws IllegalArgumentException */ void setMode(PortalNode window, Mode mode) throws IllegalArgumentException; Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/navstate/NavigationalStateContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNode.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNode.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNode.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -25,8 +25,8 @@ import org.jboss.portal.api.PortalRuntimeContext; import java.util.Collection; +import java.util.Locale; import java.util.Map; -import java.util.Locale; /** * Represents a portal node, a first class entity for the portal. @@ -80,7 +80,7 @@ /** * Returns the best display name for specified locale. * - * @return the display name + * @return the display name */ String getDisplayName(Locale locale); Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNode.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNodeURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNodeURL.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNodeURL.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -35,7 +35,7 @@ /** * Set a parameter on the URL. * - * @param name the parameter name + * @param name the parameter name * @param value the parameter value * @throws IllegalArgumentException if the name is null */ @@ -44,7 +44,7 @@ /** * Set a parameter on the URL. * - * @param name the parameter name + * @param name the parameter name * @param values the parameter values * @throws IllegalArgumentException if the name is null */ Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/PortalNodeURL.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageEvent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageEvent.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageEvent.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -28,7 +28,7 @@ * Base class for page events. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class PageEvent extends PortalNodeEvent { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageEvent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -28,7 +28,7 @@ * This event is raised whenever a page is rendered. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PageRenderEvent extends PageEvent { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PageRenderEvent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.api.node.event; +import org.jboss.portal.api.event.PortalEvent; import org.jboss.portal.api.node.PortalNode; -import org.jboss.portal.api.event.PortalEvent; /** * Base class for all portal node events. Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEvent.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventContext.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventContext.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.api.node.event; +import org.jboss.portal.api.event.PortalEventContext; import org.jboss.portal.api.node.PortalNode; -import org.jboss.portal.api.event.PortalEventContext; /** * The context in which a <code>PortalNodeEvent</code> is dispatched. - * + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -32,15 +32,13 @@ { /** * <p>Dispatch an event to the listener. If the listener does not care about replacing the current event with a new - * one then it should return the event returned by the <code>PortalNodeEventContext</code> provided such as:</p> + * one then it should return the event returned by the <code>PortalNodeEventContext</code> provided such as:</p> <p/> + * <p><code>return context.dispatch()</code></p> <p/> <p>Otherwise it can return a new event to replace the current + * one. Only events of type <code>WindowNavigationEvent</code> or <code>WindowActionEvent;</code> will have an + * effect.</p> * - * <p><code>return context.dispatch()</code></p> - * - * <p>Otherwise it can return a new event to replace the current one. Only events of type <code>WindowNavigationEvent</code> - * or <code>WindowActionEvent;</code> will have an effect.</p> - * * @param context the context in which the event is triggered - * @param event the fired event + * @param event the fired event * @return an event */ PortalNodeEvent onEvent(PortalNodeEventContext context, PortalNodeEvent event); Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/PortalNodeEventListener.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowActionEvent.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowEvent.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowNavigationEvent.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/node/event/WindowRenderEvent.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/PortalSession.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/PortalSession.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/PortalSession.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,11 +23,11 @@ package org.jboss.portal.api.session; /** - * The portal session, the portal session attributes are accessible however it is not possible to influence - * the lifecycle of the session as it is managed by the portal. + * The portal session, the portal session attributes are accessible however it is not possible to influence the + * lifecycle of the session as it is managed by the portal. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalSession { @@ -50,7 +50,7 @@ /** * Update an attribute value. If the attribute value is null, then it is considered as a removal. * - * @param name the attribute name + * @param name the attribute name * @param attribute the attribute value * @throws IllegalArgumentException if the attribute name is null */ Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/PortalSession.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/event/PortalSessionEvent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/event/PortalSessionEvent.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/event/PortalSessionEvent.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalSessionEvent extends PortalEvent { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/session/event/PortalSessionEvent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserAuthenticationEvent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserAuthenticationEvent.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserAuthenticationEvent.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class UserAuthenticationEvent extends UserEvent { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserAuthenticationEvent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserEvent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserEvent.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserEvent.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class UserEvent extends PortalEvent { Property changes on: branches/JBoss_Portal_Branch_2_6/api/src/main/org/jboss/portal/api/user/event/UserEvent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/build.bat ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/build.sh ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -115,8 +115,8 @@ <!-- cms optimization integration --> <path refid="jgroups.jgroups.classpath"/> <path refid="sun.servlet.classpath"/> - <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <!-- jbpm integration --> + <path refid="jbpm.jaronly.classpath"/> </path> <path id="javac.classpath"> @@ -132,11 +132,11 @@ <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-search.classpath"/> <!-- fine grained security integration --> - <path refid="jboss.portal-security.classpath"/> + <path refid="jboss.portal-security.classpath"/> <!-- clustered testcases related --> - <path refid="jboss.portal-api.classpath"/> - <!-- workflow integration --> - <path refid="jboss.portal-workflow.classpath"/> + <path refid="jboss.portal-api.classpath"/> + <!-- workflow integration --> + <path refid="jboss.portal-workflow.classpath"/> </path> @@ -202,7 +202,7 @@ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/> <fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/> - + <!-- cms optimization integration --> <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/> @@ -230,27 +230,27 @@ <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/> <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/> - <!-- cms optimization integration --> - <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> + <!-- cms optimization integration --> + <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/> <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/> <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/> - <!-- add the jboss-service.xml and hibernate configuration --> - <fileset dir="${build.resources}/test/cms/clustering/sar"/> - - <!-- add dependencies --> - <!-- - <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> - <fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/> - <fileset dir="${jboss.portal-server.lib}" includes="portal-server-lib.jar"/> - <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> - <fileset dir="${jboss.portlet-api.lib}" includes="portal-api-lib.jar"/> - <fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/> - --> - <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/> + <!-- add the jboss-service.xml and hibernate configuration --> + <fileset dir="${build.resources}/test/cms/clustering/sar"/> + + <!-- add dependencies --> + <!-- + <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> + <fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/> + <fileset dir="${jboss.portal-server.lib}" includes="portal-server-lib.jar"/> + <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/> + <fileset dir="${jboss.portlet-api.lib}" includes="portal-api-lib.jar"/> + <fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/> + --> + <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/> <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/> <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/> <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/> @@ -274,23 +274,25 @@ <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/ports-01/lib" overwrite="true"/> <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/ports-02/lib" overwrite="true"/> <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/ports-02/lib" overwrite="true"/> - - <!-- deploying the test datasources --> - <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml" todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/> - <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml" todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/> + <!-- deploying the test datasources --> + <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml" + todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/> + <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml" + todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/> + <!-- install test sars needed for the testsuite framework --> <!-- <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-01/deploy"/> <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-02/deploy"/> --> - - <!-- - <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/> - <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/> - --> - - <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/> + + <!-- + <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/> + <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/> + --> + + <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/> <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-02/deploy"/> </target> @@ -298,16 +300,16 @@ description="UnDeploy." depends="output"> <!-- install test sars needed for the testsuite framework --> - <!-- - <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/> - <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/> - --> - <!-- - <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/> - <delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/> - --> - - <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/> + <!-- + <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/> + <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/> + --> + <!-- + <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/> + <delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/> + --> + + <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/> <delete file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/> </target> @@ -409,11 +411,11 @@ <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> --> - <!-- - prefer IPv4 when running test with jdk1.5 on linux. - This supposedly is a java bug as per jgroups page. - --> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> + <!-- + prefer IPv4 when running test with jdk1.5 on linux. + This supposedly is a java bug as per jgroups page. + --> + <jvmarg value="-Djava.net.preferIPv4Stack=true"/> </x-sysproperty> <x-test> <!-- general cms setup related tests --> @@ -439,15 +441,15 @@ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/> - <!-- cms fine grained security related tests --> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/> + <!-- cms fine grained security related tests --> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestWriteAccess"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/> - - <!-- cms workflow related tests --> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/> + + <!-- cms workflow related tests --> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/> </x-test> <x-classpath> @@ -491,11 +493,11 @@ <path refid="nekohtml.nekohtml.classpath"/> <path refid="jboss.cache.classpath"/> <path refid="jgroups.jgroups.classpath"/> - <!-- fine grained security integration --> - <path refid="jboss.portal/modules/identity.classpath"/> + <!-- fine grained security integration --> + <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal-security.classpath"/> - <!-- workflow integration --> - <path refid="jbpm.jaronly.classpath"/> + <!-- workflow integration --> + <path refid="jbpm.jaronly.classpath"/> <path refid="beanshell.beanshell.classpath"/> <path refid="jboss.portal-workflow.classpath"/> </x-classpath> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/build.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMS.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMS.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMS.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -25,7 +25,7 @@ /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 6112 $ */ public interface CMS { @@ -37,10 +37,7 @@ /** Return default locale */ String getDefaultLocale(); - - /** - * - * @return - */ + + /** @return */ public boolean isWorkflowActivated(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMS.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 5806 $ */ public class CMSException extends RuntimeException { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.cms; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.common.io.IOTools; import org.w3c.dom.Document; import org.w3c.dom.Element; Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/Command.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/Command.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/Command.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -29,7 +29,7 @@ * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ + * @version $Revision: 5448 $ */ public abstract class Command extends Invocation { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/Command.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,20 +22,20 @@ ******************************************************************************/ package org.jboss.portal.cms; -import java.io.InputStream; -import java.util.List; -import java.util.Locale; - import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; import org.jboss.portal.cms.model.Folder; import org.jboss.portal.search.impl.jcr.JCRQuery; +import java.io.InputStream; +import java.util.List; +import java.util.Locale; + /** * Factory to create commands for the cms service. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 8332 $ */ public interface CommandFactory { @@ -85,7 +85,7 @@ Command createGetArchiveCommand(String sRootPath, String sLanguage); - Command createSearchCommand(JCRQuery query); - + Command createSearchCommand(JCRQuery query); + Command createMakeLiveVersionCommand(String filePath, String language, String version); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -32,9 +32,9 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; +import org.jboss.logging.Logger; import org.jboss.portal.cms.util.HibernateUtil; import org.jboss.portal.common.io.IOTools; -import org.jboss.logging.Logger; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -41,16 +41,15 @@ import org.apache.jackrabbit.core.state.util.Serializer; import org.apache.jackrabbit.core.value.BLOBFileValue; import org.apache.jackrabbit.core.value.InternalValue; - import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; +import org.jboss.logging.Logger; import org.jboss.portal.cms.hibernate.HibernateStoreConstants; import org.jboss.portal.common.io.IOTools; -import org.jboss.logging.Logger; import javax.jcr.PropertyType; import java.io.ByteArrayOutputStream; @@ -70,7 +69,7 @@ /** Logger instance */ private static Logger log = Logger - .getLogger(HibernatePersistenceManager.class); + .getLogger(HibernatePersistenceManager.class); protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE = "${schemaObjectPrefix}"; @@ -121,10 +120,7 @@ /** file system where BLOB data is stored (if <code>externalBLOBs==true</code>) */ protected FileSystem blobFS; - /** - * BLOBStore that manages BLOB data in the file system (if - * <code>externalBLOBs==true</code>) - */ + /** BLOBStore that manages BLOB data in the file system (if <code>externalBLOBs==true</code>) */ protected BLOBStore blobStore; /** Creates a new <code>SimpleDbPersistenceManager</code> instance. */ @@ -138,7 +134,7 @@ // ---------------------------------------------------< PersistenceManager > /** - * + * */ public void init(PMContext context) throws Exception { @@ -150,30 +146,30 @@ // hibernateSessionFactory = HibernateUtil.getSessionFactory(jndiName); org.jboss.portal.cms.hibernate.state.Tools.init(jndiName); hibernateSessionFactory = org.jboss.portal.cms.hibernate.state.Tools - .getSessionFactory(); + .getSessionFactory(); nodeBinValSelect = "from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; nodeStateSelect = "from " + schemaObjectPrefix + "Node where NODE_ID = ?"; nodeStateSelectData = "select data from " + schemaObjectPrefix - + "Node where NODE_ID = ?"; + + "Node where NODE_ID = ?"; nodeStateSelectExist = "select 1 from " + schemaObjectPrefix - + "Node where NODE_ID = ?"; + + "Node where NODE_ID = ?"; propertyStateSelect = "from " + schemaObjectPrefix - + "Prop where PROP_ID = ?"; + + "Prop where PROP_ID = ?"; propertyStateSelectData = "select data from " + schemaObjectPrefix - + "Prop where PROP_ID = ?"; + + "Prop where PROP_ID = ?"; propertyStateSelectExist = "select 1 from " + schemaObjectPrefix - + "Prop where PROP_ID = ?"; + + "Prop where PROP_ID = ?"; nodeReferenceSelect = "from " + schemaObjectPrefix - + "Refs where NODE_ID = ?"; + + "Refs where NODE_ID = ?"; nodeReferenceSelectData = "select data from " + schemaObjectPrefix - + "Refs where NODE_ID = ?"; + + "Refs where NODE_ID = ?"; nodeReferenceSelectExist = "select 1 from " + schemaObjectPrefix - + "Refs where NODE_ID = ?"; + + "Refs where NODE_ID = ?"; if (externalBLOBs) { @@ -195,11 +191,11 @@ blobStore = new DbBLOBStore(); blobSelect = "from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; blobSelectData = "select data from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; blobSelectExist = "select 1 from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; } initialized = true; @@ -208,7 +204,7 @@ // ---------------------------------------------------< PersistenceManager > /** - * + * */ public void close() throws Exception { @@ -322,46 +318,46 @@ Iterator iter = changeLog.deletedStates(); while (iter.hasNext()) { - ItemState state = (ItemState) iter.next(); + ItemState state = (ItemState)iter.next(); if (state.isNode()) { - destroy((NodeState) state); + destroy((NodeState)state); } else { - destroy((PropertyState) state); + destroy((PropertyState)state); } } iter = changeLog.addedStates(); while (iter.hasNext()) { - ItemState state = (ItemState) iter.next(); + ItemState state = (ItemState)iter.next(); if (state.isNode()) { - store((NodeState) state); + store((NodeState)state); } else { - store((PropertyState) state); + store((PropertyState)state); } } iter = changeLog.modifiedStates(); while (iter.hasNext()) { - ItemState state = (ItemState) iter.next(); + ItemState state = (ItemState)iter.next(); if (state.isNode()) { - update((NodeState) state); + update((NodeState)state); } else { - update((PropertyState) state); + update((PropertyState)state); } } iter = changeLog.modifiedRefs(); while (iter.hasNext()) { - NodeReferences refs = (NodeReferences) iter.next(); + NodeReferences refs = (NodeReferences)iter.next(); if (refs.hasReferences()) { store(refs); @@ -377,7 +373,7 @@ } public NodeState load(NodeId id) throws NoSuchItemStateException, - ItemStateException + ItemStateException { if (!initialized) { @@ -391,13 +387,13 @@ try { List rs = session.createQuery(nodeStateSelectData).setString(0, - id.toString()).list(); + id.toString()).list(); Iterator iter = rs.iterator(); // java.sql.Blob blob = (java.sql.Blob) iter.next(); // in = blob.getBinaryStream(); - byte[] data = (byte[]) iter.next(); + byte[] data = (byte[])iter.next(); in = new java.io.ByteArrayInputStream(data); NodeState state = createNew(id); @@ -411,7 +407,7 @@ tx.rollback(); if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read node state: " + id; log.error(msg, e); @@ -424,7 +420,7 @@ } public PropertyState load(PropertyId id) throws NoSuchItemStateException, - ItemStateException + ItemStateException { if (!initialized) { @@ -438,12 +434,12 @@ try { List rs = session.createQuery(propertyStateSelectData).setCacheable( - true).setString(0, id.toString()).list(); + true).setString(0, id.toString()).list(); Iterator iter = rs.iterator(); // java.sql.Blob blob = (java.sql.Blob) iter.next(); // in = blob.getBinaryStream(); - byte[] data = (byte[]) iter.next(); + byte[] data = (byte[])iter.next(); in = new java.io.ByteArrayInputStream(data); PropertyState state = createNew(id); @@ -457,7 +453,7 @@ tx.rollback(); if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read property state: " + id.toString(); log.error(msg, e); @@ -470,10 +466,10 @@ } /** - * + * */ public NodeReferences load(NodeReferencesId targetId) - throws NoSuchItemStateException, ItemStateException + throws NoSuchItemStateException, ItemStateException { if (!initialized) { @@ -486,13 +482,13 @@ try { List rs = session.createQuery(nodeReferenceSelectData).setCacheable( - true).setString(0, targetId.toString()).list(); + true).setString(0, targetId.toString()).list(); Iterator iter = rs.iterator(); if (!iter.hasNext()) { throw new NoSuchItemStateException(targetId.toString()); } - byte[] data = (byte[]) iter.next(); + byte[] data = (byte[])iter.next(); in = new java.io.ByteArrayInputStream(data); NodeReferences refs = new NodeReferences(targetId); @@ -506,7 +502,7 @@ tx.rollback(); if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read references: " + targetId; log.error(msg, e); @@ -533,18 +529,18 @@ { Serializer.serialize(state, out); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionNode versionNode = new VersionNode(state.getId().toString(), - out.toByteArray()); + out.toByteArray()); session.save(versionNode); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPNode wspNode = new WSPNode(state.getId().toString(), out - .toByteArray()); + .toByteArray()); session.save(wspNode); } } @@ -589,19 +585,19 @@ { Serializer.serialize(refs, out); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionRefs versionRefs = new VersionRefs(refs.getTargetId() - .toString(), out.toByteArray()); + .toString(), out.toByteArray()); session.save(versionRefs); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPRefs wspRefs = new WSPRefs(refs.getTargetId().toString(), out - .toByteArray()); + .toByteArray()); session.save(wspRefs); } } @@ -626,11 +622,9 @@ } /** - * <p/> This method uses shared <code>PreparedStatement</code>s which must - * be executed strictly sequentially. Because this method synchronizes on the - * persistence manager instance there is no need to synchronize on the shared - * statement. If the method would not be sychronized the shared statements - * would have to be synchronized. + * <p/> This method uses shared <code>PreparedStatement</code>s which must be executed strictly sequentially. Because + * this method synchronizes on the persistence manager instance there is no need to synchronize on the shared + * statement. If the method would not be sychronized the shared statements would have to be synchronized. */ // public synchronized void store(PropertyState state) private void store(PropertyState state) throws ItemStateException @@ -649,17 +643,17 @@ Serializer.serialize(state, out, blobStore); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionProp versionProp = new VersionProp(state.getId().toString(), - out.toByteArray()); + out.toByteArray()); session.save(versionProp); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPProp wspProp = new WSPProp(state.getId().toString(), out - .toByteArray()); + .toByteArray()); session.save(wspProp); } } @@ -700,10 +694,10 @@ Query query = session.createQuery(nodeStateSelect).setCacheable(true); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { query.setString(0, state.getId().toString()); - VersionNode versionNode = (VersionNode) query.uniqueResult(); + VersionNode versionNode = (VersionNode)query.uniqueResult(); if (versionNode == null) { throw new Exception("No such Node: " + state.getId()); @@ -711,10 +705,10 @@ versionNode.setData(out.toByteArray()); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { query.setString(0, state.getId().toString()); - WSPNode wspNode = (WSPNode) query.uniqueResult(); + WSPNode wspNode = (WSPNode)query.uniqueResult(); if (wspNode == null) { throw new Exception("No such Node: " + state.getId()); @@ -758,12 +752,12 @@ Serializer.serialize(state, out, blobStore); Query query = session.createQuery(propertyStateSelect).setCacheable( - true); + true); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { query.setString(0, state.getId().toString()); - VersionProp versionProp = (VersionProp) query.uniqueResult(); + VersionProp versionProp = (VersionProp)query.uniqueResult(); if (versionProp == null) { throw new Exception("No such Property: " + state.getId()); @@ -771,10 +765,10 @@ versionProp.setData(out.toByteArray()); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { query.setString(0, state.getId().toString()); - WSPProp wspProp = (WSPProp) query.uniqueResult(); + WSPProp wspProp = (WSPProp)query.uniqueResult(); if (wspProp == null) { throw new Exception("No such Property: " + state.getId()); @@ -814,7 +808,7 @@ try { Query query = session.createQuery(nodeStateSelect).setCacheable(true) - .setString(0, state.getId().toString()); + .setString(0, state.getId().toString()); Object result = query.uniqueResult(); if (result != null) { @@ -848,12 +842,12 @@ { if (val.getType() == PropertyType.BINARY) { - BLOBFileValue blobVal = (BLOBFileValue) val.internalValue(); + BLOBFileValue blobVal = (BLOBFileValue)val.internalValue(); // delete internal resource representation of BLOB value blobVal.delete(true); // also remove from BLOBStore String blobId = blobStore.createId( - (PropertyId) state.getId(), i); + (PropertyId)state.getId(), i); try { blobStore.remove(blobId); @@ -873,7 +867,7 @@ try { Query query = session.createQuery(propertyStateSelect).setCacheable( - true).setString(0, state.getId().toString()); + true).setString(0, state.getId().toString()); Object result = query.uniqueResult(); if (result != null) { @@ -891,7 +885,7 @@ } /** - * + * */ private void destroy(NodeReferences refs) throws ItemStateException { @@ -904,7 +898,7 @@ try { Query query = session.createQuery(nodeReferenceSelect).setCacheable( - true).setString(0, refs.getTargetId().toString()); + true).setString(0, refs.getTargetId().toString()); List list = query.list(); if (list == null) @@ -932,7 +926,7 @@ } /** - * + * */ public boolean exists(NodeId id) throws ItemStateException { @@ -940,7 +934,7 @@ } /** - * + * */ protected boolean exists(String blobid) throws ItemStateException { @@ -948,7 +942,7 @@ } /** - * + * */ public boolean exists(PropertyId id) throws ItemStateException { @@ -956,7 +950,7 @@ } /** - * + * */ public boolean exists(NodeReferencesId targetId) throws ItemStateException { @@ -974,7 +968,7 @@ try { List rs = session.createQuery(query).setCacheable(true).setString(0, - id).list(); + id).list(); Iterator iter = rs.iterator(); return iter.hasNext(); } @@ -1009,7 +1003,7 @@ { /** - * + * */ public String createId(PropertyId id, int index) { @@ -1023,7 +1017,7 @@ } /** - * + * */ public InputStream get(String blobId) throws Exception { @@ -1032,7 +1026,7 @@ { List rs = session.createQuery(blobSelectData).setString(0, blobId).list(); Iterator iter = rs.iterator(); - java.sql.Blob blob = (java.sql.Blob) iter.next(); + java.sql.Blob blob = (java.sql.Blob)iter.next(); InputStream is = blob.getBinaryStream(); return is; } @@ -1040,7 +1034,7 @@ { if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read binary data: " + blobId; log.error(msg, e); @@ -1049,10 +1043,10 @@ } /** - * + * */ public void put(String blobId, InputStream in, long size) - throws Exception + throws Exception { boolean update = exists(blobId); @@ -1065,11 +1059,11 @@ Query query = session.createQuery(blobSelect); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { query.setString(0, blobId); - VersionBinVal versionNode = (VersionBinVal) query - .uniqueResult(); + VersionBinVal versionNode = (VersionBinVal)query + .uniqueResult(); if (versionNode == null) { throw new Exception("No such Node: " + blobId); @@ -1078,10 +1072,10 @@ versionNode.setData(Hibernate.createBlob(in)); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { query.setString(0, blobId); - WSPBinVal wspNode = (WSPBinVal) query.uniqueResult(); + WSPBinVal wspNode = (WSPBinVal)query.uniqueResult(); if (wspNode == null) { throw new Exception("No such Node: " + blobId); @@ -1108,17 +1102,17 @@ { if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionBinVal versionNode = new VersionBinVal(blobId, - Hibernate.createBlob(in)); + Hibernate.createBlob(in)); session.save(versionNode); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPBinVal wspNode = new WSPBinVal(blobId, Hibernate - .createBlob(in)); + .createBlob(in)); session.save(wspNode); } } @@ -1136,7 +1130,7 @@ } /** - * + * */ // public synchronized boolean remove(String blobId) throws Exception public boolean remove(String blobId) throws Exception Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -41,7 +41,6 @@ import org.apache.jackrabbit.core.state.util.Serializer; import org.apache.jackrabbit.core.value.BLOBFileValue; import org.apache.jackrabbit.core.value.InternalValue; - import org.hibernate.Hibernate; import org.hibernate.Query; import org.hibernate.Session; @@ -50,15 +49,14 @@ import org.jboss.cache.PropertyConfigurator; import org.jboss.cache.TreeCache; import org.jboss.cache.TreeCacheMBean; +import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanProxyExt; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.portal.cms.hibernate.HibernateStoreConstants; import org.jboss.portal.common.io.IOTools; -import org.jboss.logging.Logger; import javax.jcr.PropertyType; import javax.management.MBeanServer; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -77,7 +75,7 @@ { /** Logger instance */ private static Logger log = Logger - .getLogger(JBossCachePersistenceManager.class); + .getLogger(JBossCachePersistenceManager.class); protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE = "${schemaObjectPrefix}"; @@ -105,27 +103,22 @@ /** file system where BLOB data is stored (if <code>externalBLOBs==true</code>) */ protected FileSystem blobFS = null; - /** - * BLOBStore that manages BLOB data in the file system (if - * <code>externalBLOBs==true</code>) - */ + /** BLOBStore that manages BLOB data in the file system (if <code>externalBLOBs==true</code>) */ protected BLOBStore blobStore = null; /** - * JackRabbit initalizes multiple instances of the Persistence Manager to - * perform its operations. A static TreeCache is used to make sure there is - * only once instance of the cache per VM where the CMS node runs. - * - * One side effect of using a static instance is proper cleanup which is - * addressed in the close method + * JackRabbit initalizes multiple instances of the Persistence Manager to perform its operations. A static TreeCache + * is used to make sure there is only once instance of the cache per VM where the CMS node runs. + * <p/> + * One side effect of using a static instance is proper cleanup which is addressed in the close method */ private static TreeCacheMBean pmCache = null; private static boolean preloaded = false; /** - * - * + * + * */ public JBossCachePersistenceManager() { @@ -181,7 +174,7 @@ } nodeBinValSelect = "from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; if (externalBLOBs) { @@ -203,11 +196,11 @@ blobStore = new DbBLOBStore(); blobSelect = "from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; blobSelectData = "select data from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; blobSelectExist = "select 1 from " + schemaObjectPrefix - + "BinVal where BINVAL_ID = ?"; + + "BinVal where BINVAL_ID = ?"; } initialized = true; @@ -234,9 +227,9 @@ try { MBeanServer server = MBeanServerLocator.locateJBoss(); - pmCache = (TreeCacheMBean) MBeanProxyExt.create( - TreeCacheMBean.class, "cms.pm.cache:service=TreeCache", - server); + pmCache = (TreeCacheMBean)MBeanProxyExt.create( + TreeCacheMBean.class, "cms.pm.cache:service=TreeCache", + server); } catch (Exception e) { @@ -255,7 +248,7 @@ // configure the cache PropertyConfigurator configurator = new PropertyConfigurator(); is = JBossCachePersistenceManager.class.getClassLoader() - .getResourceAsStream("pm-cache.xml"); + .getResourceAsStream("pm-cache.xml"); configurator.configure(pmCache, is); pmCache.createService(); @@ -287,8 +280,8 @@ } /** - * - * + * + * */ private static synchronized void loadProperties() throws Exception { @@ -298,25 +291,25 @@ } log - .info("Pre-loading the PersistenceManager Cache in the background (started)......."); + .info("Pre-loading the PersistenceManager Cache in the background (started)......."); CacheLoader wspProp = new CacheLoader(CacheLoader.wspProp, - PortalCMSCacheLoader.WSP_PROP_NODE); + PortalCMSCacheLoader.WSP_PROP_NODE); Thread wspPropLoader = new Thread(wspProp); CacheLoader versionProp = new CacheLoader(CacheLoader.versionProp, - PortalCMSCacheLoader.VERSION_PROP_NODE); + PortalCMSCacheLoader.VERSION_PROP_NODE); Thread versionPropLoader = new Thread(versionProp); CacheLoader wspNode = new CacheLoader(CacheLoader.wspNode, - PortalCMSCacheLoader.WSP_NODE_NODE); + PortalCMSCacheLoader.WSP_NODE_NODE); Thread wspNodeLoader = new Thread(wspNode); CacheLoader versionNode = new CacheLoader(CacheLoader.versionNode, - PortalCMSCacheLoader.VERSION_NODE_NODE); + PortalCMSCacheLoader.VERSION_NODE_NODE); Thread versionNodeLoader = new Thread(versionNode); CacheLoader wspRef = new CacheLoader(CacheLoader.wspRef, - PortalCMSCacheLoader.WSP_REF_NODE); + PortalCMSCacheLoader.WSP_REF_NODE); Thread wspRefLoader = new Thread(wspRef); CacheLoader versionRef = new CacheLoader(CacheLoader.versionRef, - PortalCMSCacheLoader.VERSION_REF_NODE); + PortalCMSCacheLoader.VERSION_REF_NODE); Thread versionRefLoader = new Thread(versionRef); wspPropLoader.start(); @@ -331,9 +324,9 @@ // of the CMS...don't allow the usage of CMS till this operation is // completed. while (!wspProp.done || !versionProp.done || !wspNode.done - || !versionNode.done || !wspRef.done || !versionRef.done) + || !versionNode.done || !wspRef.done || !versionRef.done) { - Thread.currentThread().sleep((long) 2000); + Thread.currentThread().sleep((long)2000); } JBossCachePersistenceManager.preloaded = true; @@ -342,7 +335,7 @@ private static class CacheLoader implements Runnable { /** - * + * */ private static final String wspProp = "from org.jboss.portal.cms.hibernate.state.WSPProp"; @@ -357,7 +350,7 @@ private static final String versionRef = "from org.jboss.portal.cms.hibernate.state.VersionRefs"; /** - * + * */ private String nodeQuery = null; @@ -382,63 +375,63 @@ { for (Iterator itr = rs.iterator(); itr.hasNext();) { - Base cour = (Base) itr.next(); + Base cour = (Base)itr.next(); cour.disableCacheItemPersistence(); if (cour instanceof WSPProp) { String node = this.nodePrefix - + "/" - + PortalCMSCacheLoader - .parseNodeName(((WSPProp) cour).getPropId()); - pmCache.put(node, ((WSPProp) cour).getPropId(), cour); + + "/" + + PortalCMSCacheLoader + .parseNodeName(((WSPProp)cour).getPropId()); + pmCache.put(node, ((WSPProp)cour).getPropId(), cour); } else if (cour instanceof VersionProp) { String node = this.nodePrefix - + "/" - + PortalCMSCacheLoader - .parseNodeName(((VersionProp) cour) - .getPropId()); - pmCache.put(node, ((VersionProp) cour).getPropId(), cour); + + "/" + + PortalCMSCacheLoader + .parseNodeName(((VersionProp)cour) + .getPropId()); + pmCache.put(node, ((VersionProp)cour).getPropId(), cour); } else if (cour instanceof WSPNode) { String node = this.nodePrefix - + "/" - + PortalCMSCacheLoader - .parseNodeName(((WSPNode) cour).getNodeId()); - pmCache.put(node, ((WSPNode) cour).getNodeId(), cour); + + "/" + + PortalCMSCacheLoader + .parseNodeName(((WSPNode)cour).getNodeId()); + pmCache.put(node, ((WSPNode)cour).getNodeId(), cour); } else if (cour instanceof VersionNode) { String node = this.nodePrefix - + "/" - + PortalCMSCacheLoader - .parseNodeName(((VersionNode) cour) - .getNodeId()); - pmCache.put(node, ((VersionNode) cour).getNodeId(), cour); + + "/" + + PortalCMSCacheLoader + .parseNodeName(((VersionNode)cour) + .getNodeId()); + pmCache.put(node, ((VersionNode)cour).getNodeId(), cour); } else if (cour instanceof WSPRefs) { String node = this.nodePrefix - + "/" - + PortalCMSCacheLoader - .parseNodeName(((WSPRefs) cour).getRefId()); - pmCache.put(node, ((WSPRefs) cour).getRefId(), cour); + + "/" + + PortalCMSCacheLoader + .parseNodeName(((WSPRefs)cour).getRefId()); + pmCache.put(node, ((WSPRefs)cour).getRefId(), cour); } else if (cour instanceof VersionRefs) { String node = this.nodePrefix - + "/" - + PortalCMSCacheLoader - .parseNodeName(((VersionRefs) cour).getRefId()); - pmCache.put(node, ((VersionRefs) cour).getRefId(), cour); + + "/" + + PortalCMSCacheLoader + .parseNodeName(((VersionRefs)cour).getRefId()); + pmCache.put(node, ((VersionRefs)cour).getRefId(), cour); } } } log.info("Pre-loading the PersistenceManager Cache for" - + this.nodePrefix + " (finished)......."); + + this.nodePrefix + " (finished)......."); } catch (CacheException ce) { @@ -464,24 +457,24 @@ boolean exists = false; String nodeId = node.toString(); if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { exists = true; - } + } } else if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { exists = true; - } + } } return exists; } @@ -495,7 +488,7 @@ * */ public NodeState load(NodeId node) throws NoSuchItemStateException, - ItemStateException + ItemStateException { try { @@ -505,18 +498,18 @@ // get the nodeData byte[] nodeData = null; if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); - nodeData = ((WSPNode) o).getData(); + + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + nodeData = ((WSPNode)o).getData(); } else if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); - nodeData = ((VersionNode) o).getData(); + + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + nodeData = ((VersionNode)o).getData(); } // parse propertyData into propertyState @@ -544,10 +537,10 @@ { if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read node state from cache: " - + node.toString(); + + node.toString(); log.error(msg, e); throw new ItemStateException(msg, e); } @@ -570,8 +563,8 @@ } /** - * - * + * + * */ private void store(NodeState state) throws ItemStateException { @@ -585,28 +578,28 @@ { Serializer.serialize(state, out); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionNode versionNode = new VersionNode(state.getId().toString(), - out.toByteArray()); + out.toByteArray()); // place this in the cache versionNode.resetCacheItemPersistence(); String cacheNode = PortalCMSCacheLoader.VERSION_NODE_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(versionNode.getNodeId()); + + PortalCMSCacheLoader.parseNodeName(versionNode.getNodeId()); pmCache.put(cacheNode, versionNode.getNodeId(), versionNode); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPNode wspNode = new WSPNode(state.getId().toString(), out - .toByteArray()); + .toByteArray()); // place this in the cache wspNode.resetCacheItemPersistence(); String cacheNode = PortalCMSCacheLoader.WSP_NODE_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(wspNode.getNodeId()); + + PortalCMSCacheLoader.parseNodeName(wspNode.getNodeId()); pmCache.put(cacheNode, wspNode.getNodeId(), wspNode); } } @@ -630,8 +623,8 @@ } /** - * - * + * + * */ private void update(NodeState state) throws ItemStateException { @@ -647,11 +640,11 @@ String id = state.getId().toString(); String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { - VersionNode versionNode = (VersionNode) pmCache.get( - PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + cacheNodeName, - id); + VersionNode versionNode = (VersionNode)pmCache.get( + PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + cacheNodeName, + id); if (versionNode == null) { throw new Exception("No such Node: " + state.getId()); @@ -659,13 +652,13 @@ versionNode.setData(out.toByteArray()); versionNode.resetCacheItemPersistence(); pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" - + cacheNodeName, id, versionNode); + + cacheNodeName, id, versionNode); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { - WSPNode wspNode = (WSPNode) pmCache.get( - PortalCMSCacheLoader.WSP_NODE_NODE + "/" + cacheNodeName, id); + WSPNode wspNode = (WSPNode)pmCache.get( + PortalCMSCacheLoader.WSP_NODE_NODE + "/" + cacheNodeName, id); if (wspNode == null) { throw new Exception("No such Node: " + state.getId()); @@ -673,7 +666,7 @@ wspNode.setData(out.toByteArray()); wspNode.resetCacheItemPersistence(); pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE + "/" - + cacheNodeName, id, wspNode); + + cacheNodeName, id, wspNode); } } catch (Exception e) @@ -708,16 +701,16 @@ try { if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { pmCache.remove(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" - + cacheNodeName, id); + + cacheNodeName, id); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { pmCache.remove(PortalCMSCacheLoader.WSP_NODE_NODE + "/" - + cacheNodeName, id); + + cacheNodeName, id); } } catch (Exception e) @@ -740,24 +733,24 @@ boolean exists = false; String propId = property.toString(); if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); + + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); if (o != null) { exists = true; - } + } } else if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); + + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); if (o != null) { exists = true; - } + } } return exists; } @@ -771,7 +764,7 @@ * */ public PropertyState load(PropertyId property) - throws NoSuchItemStateException, ItemStateException + throws NoSuchItemStateException, ItemStateException { try { @@ -781,18 +774,18 @@ // get the propertyData byte[] propertyData = null; if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); - propertyData = ((WSPProp) o).getData(); + + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); + propertyData = ((WSPProp)o).getData(); } else if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); - propertyData = ((VersionProp) o).getData(); + + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); + propertyData = ((VersionProp)o).getData(); } // parse propertyData into propertyState @@ -820,10 +813,10 @@ { if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read property state from cache: " - + property.toString(); + + property.toString(); log.error(msg, e); throw new ItemStateException(msg, e); } @@ -846,7 +839,7 @@ } /** - * + * */ private void store(PropertyState state) throws ItemStateException { @@ -860,28 +853,28 @@ { Serializer.serialize(state, out, blobStore); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionProp versionProp = new VersionProp(state.getId().toString(), - out.toByteArray()); + out.toByteArray()); // place this in the cache versionProp.resetCacheItemPersistence(); String cacheNode = PortalCMSCacheLoader.VERSION_PROP_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(versionProp.getPropId()); + + PortalCMSCacheLoader.parseNodeName(versionProp.getPropId()); pmCache.put(cacheNode, versionProp.getPropId(), versionProp); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPProp wspProp = new WSPProp(state.getId().toString(), out - .toByteArray()); + .toByteArray()); // place this in the cache wspProp.resetCacheItemPersistence(); String cacheNode = PortalCMSCacheLoader.WSP_PROP_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(wspProp.getPropId()); + + PortalCMSCacheLoader.parseNodeName(wspProp.getPropId()); pmCache.put(cacheNode, wspProp.getPropId(), wspProp); } } @@ -905,8 +898,8 @@ } /** - * - * + * + * */ private void update(PropertyState state) throws ItemStateException { @@ -922,11 +915,11 @@ String id = state.getId().toString(); String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { - VersionProp versionProp = (VersionProp) pmCache.get( - PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + cacheNodeName, - id); + VersionProp versionProp = (VersionProp)pmCache.get( + PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + cacheNodeName, + id); if (versionProp == null) { throw new Exception("No such Property: " + state.getId()); @@ -934,13 +927,13 @@ versionProp.setData(out.toByteArray()); versionProp.resetCacheItemPersistence(); pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" - + cacheNodeName, id, versionProp); + + cacheNodeName, id, versionProp); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { - WSPProp wspProp = (WSPProp) pmCache.get( - PortalCMSCacheLoader.WSP_PROP_NODE + "/" + cacheNodeName, id); + WSPProp wspProp = (WSPProp)pmCache.get( + PortalCMSCacheLoader.WSP_PROP_NODE + "/" + cacheNodeName, id); if (wspProp == null) { throw new Exception("No such Property: " + state.getId()); @@ -948,7 +941,7 @@ wspProp.setData(out.toByteArray()); wspProp.resetCacheItemPersistence(); pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE + "/" - + cacheNodeName, id, wspProp); + + cacheNodeName, id, wspProp); } } catch (Exception e) @@ -989,12 +982,12 @@ { if (val.getType() == PropertyType.BINARY) { - BLOBFileValue blobVal = (BLOBFileValue) val.internalValue(); + BLOBFileValue blobVal = (BLOBFileValue)val.internalValue(); // delete internal resource representation of BLOB value blobVal.delete(true); // also remove from BLOBStore String blobId = blobStore.createId( - (PropertyId) state.getId(), i); + (PropertyId)state.getId(), i); try { blobStore.remove(blobId); @@ -1014,16 +1007,16 @@ try { if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { pmCache.remove(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" - + cacheNodeName, id); + + cacheNodeName, id); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { pmCache.remove(PortalCMSCacheLoader.WSP_PROP_NODE + "/" - + cacheNodeName, id); + + cacheNodeName, id); } } catch (Exception e) @@ -1037,7 +1030,7 @@ // ----------actions for nodereferences // entities------------------------------------------------------------------------------------------------------------- /** - * + * */ public boolean exists(NodeReferencesId targetId) throws ItemStateException { @@ -1046,24 +1039,24 @@ boolean exists = false; String nodeId = targetId.toString(); if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { exists = true; - } + } } else if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_REF_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { exists = true; - } + } } return exists; } @@ -1074,10 +1067,10 @@ } /** - * + * */ public NodeReferences load(NodeReferencesId targetId) - throws NoSuchItemStateException, ItemStateException + throws NoSuchItemStateException, ItemStateException { try { @@ -1087,26 +1080,26 @@ // get the nodeData byte[] nodeData = null; if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o == null || !(o instanceof Base)) { throw new NoSuchItemStateException(targetId.toString()); } - nodeData = ((WSPRefs) o).getData(); + nodeData = ((WSPRefs)o).getData(); } else if (this.schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_REF_NODE - + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); + + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o == null || !(o instanceof Base)) { throw new NoSuchItemStateException(targetId.toString()); } - nodeData = ((VersionRefs) o).getData(); + nodeData = ((VersionRefs)o).getData(); } // parse propertyData into propertyState @@ -1134,10 +1127,10 @@ { if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read reference from cache: " - + targetId.toString(); + + targetId.toString(); log.error(msg, e); throw new ItemStateException(msg, e); } @@ -1160,8 +1153,8 @@ } /** - * - * + * + * */ private void store(NodeReferences refs) throws ItemStateException { @@ -1175,28 +1168,28 @@ { Serializer.serialize(refs, out); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionRefs versionRefs = new VersionRefs(refs.getId().toString(), - out.toByteArray()); + out.toByteArray()); // place this in the cache versionRefs.resetCacheItemPersistence(); String cacheNode = PortalCMSCacheLoader.VERSION_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(versionRefs.getRefId()); + + PortalCMSCacheLoader.parseNodeName(versionRefs.getRefId()); pmCache.put(cacheNode, versionRefs.getRefId(), versionRefs); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPRefs wspRefs = new WSPRefs(refs.getId().toString(), out - .toByteArray()); + .toByteArray()); // place this in the cache wspRefs.resetCacheItemPersistence(); String cacheNode = PortalCMSCacheLoader.WSP_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(wspRefs.getRefId()); + + PortalCMSCacheLoader.parseNodeName(wspRefs.getRefId()); pmCache.put(cacheNode, wspRefs.getRefId(), wspRefs); } } @@ -1220,7 +1213,7 @@ } /** - * + * */ private void destroy(NodeReferences refs) throws ItemStateException { @@ -1234,16 +1227,16 @@ try { if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { pmCache.remove(PortalCMSCacheLoader.VERSION_REF_NODE + "/" - + cacheNodeName, id); + + cacheNodeName, id); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { pmCache.remove(PortalCMSCacheLoader.WSP_REF_NODE + "/" - + cacheNodeName, id); + + cacheNodeName, id); } } catch (Exception e) @@ -1256,7 +1249,7 @@ // ---------------------------------------------------------------------------------------------------------------------------------------- /** - * + * */ public void close() throws Exception { @@ -1306,7 +1299,7 @@ } /** - * + * */ public void store(ChangeLog changeLog) throws ItemStateException { @@ -1341,46 +1334,46 @@ Iterator iter = changeLog.deletedStates(); while (iter.hasNext()) { - ItemState state = (ItemState) iter.next(); + ItemState state = (ItemState)iter.next(); if (state.isNode()) { - destroy((NodeState) state); + destroy((NodeState)state); } else { - destroy((PropertyState) state); + destroy((PropertyState)state); } } iter = changeLog.addedStates(); while (iter.hasNext()) { - ItemState state = (ItemState) iter.next(); + ItemState state = (ItemState)iter.next(); if (state.isNode()) { - store((NodeState) state); + store((NodeState)state); } else { - store((PropertyState) state); + store((PropertyState)state); } } iter = changeLog.modifiedStates(); while (iter.hasNext()) { - ItemState state = (ItemState) iter.next(); + ItemState state = (ItemState)iter.next(); if (state.isNode()) { - update((NodeState) state); + update((NodeState)state); } else { - update((PropertyState) state); + update((PropertyState)state); } } iter = changeLog.modifiedRefs(); while (iter.hasNext()) { - NodeReferences refs = (NodeReferences) iter.next(); + NodeReferences refs = (NodeReferences)iter.next(); if (refs.hasReferences()) { store(refs); @@ -1396,7 +1389,7 @@ } /** - * + * */ protected boolean exists(String blobid) throws ItemStateException { @@ -1404,8 +1397,8 @@ } /** - * - * + * + * */ private boolean exists(String query, String id) throws ItemStateException { @@ -1451,7 +1444,7 @@ { /** - * + * */ public String createId(PropertyId id, int index) { @@ -1465,7 +1458,7 @@ } /** - * + * */ public InputStream get(String blobId) throws Exception { @@ -1473,9 +1466,9 @@ try { List rs = session.createQuery(blobSelectData).setString(0, blobId) - .list(); + .list(); Iterator iter = rs.iterator(); - java.sql.Blob blob = (java.sql.Blob) iter.next(); + java.sql.Blob blob = (java.sql.Blob)iter.next(); InputStream is = blob.getBinaryStream(); return is; } @@ -1483,7 +1476,7 @@ { if (e instanceof NoSuchItemStateException) { - throw (NoSuchItemStateException) e; + throw (NoSuchItemStateException)e; } String msg = "failed to read binary data: " + blobId; log.error(msg, e); @@ -1492,10 +1485,10 @@ } /** - * + * */ public void put(String blobId, InputStream in, long size) - throws Exception + throws Exception { boolean update = exists(blobId); @@ -1507,11 +1500,11 @@ Query query = session.createQuery(blobSelect); if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { query.setString(0, blobId); - VersionBinVal versionNode = (VersionBinVal) query - .uniqueResult(); + VersionBinVal versionNode = (VersionBinVal)query + .uniqueResult(); if (versionNode == null) { throw new Exception("No such Node: " + blobId); @@ -1520,10 +1513,10 @@ versionNode.setData(Hibernate.createBlob(in)); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { query.setString(0, blobId); - WSPBinVal wspNode = (WSPBinVal) query.uniqueResult(); + WSPBinVal wspNode = (WSPBinVal)query.uniqueResult(); if (wspNode == null) { throw new Exception("No such Node: " + blobId); @@ -1550,17 +1543,17 @@ { if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) { VersionBinVal versionNode = new VersionBinVal(blobId, - Hibernate.createBlob(in)); + Hibernate.createBlob(in)); session.save(versionNode); } else if (schemaObjectPrefix - .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) + .equalsIgnoreCase(HibernateStoreConstants.wspPrefix)) { WSPBinVal wspNode = new WSPBinVal(blobId, Hibernate - .createBlob(in)); + .createBlob(in)); session.save(wspNode); } } @@ -1578,7 +1571,7 @@ } /** - * + * */ // public synchronized boolean remove(String blobId) throws Exception public boolean remove(String blobId) throws Exception @@ -1587,7 +1580,7 @@ try { Query query = session.createQuery(nodeBinValSelect).setString(0, - blobId); + blobId); Object result = query.uniqueResult(); if (result != null) { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -36,10 +36,11 @@ /** * Static state is evil. - * + * <p/> * Created on Aug 29, 2006 - * - * A Tool for performing some Hibernate related utilities. This is designed to work in both managed as well as non-managed environments + * <p/> + * A Tool for performing some Hibernate related utilities. This is designed to work in both managed as well as + * non-managed environments * * @author <a href="mailto:sohil.shah@jboss.com">Sohil Shah</a> */ Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ + * @version $Revision: 5448 $ */ public class CMSCacheException extends Exception { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ + * @version $Revision: 5448 $ */ public interface CMSTreeCacheService { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -61,7 +61,7 @@ protected String mimeType; protected int size; - + protected boolean isWaitingForPublishApproval = false; protected String approvalProcessId = null; @@ -185,39 +185,32 @@ { this.size = size; } - + /** - * + * */ public boolean isWaitingForPublishApproval() { - return this.isWaitingForPublishApproval; + return this.isWaitingForPublishApproval; } - - /** - * - * @param isWaitingForPublishApproval - */ + + /** @param isWaitingForPublishApproval */ public void setWaitingForPublishApproval(boolean isWaitingForPublishApproval) { - this.isWaitingForPublishApproval = isWaitingForPublishApproval; + this.isWaitingForPublishApproval = isWaitingForPublishApproval; } - /** - * @return the approvalProcessId - */ - public String getApprovalProcessId() - { - return approvalProcessId; - } - - /** - * @param approvalProcessId the approvalProcessId to set - */ - public void setApprovalProcessId(String approvalProcessId) - { - this.approvalProcessId = approvalProcessId; - } + /** @return the approvalProcessId */ + public String getApprovalProcessId() + { + return approvalProcessId; + } + + /** @param approvalProcessId the approvalProcessId to set */ + public void setApprovalProcessId(String approvalProcessId) + { + this.approvalProcessId = approvalProcessId; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -35,7 +35,7 @@ /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ + * @version $Revision: 6728 $ */ public class CMSTreeCacheServiceImpl extends AbstractJBossService implements CMSTreeCacheService { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,50 +22,50 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.interceptors; -import org.w3c.dom.*; - -import javax.xml.parsers.DocumentBuilderFactory; - -import java.io.InputStream; -import java.io.ByteArrayInputStream; -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.HashSet; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.portal.security.PortalPermission; - +import org.apache.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.CMSInterceptor; -import org.jboss.portal.cms.impl.jcr.JCRCommand; +import org.jboss.portal.cms.hibernate.state.Tools; import org.jboss.portal.cms.impl.jcr.JCRCMS; +import org.jboss.portal.cms.impl.jcr.JCRCommand; import org.jboss.portal.cms.impl.jcr.command.SearchCommand; import org.jboss.portal.cms.model.File; import org.jboss.portal.cms.model.Folder; -import org.jboss.portal.cms.hibernate.state.Tools; +import org.jboss.portal.cms.security.AuthorizationManager; +import org.jboss.portal.cms.security.CMSPermission; +import org.jboss.portal.cms.security.Criteria; +import org.jboss.portal.cms.security.PermRoleAssoc; +import org.jboss.portal.cms.security.Permission; +import org.jboss.portal.cms.security.PortalCMSSecurityContext; import org.jboss.portal.common.invocation.InvocationException; - -import org.hibernate.SessionFactory; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.Query; - -import org.jboss.portal.cms.security.*; - -import org.jboss.portal.identity.User; import org.jboss.portal.identity.Role; import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.User; import org.jboss.portal.jems.as.JNDI; -import org.apache.log4j.Logger; +import org.jboss.portal.security.PortalPermission; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + /** - * ACLInterceptor is plugged into the CMS system to enforce fine grained security access control - * on resources stored in the CMS system. + * ACLInterceptor is plugged into the CMS system to enforce fine grained security access control on resources stored in + * the CMS system. * * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 27, 2006 */ @@ -74,125 +74,95 @@ private static Logger log = Logger.getLogger(ACLInterceptor.class); - /** - * default security policy that the cms service should be booted with - */ + /** default security policy that the cms service should be booted with */ private String defaultPolicy = null; - /** . */ + /** . */ private RoleModule roleModule = null; - /** . */ + /** . */ private String jndiName = null; - - /** . */ + + /** . */ private JNDI.Binding jndiBinding = null; - /** . */ + /** . */ private AuthorizationManager authorizationManager = null; - - /** . */ + + /** . */ private String cmsSessionFactory = null; - - /** . */ + + /** . */ private String identitySessionFactory = null; - /** - * @return - */ + /** @return */ public AuthorizationManager getAuthorizationManager() { return this.authorizationManager; } - /** - * @param authorizationManager - */ + /** @param authorizationManager */ public void setAuthorizationManager(AuthorizationManager authorizationManager) { this.authorizationManager = authorizationManager; } - /** - * @return - */ + /** @return */ public String getDefaultPolicy() { return this.defaultPolicy; } - /** - * @param defaultPolicy - */ + /** @param defaultPolicy */ public void setDefaultPolicy(String defaultPolicy) { this.defaultPolicy = defaultPolicy; } - /** - * @return - */ + /** @return */ public RoleModule getRoleModule() { return this.roleModule; } - /** - * @param roleModule - */ + /** @param roleModule */ public void setRoleModule(RoleModule roleModule) { this.roleModule = roleModule; } - /** - * @return - */ + /** @return */ public String getJNDIName() { return this.jndiName; } - /** - * @param jndiName - */ + /** @param jndiName */ public void setJNDIName(String jndiName) { this.jndiName = jndiName; } - - /** - * - * @return - */ + + /** @return */ public String getIdentitySessionFactory() { return this.identitySessionFactory; } - - /** - * - * @param identitySessionFactory - */ + + /** @param identitySessionFactory */ public void setIdentitySessionFactory(String identitySessionFactory) { this.identitySessionFactory = identitySessionFactory; } - - /** - * - * @return - */ + + /** @return */ public String getCmsSessionFactory() { return cmsSessionFactory; } - /** - * - * @param cmsSessionFactory - */ + /** @param cmsSessionFactory */ public void setCmsSessionFactory(String cmsSessionFactory) { this.cmsSessionFactory = cmsSessionFactory; @@ -217,7 +187,7 @@ //perform access check PortalPermission cmsPermission = new CMSPermission(securityContext); - boolean allowAccess = this.authorizationManager.checkPermission(cmsPermission); + boolean allowAccess = this.authorizationManager.checkPermission(cmsPermission); if (allowAccess) { Object response = invocation.invokeNext(); @@ -250,8 +220,8 @@ } /** - * Filters any files/folders based on the user's access. The filter is applied to folders/files - * returned by invoking a CMS command + * Filters any files/folders based on the user's access. The filter is applied to folders/files returned by invoking + * a CMS command * * @param response * @return @@ -268,7 +238,7 @@ List filteredFolders = new ArrayList(); List filteredFiles = new ArrayList(); securityContext.removeAttribute("command"); - if(folder.getFolders()!=null) + if (folder.getFolders() != null) { for (Iterator itr = folder.getFolders().iterator(); itr.hasNext();) { @@ -282,7 +252,7 @@ } } } - if(folder.getFiles()!=null) + if (folder.getFiles() != null) { for (Iterator itr = folder.getFiles().iterator(); itr.hasNext();) { @@ -320,7 +290,7 @@ catch (Exception e) { throw new RuntimeException(e); - } + } return filteredResponse; } @@ -330,8 +300,8 @@ public void start() throws Exception { log.info("AuthorizationManager initialized=" + this.authorizationManager); - - if(this.jndiName != null) + + if (this.jndiName != null) { this.jndiBinding = new JNDI.Binding(jndiName, this); this.jndiBinding.bind(); @@ -414,18 +384,15 @@ } } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void stop() throws Exception { - if(this.jndiBinding != null) + if (this.jndiBinding != null) { this.jndiBinding.unbind(); this.jndiBinding = null; - } + } Tools.destroy(); } @@ -533,12 +500,12 @@ } /** - * This turns off acl security only for a particular thread. - * This is used by system level operations that need to integrate with the CMS + * This turns off acl security only for a particular thread. This is used by system level operations that need to + * integrate with the CMS * <p/> - * Example is: the workflow daemon that publishes a content as live when a manager - * approves it. Without turning this off, the daemon thread is running in Anonymous mode - * which obviously does not have the rights to publish the content + * Example is: the workflow daemon that publishes a content as live when a manager approves it. Without turning this + * off, the daemon thread is running in Anonymous mode which obviously does not have the rights to publish the + * content */ private static ThreadLocal turnOff = new ThreadLocal(); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ACLInterceptor.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ApprovalWorkflowInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ApprovalWorkflowInterceptor.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ApprovalWorkflowInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,126 +22,109 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.interceptors; -import java.util.Date; -import java.lang.reflect.Method; - import org.jboss.portal.cms.CMSInterceptor; import org.jboss.portal.cms.impl.jcr.JCRCommand; import org.jboss.portal.cms.impl.jcr.JCRCommandContext; - import org.jboss.portal.cms.impl.jcr.composite.NewFileCommand; import org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand; - +import org.jboss.portal.cms.workflow.ApprovePublish; +import org.jboss.portal.cms.workflow.Content; import org.jboss.portal.common.invocation.InvocationException; - import org.jboss.portal.identity.User; import org.jboss.portal.jems.as.JNDI; -import org.jboss.portal.cms.workflow.ApprovePublish; -import org.jboss.portal.cms.workflow.Content; +import java.lang.reflect.Method; +import java.util.Date; /** - * * Created on : Jan 29, 2007 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ public class ApprovalWorkflowInterceptor extends CMSInterceptor { /** - * + * */ private String jndiName = null; - + /** - * + * */ private JNDI.Binding jndiBinding = null; - - /** - * - * @return - */ + + /** @return */ public String getJNDIName() { return this.jndiName; } - - /** - * - * @param jndiName - */ + + /** @param jndiName */ public void setJNDIName(String jndiName) { this.jndiName = jndiName; } - - /** - * - */ - protected Object invoke(JCRCommand invocation) throws Exception, InvocationException - { - //pre-processing - if(invocation instanceof NewFileCommand || invocation instanceof UpdateFileCommand) - { - ApprovePublish approvePublishWorkflow = (ApprovePublish)invocation.getContext(). - getAttribute(JCRCommandContext.scope, "approvePublishWorkflow"); - - if(approvePublishWorkflow!=null) - { - User user = (User)invocation.getContext().getAttribute(JCRCommandContext.scope,"user"); - org.jboss.portal.cms.model.Content content = null; - Method getContentMethod = invocation.getClass().getMethod("getContent", null); - content = (org.jboss.portal.cms.model.Content)getContentMethod.invoke(invocation, null); - - //call the workflow service here - Content workflowContent = new Content(); - workflowContent.setPath(content.getBasePath()); - workflowContent.setUserName(user.getUserName()); - workflowContent.setMimeType(content.getMimeType()); - if(content.getBytes()!=null) - { - workflowContent.setSize(content.getBytes().length); - } - workflowContent.setCreationDate(new Date()); - - long processId = approvePublishWorkflow.requestApproval(workflowContent); - - //save the processId in the context - invocation.setAttribute(JCRCommandContext.scope, "processid", String.valueOf(processId)); - } - } - - Object returnVal = invocation.invokeNext(); - - //post-processing - - //no post-processing needed for this interceptor - - return returnVal; - } - + /** - * - * @throws Exception + * */ + protected Object invoke(JCRCommand invocation) throws Exception, InvocationException + { + //pre-processing + if (invocation instanceof NewFileCommand || invocation instanceof UpdateFileCommand) + { + ApprovePublish approvePublishWorkflow = (ApprovePublish)invocation.getContext(). + getAttribute(JCRCommandContext.scope, "approvePublishWorkflow"); + + if (approvePublishWorkflow != null) + { + User user = (User)invocation.getContext().getAttribute(JCRCommandContext.scope, "user"); + org.jboss.portal.cms.model.Content content = null; + Method getContentMethod = invocation.getClass().getMethod("getContent", null); + content = (org.jboss.portal.cms.model.Content)getContentMethod.invoke(invocation, null); + + //call the workflow service here + Content workflowContent = new Content(); + workflowContent.setPath(content.getBasePath()); + workflowContent.setUserName(user.getUserName()); + workflowContent.setMimeType(content.getMimeType()); + if (content.getBytes() != null) + { + workflowContent.setSize(content.getBytes().length); + } + workflowContent.setCreationDate(new Date()); + + long processId = approvePublishWorkflow.requestApproval(workflowContent); + + //save the processId in the context + invocation.setAttribute(JCRCommandContext.scope, "processid", String.valueOf(processId)); + } + } + + Object returnVal = invocation.invokeNext(); + + //post-processing + + //no post-processing needed for this interceptor + + return returnVal; + } + + /** @throws Exception */ public void start() throws Exception { - if(this.jndiName != null) + if (this.jndiName != null) { this.jndiBinding = new JNDI.Binding(jndiName, this); this.jndiBinding.bind(); } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void stop() throws Exception { - if(this.jndiBinding != null) + if (this.jndiBinding != null) { this.jndiBinding.unbind(); this.jndiBinding = null; Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/ApprovalWorkflowInterceptor.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -34,29 +34,27 @@ import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.FolderImpl; import org.jboss.portal.cms.impl.jcr.jackrabbit.JackrabbitJCRService; +import org.jboss.portal.cms.model.CMSUser; import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; import org.jboss.portal.cms.model.Folder; -import org.jboss.portal.cms.model.CMSUser; import org.jboss.portal.cms.util.RepositoryUtil; +import org.jboss.portal.cms.workflow.ApprovePublish; import org.jboss.portal.common.invocation.InterceptorStackFactory; import org.jboss.portal.common.invocation.Invocation; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.invocation.InvocationHandler; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.net.URLNavigator; import org.jboss.portal.common.net.URLVisitor; import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.jems.as.JNDI; -import org.jboss.portal.identity.User; -import org.jboss.portal.identity.UserModule; -import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.IdentityServiceController; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.UserModule; +import org.jboss.portal.jems.as.JNDI; import org.jboss.portal.jems.as.system.AbstractJBossService; - -import org.jboss.portal.cms.workflow.ApprovePublish; - import org.jboss.util.StopWatch; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; @@ -99,13 +97,13 @@ private InterceptorStackFactory stackFactory; private Element config; - + private String identitySessionFactory = null; - + private IdentityServiceController identityServiceController; - + private ApprovePublish approvePublishWorkflow; - + private String jndiName; private JNDI.Binding jndiBinding; @@ -118,28 +116,26 @@ return cmd.execute(); } }; - - /** - * Used for storing the logged in user information - */ + + /** Used for storing the logged in user information */ protected static ThreadLocal userInfo = new ThreadLocal(); + public static ThreadLocal getUserInfo() { - return JCRCMS.userInfo; + return JCRCMS.userInfo; } - - /** - * This is used to turnoff workflow triggering only - * for this particular request through the CMS commands - */ + + /** This is used to turnoff workflow triggering only for this particular request through the CMS commands */ protected static ThreadLocal turnOffWorkflow = new ThreadLocal(); + public static void turnOffWorkflow() { - turnOffWorkflow.set(new Boolean(true)); + turnOffWorkflow.set(new Boolean(true)); } + public static void turnOnWorkflow() { - turnOffWorkflow.set(null); + turnOffWorkflow.set(null); } public JCRCMS() @@ -211,25 +207,20 @@ { this.doChecking = doChecking; } - - - /** - * @return the approvePublishWorkflow - */ - public ApprovePublish getApprovePublishWorkflow() - { - return approvePublishWorkflow; - } - - /** - * @param approvePublishWorkflow the approvePublishWorkflow to set - */ - public void setApprovePublishWorkflow(ApprovePublish approvePublishWorkflow) - { - this.approvePublishWorkflow = approvePublishWorkflow; - } + /** @return the approvePublishWorkflow */ + public ApprovePublish getApprovePublishWorkflow() + { + return approvePublishWorkflow; + } + + /** @param approvePublishWorkflow the approvePublishWorkflow to set */ + public void setApprovePublishWorkflow(ApprovePublish approvePublishWorkflow) + { + this.approvePublishWorkflow = approvePublishWorkflow; + } + public UserModule getUserModule() { if (identityServiceController != null) @@ -257,43 +248,31 @@ this.identityServiceController = identityServiceController; } - /** - * - * @return - */ + /** @return */ public String getJNDIName() { - return this.jndiName; + return this.jndiName; } - - /** - * - * @param jndiName - */ + + /** @param jndiName */ public void setJNDIName(String jndiName) { - this.jndiName = jndiName; + this.jndiName = jndiName; } - - /** - * - * @return - */ + + /** @return */ public String getIdentitySessionFactory() { return identitySessionFactory; } - - /** - * - * @param identitySessionFactory - */ + + /** @param identitySessionFactory */ public void setIdentitySessionFactory(String identitySessionFactory) { this.identitySessionFactory = identitySessionFactory; } - - + + /** CMS Start */ public void startService() throws Exception { @@ -307,7 +286,6 @@ String cacheVersion = Version.getVersionString(Version.getVersionShort()); log.info("JBossCache Version=" + cacheVersion); - // See how long it takes us to start up StopWatch watch = new StopWatch(true); log.info("Starting JCR CMS"); @@ -395,25 +373,24 @@ public void createContent() throws Exception { log.info("Creating default CMS content."); - // Get the content URL root = Thread.currentThread().getContextClassLoader().getResource(defaultContentLocation); - + //make the user executing these to create the default content, an 'Admin' user //without this, the fine grained security won't allow the creation UserModule userModule = getUserModule(); - if(userModule != null) + if (userModule != null) { - org.hibernate.Session session = org.jboss.portal.cms.hibernate.state.Tools.getOpenSession(); - org.hibernate.Transaction tx = session.beginTransaction(); - User user = userModule.findUserByUserName("admin"); - if(user!=null) - { - JCRCMS.getUserInfo().set(user); - } - tx.rollback(); - org.jboss.portal.cms.hibernate.state.Tools.closeSession(session); + org.hibernate.Session session = org.jboss.portal.cms.hibernate.state.Tools.getOpenSession(); + org.hibernate.Transaction tx = session.beginTransaction(); + User user = userModule.findUserByUserName("admin"); + if (user != null) + { + JCRCMS.getUserInfo().set(user); + } + tx.rollback(); + org.jboss.portal.cms.hibernate.state.Tools.closeSession(session); } // Iterate over the content @@ -588,20 +565,20 @@ try { xares.start(xid, XAResource.TMNOFLAGS); - + //Check and make sure in the case of a clustered call, the Identity propagated //as part of the invocation is handled correctly JCRCommandContext propagatedContext = (JCRCommandContext)((JCRCommand)cmd).getContext(); - if(propagatedContext != null) + if (propagatedContext != null) { CMSUser propagatedUser = (CMSUser)propagatedContext.getClusterContextInfo("user"); - if(propagatedUser != null) - { + if (propagatedUser != null) + { JCRCMS.getUserInfo().set(propagatedUser); isClusterDelegatedRequest = true; - } + } Boolean workflowStatus = (Boolean)propagatedContext.getClusterContextInfo("workflowStatus"); - if(workflowStatus != null) + if (workflowStatus != null) { JCRCMS.turnOffWorkflow(); clusterWorkflowStatus = true; @@ -612,15 +589,15 @@ JCRCommand jcrCmd = (JCRCommand)cmd; JCRCommandContext ctx = new JCRCommandContext(session, commandFactory, defaultLocale); jcrCmd.setContext(ctx); - + ctx.setAttribute(JCRCommandContext.scope, "user", JCRCMS.getUserInfo().get()); Object isWorkflowOff = JCRCMS.turnOffWorkflow.get(); - if( this.approvePublishWorkflow!=null //this checks and makes sure workflow is activated for the CMS - && - isWorkflowOff==null //this checks and makes sure workflow is not turned off only for this particular request - ) + if (this.approvePublishWorkflow != null //this checks and makes sure workflow is activated for the CMS + && + isWorkflowOff == null //this checks and makes sure workflow is not turned off only for this particular request + ) { - ctx.setAttribute(JCRCommandContext.scope, "approvePublishWorkflow", this.approvePublishWorkflow); + ctx.setAttribute(JCRCommandContext.scope, "approvePublishWorkflow", this.approvePublishWorkflow); } @@ -656,11 +633,11 @@ if (e instanceof CMSException) { - throw(CMSException)e; + throw (CMSException)e; } else if (e instanceof RuntimeException) { - throw(RuntimeException)e; + throw (RuntimeException)e; } else { @@ -674,25 +651,22 @@ //must do this otherwise, the whole cms will hang session.logout(); } - if(isClusterDelegatedRequest) + if (isClusterDelegatedRequest) { JCRCMS.getUserInfo().set(null); } - if(clusterWorkflowStatus) + if (clusterWorkflowStatus) { JCRCMS.turnOnWorkflow(); } } return obj; } - - /** - * - * @return - */ + + /** @return */ public boolean isWorkflowActivated() { - return (this.approvePublishWorkflow!=null); + return (this.approvePublishWorkflow != null); } public void setStackFactory(InterceptorStackFactory stackFactory) @@ -703,5 +677,5 @@ public InterceptorStackFactory getStackFactory() { return stackFactory; - } + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,33 +22,31 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.jcr; -import java.io.Serializable; -import java.util.Map; -import java.util.HashMap; - import org.jboss.portal.cms.CMSException; -import org.jboss.portal.cms.model.CMSUser; import org.jboss.portal.common.invocation.AbstractInvocationContext; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; import org.jboss.portal.common.invocation.Scope; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; import javax.jcr.Session; +import java.io.Serializable; +import java.util.HashMap; import java.util.Locale; +import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 7163 $ */ public class JCRCommandContext extends AbstractInvocationContext implements Serializable { public static final Scope scope = Scope.THREAD_SCOPE; - + private transient final Session session; private transient final JCRCommandFactory commandFactory; private transient final Locale locale; - + private Map clusterContext = null; public JCRCommandContext(Session session, JCRCommandFactory factory, Locale locale) @@ -81,17 +79,15 @@ } /** - * * @param key * @param data */ - public void setClusterContextInfo(String key,Object data) + public void setClusterContextInfo(String key, Object data) { this.getClusterContext().put(key, data); } - + /** - * * @param key * @return */ @@ -99,14 +95,15 @@ { return this.getClusterContext().get(key); } - + /** * Instantiates the cluser context only on-demand + * * @return */ private Map getClusterContext() { - if(this.clusterContext == null) + if (this.clusterContext == null) { this.clusterContext = new HashMap(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,10 +22,6 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.jcr; -import java.io.InputStream; -import java.util.List; -import java.util.Locale; - import org.jboss.portal.cms.Command; import org.jboss.portal.cms.CommandFactory; import org.jboss.portal.cms.impl.jcr.command.ContentCreateCommand; @@ -44,19 +40,22 @@ import org.jboss.portal.cms.impl.jcr.command.FolderUpdateCommand; import org.jboss.portal.cms.impl.jcr.command.GetArchiveCommand; import org.jboss.portal.cms.impl.jcr.command.ItemExistsCommand; +import org.jboss.portal.cms.impl.jcr.command.MakeLiveVersionCommand; import org.jboss.portal.cms.impl.jcr.command.MoveCommand; import org.jboss.portal.cms.impl.jcr.command.RenameCommand; import org.jboss.portal.cms.impl.jcr.command.SearchCommand; import org.jboss.portal.cms.impl.jcr.command.StoreArchiveCommand; -import org.jboss.portal.cms.impl.jcr.command.MakeLiveVersionCommand; import org.jboss.portal.cms.impl.jcr.composite.NewFileCommand; import org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand; import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; import org.jboss.portal.cms.model.Folder; -import org.jboss.portal.search.Query; import org.jboss.portal.search.impl.jcr.JCRQuery; +import java.io.InputStream; +import java.util.List; +import java.util.Locale; + /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> @@ -186,9 +185,9 @@ { return new SearchCommand(query); } - + public Command createMakeLiveVersionCommand(String filePath, String language, String version) { - return new MakeLiveVersionCommand(filePath,language,version); + return new MakeLiveVersionCommand(filePath, language, version); } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -27,7 +27,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 5448 $ */ public interface JCRService { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,725 +21,717 @@ */ package org.jboss.portal.cms.impl.jcr.command; -import java.util.Collection; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.HashSet; -import java.util.StringTokenizer; - import org.jboss.portal.cms.impl.jcr.JCRCommand; import org.jboss.portal.cms.impl.jcr.composite.NewFileCommand; import org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand; -import org.jboss.portal.cms.security.PortalCMSSecurityContext; -import org.jboss.portal.cms.security.Permission; -import org.jboss.portal.cms.security.Criteria; import org.jboss.portal.cms.security.AuthorizationManager; - -import org.jboss.portal.identity.User; +import org.jboss.portal.cms.security.Criteria; +import org.jboss.portal.cms.security.Permission; +import org.jboss.portal.cms.security.PortalCMSSecurityContext; +import org.jboss.portal.cms.workflow.ApprovePublish; import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.User; -import org.jboss.portal.cms.workflow.ApprovePublish; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; /** - * ACLEnforcer checks proper access privileges for actions before - * the Command objects are allowed to execute and do their job on the CMS - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 28, 2006 + * ACLEnforcer checks proper access privileges for actions before the Command objects are allowed to execute and do + * their job on the CMS * + * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 28, 2006 */ public class ACLEnforcer { - private Collection readCommands = new ArrayList(); //a list of commands that perform read action on the cms - private Collection writeCommands = new ArrayList();//a list of commands that perform write action on the cms - private Collection manageCommands = new ArrayList();//a list of commands that perform manage action on the cms - - private static final int read = 0; - private static final int write = 1; - private static final int manage = 2; + private Collection readCommands = new ArrayList(); //a list of commands that perform read action on the cms + private Collection writeCommands = new ArrayList();//a list of commands that perform write action on the cms + private Collection manageCommands = new ArrayList();//a list of commands that perform manage action on the cms + + private static final int read = 0; + private static final int write = 1; + private static final int manage = 2; // private static final int manageWorkflow = 3; - - private AuthorizationManager authorizationManager = null; - - /** - * - * - */ - public ACLEnforcer(AuthorizationManager authorizationManager) - { - super(); - this.authorizationManager = authorizationManager; - - String packageName = "org.jboss.portal.cms.impl.jcr.command."; - - //load the read related commands - readCommands.add(packageName+"FolderGetListCommand"); - readCommands.add(packageName+"FolderGetCommand"); - readCommands.add(packageName+"FileGetListCommand"); - readCommands.add(packageName+"FileGetCommand"); - - //load the write related commands - writeCommands.add(packageName+"ContentCreateCommand"); - writeCommands.add(packageName+"FileCreateCommand"); - writeCommands.add(packageName+"FolderCreateCommand"); - writeCommands.add(packageName+"FileUpdateCommand"); - writeCommands.add(packageName+"StoreArchiveCommand"); - writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.NewFileCommand"); - writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand"); - - - //load the manage related commands - manageCommands.add(packageName+"CopyCommand"); - manageCommands.add(packageName+"DeleteCommand"); - manageCommands.add(packageName+"MoveCommand"); - } - - - /** - * - * @param securityContext - * @return - */ - public boolean hasAccess(PortalCMSSecurityContext cmsSecurityContext) - { - boolean hasAccess = true; - User loggedInUser = (User)cmsSecurityContext.getIdentity(); - JCRCommand command = (JCRCommand)cmsSecurityContext.getAttribute("command"); - - //get the action code of the action being protected - int actionCode = -1; - if(command != null) - { - actionCode = this.getActionCode(command); - } - - switch(actionCode) - { - case read: - hasAccess = this.hasReadAccess(loggedInUser,command); + private AuthorizationManager authorizationManager = null; + + + /** + * + * + */ + public ACLEnforcer(AuthorizationManager authorizationManager) + { + super(); + this.authorizationManager = authorizationManager; + + String packageName = "org.jboss.portal.cms.impl.jcr.command."; + + //load the read related commands + readCommands.add(packageName + "FolderGetListCommand"); + readCommands.add(packageName + "FolderGetCommand"); + readCommands.add(packageName + "FileGetListCommand"); + readCommands.add(packageName + "FileGetCommand"); + + //load the write related commands + writeCommands.add(packageName + "ContentCreateCommand"); + writeCommands.add(packageName + "FileCreateCommand"); + writeCommands.add(packageName + "FolderCreateCommand"); + writeCommands.add(packageName + "FileUpdateCommand"); + writeCommands.add(packageName + "StoreArchiveCommand"); + writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.NewFileCommand"); + writeCommands.add("org.jboss.portal.cms.impl.jcr.composite.UpdateFileCommand"); + + //load the manage related commands + manageCommands.add(packageName + "CopyCommand"); + manageCommands.add(packageName + "DeleteCommand"); + manageCommands.add(packageName + "MoveCommand"); + } + + + /** + * @param securityContext + * @return + */ + public boolean hasAccess(PortalCMSSecurityContext cmsSecurityContext) + { + boolean hasAccess = true; + User loggedInUser = (User)cmsSecurityContext.getIdentity(); + JCRCommand command = (JCRCommand)cmsSecurityContext.getAttribute("command"); + + //get the action code of the action being protected + int actionCode = -1; + if (command != null) + { + actionCode = this.getActionCode(command); + } + + switch (actionCode) + { + case read: + hasAccess = this.hasReadAccess(loggedInUser, command); break; - - case write: - hasAccess = this.hasWriteAccess(loggedInUser,command); + + case write: + hasAccess = this.hasWriteAccess(loggedInUser, command); break; - - case manage: - hasAccess = this.hasManageAccess(loggedInUser,command); + + case manage: + hasAccess = this.hasManageAccess(loggedInUser, command); break; - - default: - //check if a filter needs to be applied here...... - //only show resources that the user has write or more access to - if(cmsSecurityContext.getAttribute("applyFilter")!=null) - { - String path = (String)cmsSecurityContext.getAttribute("applyFilter"); - hasAccess = this.computeToolAccess(loggedInUser, path); - } - else if(cmsSecurityContext.getAttribute("path")!=null) - { - String path = (String)cmsSecurityContext.getAttribute("path"); - hasAccess = this.computeAccess(loggedInUser, path, "read"); - } - //check if workflow management protection needs to be enforced - else if(cmsSecurityContext.getAttribute("manageWorkflow")!=null) - { - ApprovePublish service = (ApprovePublish)cmsSecurityContext. - getAttribute("approvePublish"); - hasAccess = this.computeWorkflowManagementAccess(loggedInUser,service.getManagers()); - } - break; - } - - return hasAccess; - } - - /** - * - * @param command - * @return - */ - private int getActionCode(JCRCommand command) - { - int actionCode = -1; - - if(this.readCommands.contains(command.getClass().getName())) - { - actionCode = read; - } - else if(this.writeCommands.contains(command.getClass().getName())) - { - actionCode = write; - } - else if(this.manageCommands.contains(command.getClass().getName())) - { - actionCode = manage; - } - return actionCode; - } - //--------------------------------------------------------------------------------------------------------------------------------------- - /** - * - * @param user - * @param command - * @return - */ - private boolean hasReadAccess(User user,JCRCommand command) - { - boolean hasReadAccess = false; - - String path = null; - if(command instanceof FolderGetListCommand) - { - path = ((FolderGetListCommand)command).sFolderPath; - } - else if(command instanceof FolderGetCommand) - { - path = ((FolderGetCommand)command).msPath; - } - else if(command instanceof FileGetCommand) - { - path = ((FileGetCommand)command).path; - } - else if(command instanceof FileGetListCommand) - { - path = ((FileGetListCommand)command).sFilePath; - } - - hasReadAccess = this.computeAccess(user,path,"read"); - if(!hasReadAccess) - { - //make sure implied write is not available - hasReadAccess = this.computeAccess(user,path,"write"); - if(!hasReadAccess) + + default: + //check if a filter needs to be applied here...... + //only show resources that the user has write or more access to + if (cmsSecurityContext.getAttribute("applyFilter") != null) { - //make sure implied manage is not available - hasReadAccess = this.computeAccess(user,path,"manage"); + String path = (String)cmsSecurityContext.getAttribute("applyFilter"); + hasAccess = this.computeToolAccess(loggedInUser, path); } - } - - return hasReadAccess; - } - //------------------------------------------------------------------------------------------------------------------------------------------- - /** - * - * @param user - * @param command - * @return - */ - private boolean hasWriteAccess(User user,JCRCommand command) - { - boolean hasWriteAccess = false; - - String path = null; - if(command instanceof ContentCreateCommand) - { - path = ((ContentCreateCommand)command).mFile.getBasePath(); - } - else if(command instanceof FileCreateCommand) - { - path = ((FileCreateCommand)command).mFile.getBasePath(); - } - else if(command instanceof FolderCreateCommand) - { - path = ((FolderCreateCommand)command).mFolder.getBasePath(); - } - else if(command instanceof FileUpdateCommand) - { - path = ((FileUpdateCommand)command).mFile.getBasePath(); - } - else if(command instanceof StoreArchiveCommand) - { - path = ((StoreArchiveCommand)command).msRootPath; - } - else if(command instanceof NewFileCommand) - { - path = ((NewFileCommand)command).getPath(); - } - else if(command instanceof UpdateFileCommand) - { - path = ((UpdateFileCommand)command).getPath(); - } - - hasWriteAccess = this.computeAccess(user,path,"write"); - if(!hasWriteAccess) - { - //make sure implied manage is not available - hasWriteAccess = this.computeAccess(user,path,"manage"); - } - - return hasWriteAccess; - } - //----------------------------------------------------------------------------------------------------------------------------------------- - /** - * - * @param user - * @param command - * @return - */ - private boolean hasManageAccess(User user,JCRCommand command) - { - boolean hasManageAccess = false; - - String path = null; - if(command instanceof CopyCommand) - { - path = ((CopyCommand)command).msFromPath; - hasManageAccess = this.computeAccess(user,path,"manage"); - if(hasManageAccess) + else if (cmsSecurityContext.getAttribute("path") != null) { - path = ((CopyCommand)command).msToPath; - hasManageAccess = this.computeAccess(user,path,"manage"); + String path = (String)cmsSecurityContext.getAttribute("path"); + hasAccess = this.computeAccess(loggedInUser, path, "read"); } - } - else if(command instanceof DeleteCommand) - { - path = ((DeleteCommand)command).msPath; - hasManageAccess = this.computeAccess(user,path,"manage"); - } - else if(command instanceof MoveCommand) - { - path = ((MoveCommand)command).msFromPath; - hasManageAccess = this.computeAccess(user,path,"manage"); - if(hasManageAccess) + //check if workflow management protection needs to be enforced + else if (cmsSecurityContext.getAttribute("manageWorkflow") != null) { - path = ((MoveCommand)command).msToPath; - hasManageAccess = this.computeAccess(user,path,"manage"); + ApprovePublish service = (ApprovePublish)cmsSecurityContext. + getAttribute("approvePublish"); + hasAccess = this.computeWorkflowManagementAccess(loggedInUser, service.getManagers()); } - } - - return hasManageAccess; - } - //----------------------------------------------------------------------------------------------------------------------------------------- - /** - * - */ - private boolean computeAccess(User user,String path,String action) - { - boolean hasAccess = false; - - //to prevent any administration issues, if the user is the 'admin' - //treat him like a super user with access to everything in the cms - if(user!= null && user.getUserName()!=null && user.getUserName().equals("admin")) - { - return true; - } - - - //get the permissions available for the user in question - Collection userPermissions = this.getPermissions(user); - - //check against permissions that are explicitly specified on this node (file or folder) - Collection specificPermissions = this.getPermissions(path); - for(Iterator itr=specificPermissions.iterator();itr.hasNext();) - { - Permission specificPermission = (Permission)itr.next(); - if(specificPermission.getService().equals("cms") && specificPermission.getAction().equals(action)) + break; + } + + return hasAccess; + } + + /** + * @param command + * @return + */ + private int getActionCode(JCRCommand command) + { + int actionCode = -1; + + if (this.readCommands.contains(command.getClass().getName())) + { + actionCode = read; + } + else if (this.writeCommands.contains(command.getClass().getName())) + { + actionCode = write; + } + else if (this.manageCommands.contains(command.getClass().getName())) + { + actionCode = manage; + } + return actionCode; + } + + //--------------------------------------------------------------------------------------------------------------------------------------- + /** + * @param user + * @param command + * @return + */ + private boolean hasReadAccess(User user, JCRCommand command) + { + boolean hasReadAccess = false; + + String path = null; + if (command instanceof FolderGetListCommand) + { + path = ((FolderGetListCommand)command).sFolderPath; + } + else if (command instanceof FolderGetCommand) + { + path = ((FolderGetCommand)command).msPath; + } + else if (command instanceof FileGetCommand) + { + path = ((FileGetCommand)command).path; + } + else if (command instanceof FileGetListCommand) + { + path = ((FileGetListCommand)command).sFilePath; + } + + hasReadAccess = this.computeAccess(user, path, "read"); + if (!hasReadAccess) + { + //make sure implied write is not available + hasReadAccess = this.computeAccess(user, path, "write"); + if (!hasReadAccess) + { + //make sure implied manage is not available + hasReadAccess = this.computeAccess(user, path, "manage"); + } + } + + return hasReadAccess; + } + + //------------------------------------------------------------------------------------------------------------------------------------------- + /** + * @param user + * @param command + * @return + */ + private boolean hasWriteAccess(User user, JCRCommand command) + { + boolean hasWriteAccess = false; + + String path = null; + if (command instanceof ContentCreateCommand) + { + path = ((ContentCreateCommand)command).mFile.getBasePath(); + } + else if (command instanceof FileCreateCommand) + { + path = ((FileCreateCommand)command).mFile.getBasePath(); + } + else if (command instanceof FolderCreateCommand) + { + path = ((FolderCreateCommand)command).mFolder.getBasePath(); + } + else if (command instanceof FileUpdateCommand) + { + path = ((FileUpdateCommand)command).mFile.getBasePath(); + } + else if (command instanceof StoreArchiveCommand) + { + path = ((StoreArchiveCommand)command).msRootPath; + } + else if (command instanceof NewFileCommand) + { + path = ((NewFileCommand)command).getPath(); + } + else if (command instanceof UpdateFileCommand) + { + path = ((UpdateFileCommand)command).getPath(); + } + + hasWriteAccess = this.computeAccess(user, path, "write"); + if (!hasWriteAccess) + { + //make sure implied manage is not available + hasWriteAccess = this.computeAccess(user, path, "manage"); + } + + return hasWriteAccess; + } + + //----------------------------------------------------------------------------------------------------------------------------------------- + /** + * @param user + * @param command + * @return + */ + private boolean hasManageAccess(User user, JCRCommand command) + { + boolean hasManageAccess = false; + + String path = null; + if (command instanceof CopyCommand) + { + path = ((CopyCommand)command).msFromPath; + hasManageAccess = this.computeAccess(user, path, "manage"); + if (hasManageAccess) + { + path = ((CopyCommand)command).msToPath; + hasManageAccess = this.computeAccess(user, path, "manage"); + } + } + else if (command instanceof DeleteCommand) + { + path = ((DeleteCommand)command).msPath; + hasManageAccess = this.computeAccess(user, path, "manage"); + } + else if (command instanceof MoveCommand) + { + path = ((MoveCommand)command).msFromPath; + hasManageAccess = this.computeAccess(user, path, "manage"); + if (hasManageAccess) + { + path = ((MoveCommand)command).msToPath; + hasManageAccess = this.computeAccess(user, path, "manage"); + } + } + + return hasManageAccess; + } + + //----------------------------------------------------------------------------------------------------------------------------------------- + /** + * + */ + private boolean computeAccess(User user, String path, String action) + { + boolean hasAccess = false; + + //to prevent any administration issues, if the user is the 'admin' + //treat him like a super user with access to everything in the cms + if (user != null && user.getUserName() != null && user.getUserName().equals("admin")) + { + return true; + } + + //get the permissions available for the user in question + Collection userPermissions = this.getPermissions(user); + + //check against permissions that are explicitly specified on this node (file or folder) + Collection specificPermissions = this.getPermissions(path); + for (Iterator itr = specificPermissions.iterator(); itr.hasNext();) + { + Permission specificPermission = (Permission)itr.next(); + if (specificPermission.getService().equals("cms") && specificPermission.getAction().equals(action)) + { + for (Iterator itr2 = userPermissions.iterator(); itr2.hasNext();) { - for(Iterator itr2=userPermissions.iterator();itr2.hasNext();) - { - Permission userPermission = (Permission)itr2.next(); - if(userPermission.getService().equals("cms") && userPermission.getAction().equals(action)) - { + Permission userPermission = (Permission)itr2.next(); + if (userPermission.getService().equals("cms") && userPermission.getAction().equals(action)) + { + String pathCriteria = userPermission.findCriteriaValue("path"); + if (pathCriteria.equals(path)) + { + //this means this user has read access to this path + hasAccess = true; + } + } + } + } + } + + if (specificPermissions != null && !specificPermissions.isEmpty()) + { + //explicit permissions on this node have been specified.... + //which override any permissions that could be inherited via the path hierarchy + return hasAccess; + } + + //check against the full path of this resource and make sure, + //there aren't any specific node permissions specified on any node along the path + //that excludes this user from having access for this action + StringTokenizer st = new StringTokenizer(path, "/"); + StringBuffer buffer = new StringBuffer("/"); + List list = new ArrayList(); + list.add(new String(buffer.toString())); + while (st.hasMoreTokens()) + { + String token = st.nextToken(); + + buffer.append(token); + list.add(buffer.toString()); + + //Make sure only path leading up to the resource is checked against. + //Not on the full path to the resource... + //Because if that was the case, the specificPermissions would have been applied + //in earlier checks...This is to check the recursive application of permissions + //to the resource in question + if (st.hasMoreTokens()) + { + buffer.append("/"); + } + else + { + continue; + } + } + + boolean explicitPermissionsFound = false; + Iterator it = list.iterator(); + while (it.hasNext()) + { + String currentPath = (String)it.next(); + Collection permissions = this.getPermissions(currentPath); + + //perform processing for permissions explicitly set on this node + //in the path hierarchy + if (permissions != null && !permissions.isEmpty()) + { + explicitPermissionsFound = true; + + //specific node permissions found on one of the nodes in the path... + //make sure the current user is listed to have access to this. + boolean accessFound = false; + for (Iterator itr = permissions.iterator(); itr.hasNext();) + { + Permission nodePermission = (Permission)itr.next(); + if (nodePermission.getService().equals("cms") && nodePermission.getAction().equals(action)) + { + for (Iterator itr2 = userPermissions.iterator(); itr2.hasNext();) + { + Permission userPermission = (Permission)itr2.next(); + if (userPermission.getService().equals("cms") && + this.isActionImplied(userPermission.getAction(), action) + ) + { String pathCriteria = userPermission.findCriteriaValue("path"); - if(pathCriteria.equals(path)) + if (pathCriteria.equals(currentPath)) { - //this means this user has read access to this path - hasAccess = true; + //this means this user has read access to this path + accessFound = true; } - } - } + } + } + } + if (accessFound) + { + break; + } } - } - - if(specificPermissions!=null && !specificPermissions.isEmpty()) - { - //explicit permissions on this node have been specified.... - //which override any permissions that could be inherited via the path hierarchy - return hasAccess; - } - - - //check against the full path of this resource and make sure, - //there aren't any specific node permissions specified on any node along the path - //that excludes this user from having access for this action - StringTokenizer st = new StringTokenizer(path,"/"); - StringBuffer buffer = new StringBuffer("/"); - List list = new ArrayList(); - list.add(new String(buffer.toString())); - while(st.hasMoreTokens()) - { - String token = st.nextToken(); - - buffer.append(token); - list.add(buffer.toString()); - - //Make sure only path leading up to the resource is checked against. - //Not on the full path to the resource... - //Because if that was the case, the specificPermissions would have been applied - //in earlier checks...This is to check the recursive application of permissions - //to the resource in question - if(st.hasMoreTokens()) - { - buffer.append("/"); - } - else + if (!accessFound) { - continue; + //the user does not have access through the path hierarchy + return false; } - } - - boolean explicitPermissionsFound = false; - Iterator it = list.iterator(); - while (it.hasNext()) - { - String currentPath = (String)it.next(); - Collection permissions = this.getPermissions(currentPath); + } + } - //perform processing for permissions explicitly set on this node - //in the path hierarchy - if(permissions!=null && !permissions.isEmpty()) - { - explicitPermissionsFound = true; - - //specific node permissions found on one of the nodes in the path... - //make sure the current user is listed to have access to this. - boolean accessFound = false; - for(Iterator itr=permissions.iterator();itr.hasNext();) - { - Permission nodePermission = (Permission)itr.next(); - if(nodePermission.getService().equals("cms") && nodePermission.getAction().equals(action)) - { - for(Iterator itr2=userPermissions.iterator();itr2.hasNext();) - { - Permission userPermission = (Permission)itr2.next(); - if( userPermission.getService().equals("cms") && - this.isActionImplied(userPermission.getAction(),action) - ) - { - String pathCriteria = userPermission.findCriteriaValue("path"); - if(pathCriteria.equals(currentPath)) - { - //this means this user has read access to this path - accessFound = true; - } - } - } - } - if(accessFound) - { - break; - } - } - if(!accessFound) - { - //the user does not have access through the path hierarchy - return false; - } - } - } - - //if i am here the user has access to this node via path hierarchy inheritance - if(explicitPermissionsFound) - { - //and without the hierarchy access *not being overriden* by any *explicit permissions* - //on nodes in the hierarchy - hasAccess = true; - } - else - { - //there were no permissions found anywhere throughout the resource's path hierarchy - hasAccess = false; - } - - return hasAccess; - } - - /** - * This is used to filter out cms resources in the CMS Admin tool, so that the user - * can see only the resources that he has write/manage access to - * - * @param user - * @param path - * @return - */ - private boolean computeToolAccess(User user,String path) - { - boolean toolAccess = false; - - //to prevent any administration issues, if the user is the 'admin' - //treat him like a super user with access to everything in the cms - if(user!= null && user.getUserName()!=null && user.getUserName().equals("admin")) - { - return true; - } + //if i am here the user has access to this node via path hierarchy inheritance + if (explicitPermissionsFound) + { + //and without the hierarchy access *not being overriden* by any *explicit permissions* + //on nodes in the hierarchy + hasAccess = true; + } + else + { + //there were no permissions found anywhere throughout the resource's path hierarchy + hasAccess = false; + } - //get the permissions available for the user in question - Collection userPermissions = this.getPermissions(user); - - //check against permissions that are explicitly specified on this node (file or folder) - Collection specificPermissions = this.getPermissions(path); - for(Iterator itr=specificPermissions.iterator();itr.hasNext();) - { - Permission specificPermission = (Permission)itr.next(); - if( (specificPermission.getService().equals("cms")) && - (specificPermission.getAction().equals("write") || specificPermission.getAction().equals("manage")) + return hasAccess; + } + + /** + * This is used to filter out cms resources in the CMS Admin tool, so that the user can see only the resources that + * he has write/manage access to + * + * @param user + * @param path + * @return + */ + private boolean computeToolAccess(User user, String path) + { + boolean toolAccess = false; + + //to prevent any administration issues, if the user is the 'admin' + //treat him like a super user with access to everything in the cms + if (user != null && user.getUserName() != null && user.getUserName().equals("admin")) + { + return true; + } + + //get the permissions available for the user in question + Collection userPermissions = this.getPermissions(user); + + //check against permissions that are explicitly specified on this node (file or folder) + Collection specificPermissions = this.getPermissions(path); + for (Iterator itr = specificPermissions.iterator(); itr.hasNext();) + { + Permission specificPermission = (Permission)itr.next(); + if ((specificPermission.getService().equals("cms")) && + (specificPermission.getAction().equals("write") || specificPermission.getAction().equals("manage")) ) + { + for (Iterator itr2 = userPermissions.iterator(); itr2.hasNext();) { - for(Iterator itr2=userPermissions.iterator();itr2.hasNext();) - { - Permission userPermission = (Permission)itr2.next(); - if( (userPermission.getService().equals("cms")) && - (userPermission.getAction().equals("write") || userPermission.getAction().equals("manage")) - ) - { - String pathCriteria = userPermission.findCriteriaValue("path"); - if(pathCriteria.equals(path)) - { - //this means this user has read access to this path - toolAccess = true; - } - } - } + Permission userPermission = (Permission)itr2.next(); + if ((userPermission.getService().equals("cms")) && + (userPermission.getAction().equals("write") || userPermission.getAction().equals("manage")) + ) + { + String pathCriteria = userPermission.findCriteriaValue("path"); + if (pathCriteria.equals(path)) + { + //this means this user has read access to this path + toolAccess = true; + } + } } - } - - if(specificPermissions!=null && !specificPermissions.isEmpty()) - { - //explicit permissions on this node have been specified.... - //which override any permissions that could be inherited via the path hierarchy - return toolAccess; - } - - //if i am here...calculate based on permissions inherited via path hierarchy - Collection writeOrMoreCriteria = this.getWriteOrMore(userPermissions); - for(Iterator itr=writeOrMoreCriteria.iterator();itr.hasNext();) - { - Criteria cour = (Criteria)itr.next(); - if(this.doesPathMatchPattern(path,cour.getValue())) + } + } + + if (specificPermissions != null && !specificPermissions.isEmpty()) + { + //explicit permissions on this node have been specified.... + //which override any permissions that could be inherited via the path hierarchy + return toolAccess; + } + + //if i am here...calculate based on permissions inherited via path hierarchy + Collection writeOrMoreCriteria = this.getWriteOrMore(userPermissions); + for (Iterator itr = writeOrMoreCriteria.iterator(); itr.hasNext();) + { + Criteria cour = (Criteria)itr.next(); + if (this.doesPathMatchPattern(path, cour.getValue())) + { + + toolAccess = true; + break; + } + } + + return toolAccess; + } + + /** + * @param user + * @return + */ + private boolean computeWorkflowManagementAccess(User user, Set managerRoles) + { + if (managerRoles == null || managerRoles.isEmpty()) + { + return false; + } + + //now check to see if the currently logged in user has workflow management access + try + { + boolean hasAccess = false; + + Set userRoles = this.authorizationManager.getProvider(). + getMembershipModule().getRoles(user); + + if (userRoles != null) + { + for (Iterator itr = userRoles.iterator(); itr.hasNext();) { - - toolAccess = true; - break; + Role userRole = (Role)itr.next(); + String userRoleName = userRole.getName(); + if (managerRoles.contains(userRoleName)) + { + hasAccess = true; + break; + } } - } - - return toolAccess; - } + } - /** - * - * @param user - * @return - */ - private boolean computeWorkflowManagementAccess(User user,Set managerRoles) - { - if(managerRoles == null || managerRoles.isEmpty()) - { - return false; - } - - //now check to see if the currently logged in user has workflow management access - try - { - boolean hasAccess = false; - - Set userRoles = this.authorizationManager.getProvider(). - getMembershipModule().getRoles(user); - - if(userRoles != null) - { - for(Iterator itr=userRoles.iterator();itr.hasNext();) - { - Role userRole = (Role)itr.next(); - String userRoleName = userRole.getName(); - if(managerRoles.contains(userRoleName)) - { - hasAccess = true; - break; - } - } - } - - return hasAccess; - } - catch(Exception e) - { - throw new RuntimeException(e); - } - } - //---------------------------------------------------------------------------------------------------------------------------------------------- - /** - * - * @param user - * @return - */ - private Collection getPermissions(User user) - { - Collection permissions = null; - - if(user!=null) - { - //this is not an anonymous access - String userId = user.getUserName(); - String uri = this.authorizationManager.getProvider().getUserURI(userId); - permissions = this.authorizationManager.getProvider().getSecurityBindings(uri); - } - else - { - //this is an anonymous access - String uri = this.authorizationManager.getProvider().getRoleURI(AuthorizationManager.Anonymous); - permissions = this.authorizationManager.getProvider().getSecurityBindings(uri); - } - return permissions; - } - - /** - * - * @param user - * @return - */ - private Collection getPermissions(String path) - { - Criteria criteria = new Criteria("path",path); - - String uri = this.authorizationManager.getProvider(). - getCriteriaURI(criteria.getName(), criteria.getValue()); - - return this.authorizationManager.getProvider().getSecurityBindings(uri); - } - - /** - * - * @param allPermissions - * @return - */ - private Collection getWriteOrMore(Collection allPermissions) - { - Collection writeOrMore = new HashSet(); - - if(allPermissions!=null) - { - for(Iterator itr=allPermissions.iterator();itr.hasNext();) - { - Permission cour = (Permission)itr.next(); - if( (cour.getService().equals("cms")) && - ( cour.getAction().equals("write") || cour.getAction().equals("manage") ) + return hasAccess; + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } + + //---------------------------------------------------------------------------------------------------------------------------------------------- + /** + * @param user + * @return + */ + private Collection getPermissions(User user) + { + Collection permissions = null; + + if (user != null) + { + //this is not an anonymous access + String userId = user.getUserName(); + String uri = this.authorizationManager.getProvider().getUserURI(userId); + permissions = this.authorizationManager.getProvider().getSecurityBindings(uri); + } + else + { + //this is an anonymous access + String uri = this.authorizationManager.getProvider().getRoleURI(AuthorizationManager.Anonymous); + permissions = this.authorizationManager.getProvider().getSecurityBindings(uri); + } + return permissions; + } + + /** + * @param user + * @return + */ + private Collection getPermissions(String path) + { + Criteria criteria = new Criteria("path", path); + + String uri = this.authorizationManager.getProvider(). + getCriteriaURI(criteria.getName(), criteria.getValue()); + + return this.authorizationManager.getProvider().getSecurityBindings(uri); + } + + /** + * @param allPermissions + * @return + */ + private Collection getWriteOrMore(Collection allPermissions) + { + Collection writeOrMore = new HashSet(); + + if (allPermissions != null) + { + for (Iterator itr = allPermissions.iterator(); itr.hasNext();) + { + Permission cour = (Permission)itr.next(); + if ((cour.getService().equals("cms")) && + (cour.getAction().equals("write") || cour.getAction().equals("manage")) ) - { - writeOrMore.addAll(cour.getCriteria()); - } - } - } - - return writeOrMore; - } - - /** - * @param path - * @param pattern - * @return - */ - private boolean doesPathMatchPattern(String path,String pattern) - { - boolean match = true; - - //format the path first before starting to match it with the specified pattern - if(!path.startsWith("/")) - { - path = "/" + path; - } - if(!path.endsWith("/")) - { - path = path + "/"; - } - - StringTokenizer patternTokenizer = new StringTokenizer(pattern,"/"); - StringTokenizer pathTokenizer = new StringTokenizer(path,"/"); - StringBuffer pathMatched = new StringBuffer("/"); - StringBuffer patternMatched = new StringBuffer(); - if(pattern.startsWith("/")) - { - patternMatched.append("/"); - } - while( - patternTokenizer.hasMoreTokens() && - pathTokenizer.hasMoreTokens() - ) - { - String patternToken = patternTokenizer.nextToken(); - String pathToken = pathTokenizer.nextToken(); - - //setup token tracking - pathMatched.append(pathToken+"/"); - if(patternTokenizer.hasMoreTokens()) { - patternMatched.append(patternToken+"/"); + writeOrMore.addAll(cour.getCriteria()); } - else + } + } + + return writeOrMore; + } + + /** + * @param path + * @param pattern + * @return + */ + private boolean doesPathMatchPattern(String path, String pattern) + { + boolean match = true; + + //format the path first before starting to match it with the specified pattern + if (!path.startsWith("/")) + { + path = "/" + path; + } + if (!path.endsWith("/")) + { + path = path + "/"; + } + + StringTokenizer patternTokenizer = new StringTokenizer(pattern, "/"); + StringTokenizer pathTokenizer = new StringTokenizer(path, "/"); + StringBuffer pathMatched = new StringBuffer("/"); + StringBuffer patternMatched = new StringBuffer(); + if (pattern.startsWith("/")) + { + patternMatched.append("/"); + } + while ( + patternTokenizer.hasMoreTokens() && + pathTokenizer.hasMoreTokens() + ) + { + String patternToken = patternTokenizer.nextToken(); + String pathToken = pathTokenizer.nextToken(); + + //setup token tracking + pathMatched.append(pathToken + "/"); + if (patternTokenizer.hasMoreTokens()) + { + patternMatched.append(patternToken + "/"); + } + else + { + patternMatched.append(patternToken); + } + + //perform token matching + if (!match) + { + continue; + } + int wildCardIndex = patternToken.indexOf('*'); + //if wildCard is not relevant + if (wildCardIndex <= 0) + { + //if wildCardIndex == 0 then this token matches... + if (wildCardIndex != 0 && !pathToken.equals(patternToken)) { - patternMatched.append(patternToken); + match = false; } - - //perform token matching - if(!match){continue;} - int wildCardIndex = patternToken.indexOf('*'); - //if wildCard is not relevant - if(wildCardIndex<=0) + } + else + { + String wildPath = pathToken.substring(0, wildCardIndex); + String wildPattern = patternToken.substring(0, wildCardIndex); + if (!wildPath.equals(wildPattern)) { - //if wildCardIndex == 0 then this token matches... - if(wildCardIndex!=0 && !pathToken.equals(patternToken)) - { - match = false; - } + match = false; } - else - { - String wildPath = pathToken.substring(0,wildCardIndex); - String wildPattern = patternToken.substring(0,wildCardIndex); - if(!wildPath.equals(wildPattern)) - { - match = false; - } - } - } - - return match; - } - - /** - * - * @param action - * @param impliedTarget - * @return - */ - private boolean isActionImplied(String action,String impliedTarget) - { - boolean implied = false; - - if(impliedTarget.equalsIgnoreCase("read")) - { - if(action.equalsIgnoreCase("read") || action.equalsIgnoreCase("write") || action.equalsIgnoreCase("manage")) - { - implied = true; - } - } - else if(impliedTarget.equalsIgnoreCase("write")) - { - if(action.equalsIgnoreCase("write") || action.equalsIgnoreCase("manage")) - { - implied = true; - } - } - else if(impliedTarget.equalsIgnoreCase("manage")) - { - if(action.equalsIgnoreCase("manage")) - { - implied = true; - } - } - - return implied; - } + } + } + + return match; + } + + /** + * @param action + * @param impliedTarget + * @return + */ + private boolean isActionImplied(String action, String impliedTarget) + { + boolean implied = false; + + if (impliedTarget.equalsIgnoreCase("read")) + { + if (action.equalsIgnoreCase("read") || action.equalsIgnoreCase("write") || action.equalsIgnoreCase("manage")) + { + implied = true; + } + } + else if (impliedTarget.equalsIgnoreCase("write")) + { + if (action.equalsIgnoreCase("write") || action.equalsIgnoreCase("manage")) + { + implied = true; + } + } + else if (impliedTarget.equalsIgnoreCase("manage")) + { + if (action.equalsIgnoreCase("manage")) + { + implied = true; + } + } + + return implied; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -62,8 +62,8 @@ contentNode.setProperty("portalcms:description", new StringValue(mFile.getContent().getDescription())); contentNode.setProperty("portalcms:title", new StringValue(mFile.getContent().getTitle())); contentNode.setProperty("portalcms:language", new StringValue(mFile.getContent().getLocale().getLanguage())); - + if (mFile.getContent().getMimeType() != null) { contentNode.setProperty("jcr:mimeType", mFile.getContent().getMimeType()); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -27,7 +27,6 @@ import org.jboss.portal.cms.impl.jcr.util.VersionUtil; import org.jboss.portal.cms.model.Content; import org.jboss.portal.common.invocation.Scope; - import org.jboss.portal.identity.User; import javax.jcr.Node; @@ -36,7 +35,7 @@ /** * Creates a new version of the content and labels it "LIVE". - * + * * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author Sohil Shah - sohil.shah(a)jboss.com @@ -53,8 +52,7 @@ /** * @param content - * @param bMakeLive - * Whether this updated version should be made "LIVE" + * @param bMakeLive Whether this updated version should be made "LIVE" */ public ContentCreateNewVersionCommand(Content content, boolean bMakeLive) { @@ -69,7 +67,7 @@ } /** - * + * */ public Object execute() { @@ -80,27 +78,27 @@ // create versions for (int i = 0; i < mContents.size(); i++) { - Content content = (Content) mContents.get(i); - Node contentNode = (Node) context.getSession().getItem( - content.getBasePath()); + Content content = (Content)mContents.get(i); + Node contentNode = (Node)context.getSession().getItem( + content.getBasePath()); // if the creator of this content is known, record it - User user = (User) this.context.getAttribute(scope, "user"); + User user = (User)this.context.getAttribute(scope, "user"); if (user != null) { contentNode.setProperty("portalcms:user", user.getUserName()); } contentNode.setProperty("portalcms:size", new StringValue(String - .valueOf(content.getBytes().length))); + .valueOf(content.getBytes().length))); context.getSession().save(); - String processId = (String) context - .getAttribute(scope, "processid"); + String processId = (String)context + .getAttribute(scope, "processid"); // integration of publish/approval workflow if (this.bMakeLive && processId != null - && processId.trim().length() != 0) + && processId.trim().length() != 0) { // now save workflow related meta data on this version // so that this version can be processed later in the execution @@ -116,7 +114,7 @@ else { // remove any processid if they are present on the node - contentNode.setProperty("portalcms:processid", (String) null); + contentNode.setProperty("portalcms:processid", (String)null); contentNode.save(); // not asking to publish the content...no workflow needed Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.jcr.command; +import org.jboss.logging.Logger; import org.jboss.portal.cms.impl.ContentImpl; import org.jboss.portal.cms.impl.jcr.JCRCommand; +import org.jboss.portal.cms.impl.jcr.util.VersionUtil; import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.util.FileUtil; -import org.jboss.logging.Logger; -import org.jboss.portal.cms.impl.jcr.util.VersionUtil; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -108,12 +108,12 @@ contentNode = (Node)session.getItem(content.getBasePath()); VersionHistory vh = contentNode.getVersionHistory(); Version version = VersionUtil.getLiveVersion(vh); - - if(version == null) + + if (version == null) { return null; } - + NodeIterator ni = version.getNodes(); contentNode = ni.nextNode(); content.setCreationDate(version.getCreated().getTime()); @@ -139,7 +139,7 @@ content.setVersionNumber(version.getName()); content.setVersionPath(version.getPath()); content.setVersionUUID(version.getUUID()); - if(liveVersion != null && liveVersion.getName().equals(version.getName())) // check if this version is the live one. + if (liveVersion != null && liveVersion.getName().equals(version.getName())) // check if this version is the live one. { content.setLive(true); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,16 +24,16 @@ import org.jboss.portal.cms.impl.ContentImpl; import org.jboss.portal.cms.impl.jcr.JCRCommand; +import org.jboss.portal.cms.impl.jcr.util.VersionUtil; import org.jboss.portal.cms.model.Content; -import org.jboss.portal.cms.impl.jcr.util.VersionUtil; import javax.jcr.Node; import javax.jcr.NodeIterator; +import javax.jcr.PathNotFoundException; import javax.jcr.Session; import javax.jcr.version.Version; import javax.jcr.version.VersionHistory; import javax.jcr.version.VersionIterator; -import javax.jcr.PathNotFoundException; import java.util.Locale; import java.util.Vector; @@ -65,10 +65,10 @@ Node fileNode = (Node)session.getItem(this.msFilePath); VersionHistory vh = fileNode.getVersionHistory(); - + Version liveVersion = VersionUtil.getLiveVersion(vh); - - + + Version rootVersion = vh.getRootVersion(); @@ -96,9 +96,9 @@ content.setBytes("".getBytes()); int size = 0; - if(node.hasProperty("portalcms:size")) + if (node.hasProperty("portalcms:size")) { - size = Integer.parseInt(node.getProperty("portalcms:size").getString()); + size = Integer.parseInt(node.getProperty("portalcms:size").getString()); } content.setSize(size); @@ -115,26 +115,26 @@ content.setEncoding(node.getProperty("jcr:encoding").getString()); - + //check if this content is waiting to be approved for publishing or not try { - String processid = node.getProperty("portalcms:processid").getString(); - if(processid != null && processid.trim().length()>0) - { - content.setWaitingForPublishApproval(true); - content.setApprovalProcessId(processid); - } - else - { - content.setWaitingForPublishApproval(false); - content.setApprovalProcessId(null); - } + String processid = node.getProperty("portalcms:processid").getString(); + if (processid != null && processid.trim().length() > 0) + { + content.setWaitingForPublishApproval(true); + content.setApprovalProcessId(processid); + } + else + { + content.setWaitingForPublishApproval(false); + content.setApprovalProcessId(null); + } } - catch(PathNotFoundException pne) + catch (PathNotFoundException pne) { - content.setWaitingForPublishApproval(false); - content.setApprovalProcessId(null); + content.setWaitingForPublishApproval(false); + content.setApprovalProcessId(null); } contents.addElement(content); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -126,7 +126,7 @@ } return null; } - + public String toString() { return "FileGetCommand[path=" + path + ", versionNumber=" + versionNumber + ", locale=" + locale + "]"; Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MakeLiveVersionCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MakeLiveVersionCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MakeLiveVersionCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,7 +23,6 @@ package org.jboss.portal.cms.impl.jcr.command; import org.apache.log4j.Logger; - import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.impl.jcr.JCRCommand; @@ -40,10 +39,10 @@ public class MakeLiveVersionCommand extends JCRCommand { /** - * + * */ private static Logger log = Logger.getLogger(MakeLiveVersionCommand.class); - + /** The serialVersionUID */ private static final long serialVersionUID = 6853173755818339647L; String msFilePath = null; @@ -51,7 +50,6 @@ String version = null; /** - * * @param sFilePath * @param language * @param version @@ -64,7 +62,7 @@ } /** - * + * */ public Object execute() { @@ -72,17 +70,17 @@ try { Session session = context.getSession(); - Node fileNode = (Node)session.getItem(this.msFilePath+"/"+this.language); + Node fileNode = (Node)session.getItem(this.msFilePath + "/" + this.language); - VersionHistory vh = fileNode.getVersionHistory(); + VersionHistory vh = fileNode.getVersionHistory(); vh.addVersionLabel(this.version, "LIVE", true); - versionMadeLive = this.version; + versionMadeLive = this.version; } catch (Exception e) { - log.error(this,e); + log.error(this, e); throw new CMSException(e); - } + } return versionMadeLive; } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MakeLiveVersionCommand.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/SearchCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/SearchCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/SearchCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,8 +22,11 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.jcr.command; -import java.util.ArrayList; -import java.util.List; +import org.jboss.portal.cms.CMSException; +import org.jboss.portal.cms.impl.FileImpl; +import org.jboss.portal.cms.impl.jcr.JCRCommand; +import org.jboss.portal.cms.model.File; +import org.jboss.portal.search.impl.jcr.JCRQuery; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -31,17 +34,9 @@ import javax.jcr.Workspace; import javax.jcr.query.QueryManager; import javax.jcr.query.QueryResult; +import java.util.ArrayList; +import java.util.List; -import org.jboss.portal.cms.CMSException; -import org.jboss.portal.cms.impl.FileImpl; -import org.jboss.portal.cms.impl.jcr.JCRCommand; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.search.Query; -import org.jboss.portal.search.QueryConverter; -import org.jboss.portal.search.impl.StandardQueryConverter; -import org.jboss.portal.search.impl.jcr.JCRQuery; -import org.jboss.portal.search.impl.jcr.JCRQueryConverter; - /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -52,13 +47,13 @@ private static final long serialVersionUID = 2614067614144410297L; private JCRQuery query; - + public SearchCommand(JCRQuery query) { this.query = query; } - - + + public Object execute() throws CMSException { Session session = context.getSession(); @@ -69,7 +64,7 @@ try { queryManager = workspace.getQueryManager(); - + queryString = query.getJcrQuery(); if (!"".equals(queryString) && query != null) Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/SearchCommand.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.cms.impl.jcr.command; +import org.apache.tools.zip.ZipEntry; +import org.apache.tools.zip.ZipFile; import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.impl.ContentImpl; import org.jboss.portal.cms.impl.FileImpl; @@ -32,18 +34,14 @@ import org.jboss.portal.cms.util.FileUtil; import org.jboss.portal.cms.util.NodeUtil; -import java.io.InputStream; -import java.io.FileOutputStream; import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import java.util.ArrayList; import java.util.Date; +import java.util.Enumeration; import java.util.List; import java.util.Locale; -import java.util.Enumeration; - -import org.apache.tools.zip.ZipFile; -import org.apache.tools.zip.ZipEntry; - import java.util.StringTokenizer; /** @@ -61,7 +59,6 @@ String msLanguage; /** - * * @param sRootPath * @param is * @param sLanguage @@ -74,7 +71,7 @@ } /** - * + * */ public Object execute() { @@ -87,12 +84,12 @@ ZipFile zipFile = new ZipFile(tmpFile); ZipEntry zipEntry; Enumeration entries = zipFile.getEntries(); - while(entries.hasMoreElements()) + while (entries.hasMoreElements()) { zipEntry = (ZipEntry)entries.nextElement(); String itemName = zipEntry.getName(); if (!zipEntry.isDirectory()) - { + { long fileSize = zipEntry.getSize(); byte[] zipBytes = new byte[(int)fileSize]; InputStream zipDataStream = zipFile.getInputStream(zipEntry); @@ -102,7 +99,7 @@ { bytesRead += zipDataStream.read(zipBytes, (int)bytesRead, (int)(fileSize - bytesRead)); } - + org.jboss.portal.cms.model.File file = new FileImpl(); String sBasePath = FileUtil.cleanDoubleSlashes("/" + this.msRootPath + "/" + itemName); @@ -179,44 +176,40 @@ } finally { - if(tmpFile != null) + if (tmpFile != null) { tmpFile.delete(); } } return null; } - - /** - * - * @param parentPath - */ + + /** @param parentPath */ private void createParentHierarchy(String parentPath) throws CMSException { - StringTokenizer tokenizer = new StringTokenizer(parentPath,"/"); - + StringTokenizer tokenizer = new StringTokenizer(parentPath, "/"); + StringBuffer buffer = new StringBuffer("/"); - while(tokenizer.hasMoreTokens()) + while (tokenizer.hasMoreTokens()) { buffer.append(tokenizer.nextToken()); String cour = buffer.toString(); - + JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(cour); Boolean bExists = (Boolean)context.execute(nodeExists); - if(!bExists.booleanValue()) + if (!bExists.booleanValue()) { this.createFolder(cour); } - - if(tokenizer.hasMoreTokens()) + + if (tokenizer.hasMoreTokens()) { buffer.append("/"); } } } - + /** - * * @param folderPath * @throws CMSException */ @@ -232,17 +225,14 @@ JCRCommand parentSave = (JCRCommand)context.getCommandFactory().createFolderSaveCommand(folder); context.execute(parentSave); } - - /** - * - * @return - */ + + /** @return */ private File getZipFile() throws Exception { File zipFile = null; - + zipFile = File.createTempFile("jbportal_", "_cmsimport.zip"); - FileOutputStream fos = new FileOutputStream(zipFile.getCanonicalPath()); + FileOutputStream fos = new FileOutputStream(zipFile.getCanonicalPath()); try { int count; @@ -257,7 +247,7 @@ { fos.close(); } - + return zipFile; } } \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -30,44 +30,39 @@ import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; -/** @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @author <a href="mailto:sohil.shah@jboss.com">Sohil Shah</a> - Nov 28, 2006 - **/ +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @author <a href="mailto:sohil.shah@jboss.com">Sohil Shah</a> - Nov 28, 2006 + */ public class NewFileCommand extends JCRCompositeCommand { /** The serialVersionUID */ private static final long serialVersionUID = -6134173065175936408L; - + // private String path = null; private Content content = null; - - /** - * - * @return - */ + + /** @return */ public String getPath() { - return this.path; + return this.path; } - - /** - * - * @return - */ + + /** @return */ public Content getContent() { - return this.content; + return this.content; } public NewFileCommand(File file, Content content) { // setAttribute("file", file); // setAttribute("content", content); - this.path = file.getBasePath(); - this.content = content; - + this.path = file.getBasePath(); + this.content = content; + Command saveFileCMD = new FileCreateCommand(file); commands.add(saveFileCMD); Command saveContentCMD = new ContentCreateCommand(file); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -48,14 +48,11 @@ { return path; } - - /** - * - * @return - */ + + /** @return */ public Content getContent() { - return this.content; + return this.content; } public Locale getLocale() Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,20 +24,19 @@ import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.CMSUser; import org.jboss.portal.cms.impl.jcr.JCRCMS; import org.jboss.portal.cms.impl.jcr.JCRCommand; import org.jboss.portal.cms.impl.jcr.JCRCommandContext; +import org.jboss.portal.cms.model.CMSUser; +import org.jboss.portal.identity.User; import org.jboss.portal.jems.ha.HASingletonInvoker; -import org.jboss.portal.identity.User; - /** * Extend the JCR CMS and make it run as an ha singleton. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ + * @version $Revision: 7163 $ */ public class HAJCRCMS extends JCRCMS implements HASingletonInvoker.Callback { @@ -58,31 +57,31 @@ try { //Add the user Identity ThreadLocal variable to the Command Context for propagation to the Master Node - if(this.getUserInfo().get() != null) + if (this.getUserInfo().get() != null) { User user = (User)this.getUserInfo().get(); JCRCommandContext context = (JCRCommandContext)((JCRCommand)cmd).getContext(); - if(context == null) + if (context == null) { - context = new JCRCommandContext(null,null,null); + context = new JCRCommandContext(null, null, null); ((JCRCommand)cmd).setContext(context); } - context.setClusterContextInfo("user",new CMSUser(user.getUserName())); + context.setClusterContextInfo("user", new CMSUser(user.getUserName())); } - + //Add the Workflow ThreadLocal variable to the Command Context for propagation to the Master Node - if(this.turnOffWorkflow.get() != null) + if (this.turnOffWorkflow.get() != null) { Boolean workflowStatus = (Boolean)this.turnOffWorkflow.get(); JCRCommandContext context = (JCRCommandContext)((JCRCommand)cmd).getContext(); - if(context == null) + if (context == null) { - context = new JCRCommandContext(null,null,null); + context = new JCRCommandContext(null, null, null); ((JCRCommand)cmd).setContext(context); } - context.setClusterContextInfo("workflowStatus",workflowStatus); + context.setClusterContextInfo("workflowStatus", workflowStatus); } - + // Use the proxy to invoke on the singleton return invoker.invoke("execute", new Class[]{Command.class}, new Object[]{cmd}); } @@ -90,7 +89,7 @@ { e.printStackTrace(); throw new RuntimeException("Fixme bad contract", e); - } + } } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/ClusteredCacheListener.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -33,10 +33,9 @@ import org.apache.jackrabbit.core.nodetype.PropDef; import org.apache.jackrabbit.core.nodetype.PropDefImpl; import org.apache.jackrabbit.name.QName; - +import org.jboss.logging.Logger; import org.jboss.portal.cms.impl.jcr.JCRService; import org.jboss.portal.cms.util.RepositoryUtil; -import org.jboss.logging.Logger; import org.xml.sax.InputSource; import javax.jcr.NamespaceRegistry; @@ -50,7 +49,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 6469 $ */ public class JackrabbitJCRService implements JCRService { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -216,25 +216,24 @@ e.printStackTrace(); } } - + /** - * * @param history * @return */ public static Version getLiveVersion(VersionHistory history) { Version liveVersion = null; - + try { liveVersion = history.getVersionByLabel("LIVE"); } - catch(Exception e) + catch (Exception e) { liveVersion = null; } - + return liveVersion; } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMS.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMS.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMS.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,8 @@ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ */ -public interface CMS { +public interface CMS +{ - public int getNbFiles(); + public int getNbFiles(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMS.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,56 +22,57 @@ ******************************************************************************/ package org.jboss.portal.cms.management; -import java.util.List; - import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.Command; import org.jboss.portal.cms.model.Folder; import org.jboss.portal.jems.as.system.AbstractJBossService; +import java.util.List; + /** - * Unused. With the introduction of CMS security, this can - * no longer count CMS files. - * + * Unused. With the introduction of CMS security, this can no longer count CMS files. + * * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ */ -public class CMSImpl extends AbstractJBossService implements CMS { +public class CMSImpl extends AbstractJBossService implements CMS +{ - private org.jboss.portal.cms.CMS cms; - - public void setCMS(org.jboss.portal.cms.CMS cms) - { - this.cms = cms; - } - - /** Very costly - * TODO: Make it cheap - */ - public int getNbFiles() - { - String sPath ="/"; - try { - return nbFiles(sPath); - } catch (CMSException e) { - e.printStackTrace(); - } - return -1; - } - - private int nbFiles(String path) throws CMSException - { - Command listCMD = cms.getCommandFactory().createFolderGetListCommand(path); - Folder mainFolder = (Folder)cms.execute(listCMD); - List files = mainFolder.getFiles(); - int nbFiles = files.size(); - List folders = mainFolder.getFolders(); - for (int i=0; i<folders.size(); i++) - { - Folder folder = (Folder)folders.get(i); - nbFiles += nbFiles(folder.getBasePath()); - } - return nbFiles; - } - + private org.jboss.portal.cms.CMS cms; + + public void setCMS(org.jboss.portal.cms.CMS cms) + { + this.cms = cms; + } + + /** Very costly TODO: Make it cheap */ + public int getNbFiles() + { + String sPath = "/"; + try + { + return nbFiles(sPath); + } + catch (CMSException e) + { + e.printStackTrace(); + } + return -1; + } + + private int nbFiles(String path) throws CMSException + { + Command listCMD = cms.getCommandFactory().createFolderGetListCommand(path); + Folder mainFolder = (Folder)cms.execute(listCMD); + List files = mainFolder.getFiles(); + int nbFiles = files.size(); + List folders = mainFolder.getFolders(); + for (int i = 0; i < folders.size(); i++) + { + Folder folder = (Folder)folders.get(i); + nbFiles += nbFiles(folder.getBasePath()); + } + return nbFiles; + } + } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/management/CMSImpl.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSObject.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSUser.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSUser.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSUser.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,47 +22,42 @@ ******************************************************************************/ package org.jboss.portal.cms.model; -import java.io.Serializable; import org.jboss.portal.identity.User; -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ +import java.io.Serializable; + +/** @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> */ public class CMSUser implements User, Serializable { /** - * + * */ private String username = null; - - /** - * - * @param username - */ + + /** @param username */ public CMSUser(String username) { this.username = username; } - + /** - * + * */ public Object getId() - { + { return null; } /** - * + * */ public String getUserName() - { + { return this.username; } /** - * + * */ public void updatePassword(String password) { @@ -70,10 +65,10 @@ } /** - * + * */ public boolean validatePassword(String password) - { + { throw new RuntimeException("Illegal Operation"); } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/CMSUser.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -29,7 +29,7 @@ * CMS content interface. * * @author <a href="mailto:roy@jboss.org">Roy Russo</a> - * @version $Id$ + * @version $Id: Content.java 5929 2006-12-22 20:15:42Z sohil.shah(a)jboss.com $ */ public interface Content extends CMSObject, Cloneable { @@ -41,7 +41,7 @@ int getSize(); void setSize(int size); - + /** @return Returns the content. */ InputStream getStream(); @@ -73,30 +73,26 @@ boolean isLive(); void setLive(boolean live); - + /** - * this is used to signify that a content is waiting to be approved before being published to go - * live - * + * this is used to signify that a content is waiting to be approved before being published to go live + * * @return */ public boolean isWaitingForPublishApproval(); - + /** - * * + * */ public void setWaitingForPublishApproval(boolean isWaitingForPublishApproval); - - /** - * - * @return - */ + + /** @return */ public String getApprovalProcessId(); - + /** - * * + * */ public void setApprovalProcessId(String processId); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Content.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/File.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/File.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/File.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -29,7 +29,7 @@ * * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a> * @author <a href="mailto:roy@jboss.org">Roy Russo</a> - * @version $Id$ + * @version $Id: File.java 5448 2006-10-13 19:29:17Z chris.laprun(a)jboss.com $ */ public interface File extends CMSObject, Cloneable { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/File.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/model/Folder.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.cms.search; -import java.util.Iterator; -import java.util.List; - import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.Command; import org.jboss.portal.cms.model.File; @@ -36,6 +33,9 @@ import org.jboss.portal.search.impl.jcr.JCRQueryConverter; import org.jboss.portal.search.result.ResultSet; +import java.util.Iterator; +import java.util.List; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -78,5 +78,5 @@ { return queryConverter; } - + } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResult.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResult.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResult.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -33,10 +33,10 @@ */ public class CMSResult implements Result { - + private File file; private ResultURL url; - + public CMSResult(File file, String prefix) { this.file = file; @@ -53,7 +53,7 @@ { return url; } - + public LocalizedString getTitle() { if (file.getTitle() != null) Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResult.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResultURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResultURL.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResultURL.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -31,10 +31,10 @@ */ public class CMSResultURL extends SimpleResultURL { - + public CMSResultURL(String prefix, File file) { super("/" + prefix + file.getBasePath()); } - + } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/search/CMSResultURL.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManager.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManager.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManager.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -27,18 +27,15 @@ /** * Created on : Jan 24, 2007 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ public interface AuthorizationManager extends -PortalAuthorizationManagerFactory, -PortalAuthorizationManager + PortalAuthorizationManagerFactory, + PortalAuthorizationManager { - public static final String Anonymous = "Anonymous"; - - /** - * - * @return - */ - public AuthorizationProvider getProvider(); + public static final String Anonymous = "Anonymous"; + + /** @return */ + public AuthorizationProvider getProvider(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManager.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,116 +22,103 @@ ******************************************************************************/ package org.jboss.portal.cms.security; -import javax.security.auth.Subject; - -import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.cms.impl.jcr.command.ACLEnforcer; import org.jboss.portal.jems.as.JNDI; - +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.security.PortalPermission; import org.jboss.portal.security.PortalSecurityException; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; -import org.jboss.portal.cms.impl.jcr.command.ACLEnforcer; +import javax.security.auth.Subject; /** * Created on : Jan 23, 2007 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ public class AuthorizationManagerImpl extends AbstractJBossService implements AuthorizationManager { - /** - * - */ - private ACLEnforcer enforcer = null; - - /** - * - */ - private AuthorizationProvider provider = null; - - /** - * - */ - private String jndiName = null; - private JNDI.Binding jndiBinding = null; - - /** - * - * @return - */ - public AuthorizationProvider getProvider() - { - return provider; - } + /** + * + */ + private ACLEnforcer enforcer = null; - /** - * - * @param provider - */ - public void setProvider(AuthorizationProvider provider) - { - this.provider = provider; - } - - /** - * - * @return - */ - public String getJNDIName() - { - return this.jndiName; - } - - /** - * - * @param jndiName - */ - public void setJNDIName(String jndiName) - { - this.jndiName = jndiName; - } + /** + * + */ + private AuthorizationProvider provider = null; - /** - * - */ - public void startService() throws Exception - { - super.startService(); - - //perform jndi registration for this service - if (this.jndiName != null) - { - jndiBinding = new JNDI.Binding(jndiName, this); - jndiBinding.bind(); - } - - //initialize the authorization/policy enforcer - enforcer = new ACLEnforcer(this); - } - - //---PortalAuthorizationManagerFactory implementation----------------------------------------------- - /** - * - */ - public PortalAuthorizationManager getManager() throws PortalSecurityException - { - return this; - } - //---PortalAuthorizationManager implementation------------------------------------------------------- - /** - * - */ - public boolean checkPermission(PortalPermission permission) throws PortalSecurityException - { - return this.enforcer.hasAccess(((CMSPermission)permission).getSecurityContext()); - } + /** + * + */ + private String jndiName = null; + private JNDI.Binding jndiBinding = null; - /** - * - */ - public boolean checkPermission(Subject checkedSubject, PortalPermission permission) throws PortalSecurityException - { - return this.checkPermission(permission); - } + /** @return */ + public AuthorizationProvider getProvider() + { + return provider; + } + + /** @param provider */ + public void setProvider(AuthorizationProvider provider) + { + this.provider = provider; + } + + /** @return */ + public String getJNDIName() + { + return this.jndiName; + } + + /** @param jndiName */ + public void setJNDIName(String jndiName) + { + this.jndiName = jndiName; + } + + /** + * + */ + public void startService() throws Exception + { + super.startService(); + + //perform jndi registration for this service + if (this.jndiName != null) + { + jndiBinding = new JNDI.Binding(jndiName, this); + jndiBinding.bind(); + } + + //initialize the authorization/policy enforcer + enforcer = new ACLEnforcer(this); + } + + //---PortalAuthorizationManagerFactory implementation----------------------------------------------- + /** + * + */ + public PortalAuthorizationManager getManager() throws PortalSecurityException + { + return this; + } + + //---PortalAuthorizationManager implementation------------------------------------------------------- + /** + * + */ + public boolean checkPermission(PortalPermission permission) throws PortalSecurityException + { + return this.enforcer.hasAccess(((CMSPermission)permission).getSecurityContext()); + } + + /** + * + */ + public boolean checkPermission(Subject checkedSubject, PortalPermission permission) throws PortalSecurityException + { + return this.checkPermission(permission); + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationManagerImpl.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProvider.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProvider.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,45 +22,38 @@ ******************************************************************************/ package org.jboss.portal.cms.security; +import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.security.spi.provider.AuthorizationDomain; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.identity.MembershipModule; - /** * Created on : Jan 24, 2007 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ public interface AuthorizationProvider extends -AuthorizationDomain, -DomainConfigurator + AuthorizationDomain, + DomainConfigurator { - /** - * - * @param userId - * @return - */ - public String getUserURI(String userId); - - /** - * - * @param roleId - * @return - */ - public String getRoleURI(String roleId); - - /** - * - * @param name - * @param value - * @return - */ - public String getCriteriaURI(String name,String value); - - /** - * - * @return - */ - public MembershipModule getMembershipModule(); + /** + * @param userId + * @return + */ + public String getUserURI(String userId); + + /** + * @param roleId + * @return + */ + public String getRoleURI(String roleId); + + /** + * @param name + * @param value + * @return + */ + public String getCriteriaURI(String name, String value); + + /** @return */ + public MembershipModule getMembershipModule(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProvider.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,38 +22,36 @@ ******************************************************************************/ package org.jboss.portal.cms.security; -import java.util.Collection; -import java.util.Set; -import java.util.Iterator; -import java.util.HashSet; - import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; import org.jboss.portal.cms.hibernate.state.Tools; +import org.jboss.portal.identity.AnonymousRole; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.identity.MembershipModule; -import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.Role; import org.jboss.portal.identity.User; -import org.jboss.portal.identity.AnonymousRole; +import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.db.HibernateUserModuleImpl; import org.jboss.portal.jems.as.system.AbstractJBossService; - import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.security.spi.provider.PermissionFactory; import org.jboss.portal.security.spi.provider.PermissionRepository; import org.jboss.portal.security.spi.provider.SecurityConfigurationException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + /** * Created on : Jan 23, 2007 - * + * * @author Sohil Shah - sohil.shah(a)jboss.com - * */ public class AuthorizationProviderImpl extends AbstractJBossService implements - AuthorizationProvider + AuthorizationProvider { private IdentityServiceController identityServiceController = null; @@ -62,22 +60,22 @@ private UserModule userModule = null; /** - * + * */ public void startService() throws Exception { super.startService(); - this.membershipModule = (MembershipModule) identityServiceController - .getIdentityContext().getObject( - IdentityContext.TYPE_MEMBERSHIP_MODULE); - this.userModule = (UserModule) identityServiceController - .getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); + this.membershipModule = (MembershipModule)identityServiceController + .getIdentityContext().getObject( + IdentityContext.TYPE_MEMBERSHIP_MODULE); + this.userModule = (UserModule)identityServiceController + .getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); } // ------AuthorizationDomain // impl----------------------------------------------------------------- /** - * + * */ public DomainConfigurator getConfigurator() { @@ -85,7 +83,7 @@ } /** - * + * */ public PermissionFactory getPermissionFactory() { @@ -93,7 +91,7 @@ } /** - * + * */ public PermissionRepository getPermissionRepository() { @@ -101,7 +99,7 @@ } /** - * + * */ public String getType() { @@ -111,21 +109,21 @@ // ------DomainConfigurator // impl------------------------------------------------------------------ /** - * + * */ public void setSecurityBindings(String uri, Set securityBindings) - throws SecurityConfigurationException + throws SecurityConfigurationException { if (securityBindings != null) { for (Iterator itr = securityBindings.iterator(); itr.hasNext();) { - Permission securityBinding = (Permission) itr.next(); + Permission securityBinding = (Permission)itr.next(); if (securityBinding.getRoles() != null - || securityBinding.getUsers() != null) + || securityBinding.getUsers() != null) { this.store(securityBinding, securityBinding.getRoles(), - securityBinding.getUsers()); + securityBinding.getUsers()); } else { @@ -136,17 +134,17 @@ } /** - * + * */ public void removeSecurityBindings(String uri) - throws SecurityConfigurationException + throws SecurityConfigurationException { Set permissions = this.getSecurityBindings(uri); this.remove(permissions); } /** - * + * */ public Set getSecurityBindings(String uri) { @@ -190,7 +188,7 @@ // ---------URIFactory // impl----------------------------------------------------------------------------------------- /** - * + * */ public String getUserURI(String userId) { @@ -198,7 +196,6 @@ } /** - * * @param roleId * @return */ @@ -208,7 +205,6 @@ } /** - * * @param name * @param value * @return @@ -219,7 +215,7 @@ } /** - * + * */ public MembershipModule getMembershipModule() { @@ -228,19 +224,16 @@ // -------------------------------------------------------------------------------------------------------------- /** - * + * */ public IdentityServiceController getIdentityServiceController() { return identityServiceController; } - /** - * - * @param identityServiceController - */ + /** @param identityServiceController */ public void setIdentityServiceController( - IdentityServiceController identityServiceController) + IdentityServiceController identityServiceController) { this.identityServiceController = identityServiceController; } @@ -248,13 +241,10 @@ // -------------------------------------------------------------------------------------------------------------- /** * Stores a permission and its associations into peristent storage - * - * @param permission - - * Permission to be persisted - * @param roles - - * Roles associated with this permission - * @param users - - * Individual users associated with this permission + * + * @param permission - Permission to be persisted + * @param roles - Roles associated with this permission + * @param users - Individual users associated with this permission */ private void store(Permission permission, Collection roles, Collection users) { @@ -264,7 +254,7 @@ Set roleAssoc = new HashSet(); for (Iterator itr = roles.iterator(); itr.hasNext();) { - Role role = (Role) itr.next(); + Role role = (Role)itr.next(); PermRoleAssoc cour = new PermRoleAssoc(); if (!(role instanceof AnonymousRole)) { @@ -289,7 +279,7 @@ Set userAssoc = new HashSet(); for (Iterator itr = users.iterator(); itr.hasNext();) { - User user = (User) itr.next(); + User user = (User)itr.next(); PermUserAssoc cour = new PermUserAssoc(); cour.setUserId(user.getUserName()); userAssoc.add(cour); @@ -307,9 +297,8 @@ /** * Stores a permission and its associations into peristent storage - * - * @param permission - - * Permission to be persisted + * + * @param permission - Permission to be persisted */ private void store(Permission permission) { @@ -320,7 +309,7 @@ /** * Deletes the specified permissions from the database - * + * * @param permissions */ private void remove(Collection permissions) @@ -330,7 +319,7 @@ { for (Iterator itr = permissions.iterator(); itr.hasNext();) { - Permission permission = (Permission) itr.next(); + Permission permission = (Permission)itr.next(); session.delete(permission); } } @@ -338,7 +327,7 @@ /** * Returns all permissions associated with the specified user - * + * * @param user * @return */ @@ -364,14 +353,14 @@ // in case of a database version, use the cache optmized way to // lookup the permissions String lookupByRole = "SELECT p.* from jbp_cms_perm p,jbp_cms_perm_role r,jbp_role_membership m,jbp_roles roles,jbp_users users WHERE " - + "p.id=r.cms_perm_id AND " - + "r.role_id=roles.jbp_name AND " - + "m.jbp_rid=roles.jbp_rid AND " - + "m.jbp_uid=users.jbp_uid AND " + "users.jbp_uname=?"; + + "p.id=r.cms_perm_id AND " + + "r.role_id=roles.jbp_name AND " + + "m.jbp_rid=roles.jbp_rid AND " + + "m.jbp_uid=users.jbp_uid AND " + "users.jbp_uname=?"; // perform lookup based on role membership Query roleQuery = session.createSQLQuery(lookupByRole).addEntity( - Permission.class); + Permission.class); roleQuery.setString(0, userId); roleQuery.setCacheable(true); permissions.addAll(roleQuery.list()); @@ -381,14 +370,14 @@ // in the case of LDAP use the IdentityModule // now find permissions for all the roles that this user belongs to Set belongedRoles = this.membershipModule.getRoles(this.userModule - .findUserByUserName(userId)); + .findUserByUserName(userId)); if (belongedRoles != null) { for (Iterator itr = belongedRoles.iterator(); itr.hasNext();) { - Role role = (Role) itr.next(); + Role role = (Role)itr.next(); Collection rolePermissions = this.findPermissionsByRole(role - .getName()); + .getName()); if (rolePermissions != null && !rolePermissions.isEmpty()) { permissions.addAll(rolePermissions); @@ -413,7 +402,7 @@ /** * Returns all permissions associated with the specified role - * + * * @param role * @return */ @@ -433,7 +422,7 @@ roleQuery.setCacheable(true); permissions.addAll(roleQuery.list()); } - catch(Exception e) + catch (Exception e) { tx.rollback(); throw new RuntimeException(e); @@ -449,7 +438,7 @@ /** * Return all permissions that match the specified criteria - * + * * @param criteria * @return */ @@ -470,7 +459,7 @@ criteriaQuery.setCacheable(true); permissions.addAll(criteriaQuery.list()); } - catch(Exception e) + catch (Exception e) { tx.rollback(); throw new RuntimeException(e); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/CMSPermission.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/CMSPermission.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/CMSPermission.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,96 +23,91 @@ package org.jboss.portal.cms.security; -import javax.security.auth.Subject; - import org.jboss.portal.security.PortalPermission; import org.jboss.portal.security.PortalSecurityException; import org.jboss.portal.security.spi.provider.PermissionRepository; +import javax.security.auth.Subject; + /** * Created on : Jan 23, 2007 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ public class CMSPermission extends PortalPermission { - private PortalCMSSecurityContext securityContext = null; - - /** - * - */ - public CMSPermission(String name, String uri) - { - super(name,uri); - } - - /** - * - * @param wrappedPermission - */ - public CMSPermission(PortalCMSSecurityContext securityContext) - { - super("",""); - this.securityContext = securityContext; - } + private PortalCMSSecurityContext securityContext = null; - //--------PortalPermission implementation------------------------------------------------------------ - /** - * - */ - public String getType() - { - return this.getClass().getName(); - } + /** + * + */ + public CMSPermission(String name, String uri) + { + super(name, uri); + } - /** - * - */ - public boolean implies(PermissionRepository repository, Subject caller, - String roleName, PortalPermission permission) - throws PortalSecurityException - { - return false; - } - - /** - * - * @return - */ - public PortalCMSSecurityContext getSecurityContext() - { - return this.securityContext; - } - //-------Permission implementation------------------------------------------------------------------ - /** - * - */ - public boolean equals(Object obj) - { - return false; - } + /** @param wrappedPermission */ + public CMSPermission(PortalCMSSecurityContext securityContext) + { + super("", ""); + this.securityContext = securityContext; + } - /** - * - */ - public String getActions() - { - return null; - } - - /** - * - */ - public int hashCode() - { - return 0; - } - - /** - * - */ - public boolean implies(java.security.Permission permission) - { - return false; - } + //--------PortalPermission implementation------------------------------------------------------------ + /** + * + */ + public String getType() + { + return this.getClass().getName(); + } + + /** + * + */ + public boolean implies(PermissionRepository repository, Subject caller, + String roleName, PortalPermission permission) + throws PortalSecurityException + { + return false; + } + + /** @return */ + public PortalCMSSecurityContext getSecurityContext() + { + return this.securityContext; + } + + //-------Permission implementation------------------------------------------------------------------ + /** + * + */ + public boolean equals(Object obj) + { + return false; + } + + /** + * + */ + public String getActions() + { + return null; + } + + /** + * + */ + public int hashCode() + { + return 0; + } + + /** + * + */ + public boolean implies(java.security.Permission permission) + { + return false; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/CMSPermission.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Criteria.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Criteria.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Criteria.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,105 +23,87 @@ import java.io.Serializable; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 29, 2006 - * - */ +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 29, 2006 */ public class Criteria implements Serializable { - /** - * - */ - private long id = 0; - private String name = null; - private String value = null; - - /** - * - * - */ - public Criteria() - { - - } - - /** - * - * - */ - public Criteria(String name,String value) - { - this(); - this.name = name; - this.value = value; - } - - /** - * - * @return - */ - public long getId() - { - return this.id; - } - - /** - * - * @param key - */ - public void setId(long id) - { - this.id = id; - } - - /** - * @return Returns the context. - */ - public String getName() - { - return name; - } - - /** - * @param context The context to set. - */ - public void setName(String name) - { - this.name = name; - } - - - /** - * @return Returns the value. - */ - public String getValue() - { - return value; - } - - /** - * @param value The value to set. - */ - public void setValue(String value) - { - this.value = value; - } - - /** - * - */ - public boolean equals(Object obj) - { - boolean equals = false; - if(obj instanceof Criteria) - { - Criteria input = (Criteria)obj; - if(input.name.equals(this.name) && input.value.equals(this.value)) - { - equals = true; - } - } - return equals; - } + /** + * + */ + private long id = 0; + private String name = null; + private String value = null; + + /** + * + * + */ + public Criteria() + { + + } + + /** + * + * + */ + public Criteria(String name, String value) + { + this(); + this.name = name; + this.value = value; + } + + /** @return */ + public long getId() + { + return this.id; + } + + /** @param key */ + public void setId(long id) + { + this.id = id; + } + + /** @return Returns the context. */ + public String getName() + { + return name; + } + + /** @param context The context to set. */ + public void setName(String name) + { + this.name = name; + } + + + /** @return Returns the value. */ + public String getValue() + { + return value; + } + + /** @param value The value to set. */ + public void setValue(String value) + { + this.value = value; + } + + /** + * + */ + public boolean equals(Object obj) + { + boolean equals = false; + if (obj instanceof Criteria) + { + Criteria input = (Criteria)obj; + if (input.name.equals(this.name) && input.value.equals(this.value)) + { + equals = true; + } + } + return equals; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Criteria.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermRoleAssoc.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermRoleAssoc.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermRoleAssoc.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,75 +21,59 @@ */ package org.jboss.portal.cms.security; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Dec 7, 2006 - * - */ -public class PermRoleAssoc +/** @author Sohil Shah - sohil.shah(a)jboss.com - Dec 7, 2006 */ +public class PermRoleAssoc { - private long id = 0; - private String roleId = null; + private long id = 0; + private String roleId = null; - /** - * - * - */ - public PermRoleAssoc() - { - super(); - } + /** + * + * + */ + public PermRoleAssoc() + { + super(); + } - /** - * - * @return - */ - public long getId() - { - return id; - } + /** @return */ + public long getId() + { + return id; + } - /** - * - * @param id - */ - public void setId(long id) - { - this.id = id; - } + /** @param id */ + public void setId(long id) + { + this.id = id; + } - - /** - * - * @return - */ - public String getRoleId() - { - return roleId; - } - /** - * - * @param roleId - */ - public void setRoleId(String roleId) - { - this.roleId = roleId; - } - - public boolean equals(Object obj) - { - boolean equals = false; - - if(obj instanceof PermRoleAssoc) - { - PermRoleAssoc input = (PermRoleAssoc)obj; - if(input.roleId.equals(this.roleId)) - { - equals = true; - } - } - - return equals; - } + /** @return */ + public String getRoleId() + { + return roleId; + } + + /** @param roleId */ + public void setRoleId(String roleId) + { + this.roleId = roleId; + } + + public boolean equals(Object obj) + { + boolean equals = false; + + if (obj instanceof PermRoleAssoc) + { + PermRoleAssoc input = (PermRoleAssoc)obj; + if (input.roleId.equals(this.roleId)) + { + equals = true; + } + } + + return equals; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermRoleAssoc.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermUserAssoc.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermUserAssoc.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermUserAssoc.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,75 +21,59 @@ */ package org.jboss.portal.cms.security; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Dec 7, 2006 - * - */ -public class PermUserAssoc +/** @author Sohil Shah - sohil.shah(a)jboss.com - Dec 7, 2006 */ +public class PermUserAssoc { - private long id = 0; - private String userId = null; + private long id = 0; + private String userId = null; - /** - * - * - */ - public PermUserAssoc() - { - super(); - } + /** + * + * + */ + public PermUserAssoc() + { + super(); + } - /** - * - * @return - */ - public long getId() - { - return id; - } + /** @return */ + public long getId() + { + return id; + } - /** - * - * @param id - */ - public void setId(long id) - { - this.id = id; - } + /** @param id */ + public void setId(long id) + { + this.id = id; + } - - /** - * - * @return - */ - public String getUserId() - { - return userId; - } - /** - * - * @param roleId - */ - public void setUserId(String userId) - { - this.userId = userId; - } - - public boolean equals(Object obj) - { - boolean equals = false; - - if(obj instanceof PermUserAssoc) - { - PermUserAssoc input = (PermUserAssoc)obj; - if(input.userId.equals(this.userId)) - { - equals = true; - } - } - - return equals; - } + /** @return */ + public String getUserId() + { + return userId; + } + + /** @param roleId */ + public void setUserId(String userId) + { + this.userId = userId; + } + + public boolean equals(Object obj) + { + boolean equals = false; + + if (obj instanceof PermUserAssoc) + { + PermUserAssoc input = (PermUserAssoc)obj; + if (input.userId.equals(this.userId)) + { + equals = true; + } + } + + return equals; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PermUserAssoc.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Permission.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Permission.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Permission.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,398 +21,321 @@ */ package org.jboss.portal.cms.security; -import java.util.Set; +import java.security.BasicPermission; import java.util.HashSet; import java.util.Iterator; -import java.security.BasicPermission; +import java.util.Set; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 28, 2006 - * - */ -public class Permission extends BasicPermission +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 28, 2006 */ +public class Permission extends BasicPermission { - /** - * - */ - private long id = 0; //unique id for this permission object in the storage (typically database) - private String service = null; //portal service that this permission applies to like cms etc - private String action = null; //action on the service that needs to be protected - private boolean isNegated = false; - - /** - * - */ - private Set criteria = null; - private Set roleAssoc = null; - private Set userAssoc = null; - - /** - * - */ - private Set roles = null; //these are information carrying fields, they are not persisted in the database - private Set users = null; //these are information carrying fields, they are not persisted in the database - - /** - * - * - */ - public Permission() - { - this("null"); - } - - - /** - * - * @param name - */ - public Permission(String service) - { - super(service); - this.service = service; - } - - /** - * - * @param name - * @param actions - */ - public Permission(String service,String actions) - { - super(service,actions); - this.service = service; - this.action = actions; - } - - - /** - * - * @return - */ - public long getId() - { - return this.id; - } - - /** - * - * @param id - */ - public void setId(long id) - { - this.id = id; - } - - /** - * - * @return - */ - public Set getCriteria() - { - return this.criteria; - } - - /** - * - * @param criteria - */ - public void setCriteria(Set criteria) - { - this.criteria = criteria; - } - - /** - * - * @param criteria - */ - public void addCriteria(Criteria criteria) - { - if(this.criteria == null) - { - this.criteria = new HashSet(); - } - this.criteria.add(criteria); - } - - /** - * - * @return - */ - public String getService() - { - return this.service; - } - - - /** - * - * @param name - */ - public void setService(String service) - { - this.service = service; - } - - /** - * - * @return - */ - public String getAction() - { - return this.action; - } - - /** - * - * @param action - */ - public void setAction(String action) - { - this.action = action; - } - - - /** - * Finds the specified criteria value for the criteriaId - * - * @param criteriaId - * @return value of the criteria - */ - public String findCriteriaValue(String criteriaId) - { - String value = null; - if(this.criteria!=null) - { - for(Iterator itr=this.criteria.iterator();itr.hasNext();) - { - Criteria cour = (Criteria)itr.next(); - if(criteriaId.equals(cour.getName())) - { - value = cour.getValue(); - } - } - } - return value; - } + /** + * + */ + private long id = 0; //unique id for this permission object in the storage (typically database) + private String service = null; //portal service that this permission applies to like cms etc + private String action = null; //action on the service that needs to be protected + private boolean isNegated = false; - /** - * - * @return - */ - public boolean isNegated() - { - return isNegated; - } + /** + * + */ + private Set criteria = null; + private Set roleAssoc = null; + private Set userAssoc = null; - /** - * - * @param isNegated - */ - public void setNegated(boolean isNegated) - { - this.isNegated = isNegated; - } + /** + * + */ + private Set roles = null; //these are information carrying fields, they are not persisted in the database + private Set users = null; //these are information carrying fields, they are not persisted in the database - /** - * - * @return - */ - public Set getRoleAssoc() - { - return roleAssoc; - } + /** + * + * + */ + public Permission() + { + this("null"); + } - /** - * - * @param roleAssoc - */ - public void setRoleAssoc(Set roleAssoc) - { - this.roleAssoc = roleAssoc; - } - - /** - * - * @param roleAssoc - */ - public void addRoleAssoc(PermRoleAssoc roleAssoc) - { - if(this.roleAssoc == null) - { - this.roleAssoc = new HashSet(); - } - this.roleAssoc.add(roleAssoc); - } - - /** - * - * @return - */ - public Set getRoleAssocIds() - { - Set ids = new HashSet(); - if(this.roleAssoc!=null) - { - for(Iterator itr=this.roleAssoc.iterator();itr.hasNext();) - { - PermRoleAssoc cour = (PermRoleAssoc)itr.next(); - ids.add(cour.getRoleId()); - } - } - return ids; - } - /** - * - * @return - */ - public Set getUserAssoc() - { - return userAssoc; - } + /** @param name */ + public Permission(String service) + { + super(service); + this.service = service; + } - /** - * - * @param userAssoc - */ - public void setUserAssoc(Set userAssoc) - { - this.userAssoc = userAssoc; - } - - /** - * - * @param userAssoc - */ - public void addUserAssoc(PermUserAssoc userAssoc) - { - if(this.userAssoc == null) - { - this.userAssoc = new HashSet(); - } - this.userAssoc.add(userAssoc); - } - - /** - * - * @return - */ - public Set getUserAssocIds() - { - Set ids = new HashSet(); - if(this.userAssoc!=null) - { - for(Iterator itr=this.userAssoc.iterator();itr.hasNext();) - { - PermUserAssoc cour = (PermUserAssoc)itr.next(); - ids.add(cour.getUserId()); - } - } - return ids; - } - - /** - * - * @return - */ - public Set getRoles() - { - return roles; - } + /** + * @param name + * @param actions + */ + public Permission(String service, String actions) + { + super(service, actions); + this.service = service; + this.action = actions; + } - /** - * - * @param roles - */ - public void setRoles(Set roles) - { - this.roles = roles; - } - /** - * - * @return - */ - public Set getUsers() - { - return users; - } + /** @return */ + public long getId() + { + return this.id; + } - /** - * - * @param users - */ - public void setUsers(Set users) - { - this.users = users; - } + /** @param id */ + public void setId(long id) + { + this.id = id; + } + /** @return */ + public Set getCriteria() + { + return this.criteria; + } - /** - * - */ - public String toString() - { - StringBuffer buffer = new StringBuffer(); - - buffer.append("-----------------------------\n"); - buffer.append("ID="+this.id+"\n"); - buffer.append("Service="+this.service+"\n"); - buffer.append("Action="+this.action+"\n"); - buffer.append("Negated="+this.isNegated+"\n"); - - //print role association - if(this.roleAssoc!=null) - { - for(Iterator itr=this.roleAssoc.iterator();itr.hasNext();) - { - PermRoleAssoc cour = (PermRoleAssoc)itr.next(); - buffer.append("Role ="+cour.getRoleId()+"\n"); - } - } - - //print user association - if(this.userAssoc!=null) - { - for(Iterator itr=this.userAssoc.iterator();itr.hasNext();) - { - PermUserAssoc cour = (PermUserAssoc)itr.next(); - buffer.append("User ="+cour.getUserId()+"\n"); - } - } - - //print criteria - if(this.criteria!=null) - { - for(Iterator itr=this.criteria.iterator();itr.hasNext();) - { - Criteria cour = (Criteria)itr.next(); - buffer.append("Criteria ="+cour.getName()+","+cour.getValue()+"\n"); - } - } - - buffer.append("-----------------------------\n"); - - return buffer.toString(); - } + /** @param criteria */ + public void setCriteria(Set criteria) + { + this.criteria = criteria; + } + /** @param criteria */ + public void addCriteria(Criteria criteria) + { + if (this.criteria == null) + { + this.criteria = new HashSet(); + } + this.criteria.add(criteria); + } - /** - * - */ - public boolean equals(Object obj) - { - boolean equals = false; - if(obj instanceof Permission) - { - Permission input = (Permission)obj; - if(input.id == this.id) + /** @return */ + public String getService() + { + return this.service; + } + + + /** @param name */ + public void setService(String service) + { + this.service = service; + } + + /** @return */ + public String getAction() + { + return this.action; + } + + /** @param action */ + public void setAction(String action) + { + this.action = action; + } + + + /** + * Finds the specified criteria value for the criteriaId + * + * @param criteriaId + * @return value of the criteria + */ + public String findCriteriaValue(String criteriaId) + { + String value = null; + if (this.criteria != null) + { + for (Iterator itr = this.criteria.iterator(); itr.hasNext();) + { + Criteria cour = (Criteria)itr.next(); + if (criteriaId.equals(cour.getName())) { - equals = true; + value = cour.getValue(); } - } - return equals; - } + } + } + return value; + } + + /** @return */ + public boolean isNegated() + { + return isNegated; + } + + /** @param isNegated */ + public void setNegated(boolean isNegated) + { + this.isNegated = isNegated; + } + + /** @return */ + public Set getRoleAssoc() + { + return roleAssoc; + } + + /** @param roleAssoc */ + public void setRoleAssoc(Set roleAssoc) + { + this.roleAssoc = roleAssoc; + } + + /** @param roleAssoc */ + public void addRoleAssoc(PermRoleAssoc roleAssoc) + { + if (this.roleAssoc == null) + { + this.roleAssoc = new HashSet(); + } + this.roleAssoc.add(roleAssoc); + } + + /** @return */ + public Set getRoleAssocIds() + { + Set ids = new HashSet(); + if (this.roleAssoc != null) + { + for (Iterator itr = this.roleAssoc.iterator(); itr.hasNext();) + { + PermRoleAssoc cour = (PermRoleAssoc)itr.next(); + ids.add(cour.getRoleId()); + } + } + return ids; + } + + /** @return */ + public Set getUserAssoc() + { + return userAssoc; + } + + /** @param userAssoc */ + public void setUserAssoc(Set userAssoc) + { + this.userAssoc = userAssoc; + } + + /** @param userAssoc */ + public void addUserAssoc(PermUserAssoc userAssoc) + { + if (this.userAssoc == null) + { + this.userAssoc = new HashSet(); + } + this.userAssoc.add(userAssoc); + } + + /** @return */ + public Set getUserAssocIds() + { + Set ids = new HashSet(); + if (this.userAssoc != null) + { + for (Iterator itr = this.userAssoc.iterator(); itr.hasNext();) + { + PermUserAssoc cour = (PermUserAssoc)itr.next(); + ids.add(cour.getUserId()); + } + } + return ids; + } + + /** @return */ + public Set getRoles() + { + return roles; + } + + /** @param roles */ + public void setRoles(Set roles) + { + this.roles = roles; + } + + /** @return */ + public Set getUsers() + { + return users; + } + + /** @param users */ + public void setUsers(Set users) + { + this.users = users; + } + + + /** + * + */ + public String toString() + { + StringBuffer buffer = new StringBuffer(); + + buffer.append("-----------------------------\n"); + buffer.append("ID=" + this.id + "\n"); + buffer.append("Service=" + this.service + "\n"); + buffer.append("Action=" + this.action + "\n"); + buffer.append("Negated=" + this.isNegated + "\n"); + + //print role association + if (this.roleAssoc != null) + { + for (Iterator itr = this.roleAssoc.iterator(); itr.hasNext();) + { + PermRoleAssoc cour = (PermRoleAssoc)itr.next(); + buffer.append("Role =" + cour.getRoleId() + "\n"); + } + } + + //print user association + if (this.userAssoc != null) + { + for (Iterator itr = this.userAssoc.iterator(); itr.hasNext();) + { + PermUserAssoc cour = (PermUserAssoc)itr.next(); + buffer.append("User =" + cour.getUserId() + "\n"); + } + } + + //print criteria + if (this.criteria != null) + { + for (Iterator itr = this.criteria.iterator(); itr.hasNext();) + { + Criteria cour = (Criteria)itr.next(); + buffer.append("Criteria =" + cour.getName() + "," + cour.getValue() + "\n"); + } + } + + buffer.append("-----------------------------\n"); + + return buffer.toString(); + } + + + /** + * + */ + public boolean equals(Object obj) + { + boolean equals = false; + if (obj instanceof Permission) + { + Permission input = (Permission)obj; + if (input.id == this.id) + { + equals = true; + } + } + return equals; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/Permission.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PortalCMSSecurityContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PortalCMSSecurityContext.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PortalCMSSecurityContext.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,89 +21,86 @@ */ package org.jboss.portal.cms.security; +import org.jboss.portal.identity.User; + import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.jboss.portal.identity.User; - /** * An implementation of SecurityContext for the core Portal Engine - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 27, 2006 * + * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 27, 2006 */ -public class PortalCMSSecurityContext implements Serializable +public class PortalCMSSecurityContext implements Serializable { - private Map contextMap = null; - - /** - * signifies the user currently logged in to the system - */ - private User portalUser = null; - + private Map contextMap = null; - /** - * - * - */ - public PortalCMSSecurityContext(User portalUser) - { - super(); - this.portalUser = portalUser; - this.contextMap = new HashMap(); - } + /** signifies the user currently logged in to the system */ + private User portalUser = null; - /** - * This method returns the Identity of the user logged into the portal. The return value is of type - * org.jboss.portal.identity.User - * - * @return Identity related information associated with the user logged into the portal - */ - public Object getIdentity() - { - return this.portalUser; - } - - /** - * Returns value corresponding to the specified attribute name - * - * @param name - * @return - */ - public Object getAttribute(String name) - { - return this.contextMap.get(name); - } - - /** - * Sets a specified value corresponding to the specified name in the context - * - * @param name - * @param value - */ - public void setAttribute(String name,Object value) - { - this.contextMap.put(name,value); - } - - /** - * Removes the specified attribute - * - * @param name - */ - public void removeAttribute(String name) - { - this.contextMap.remove(name); - } - - /** - * Returns an array of Strings consisting of all keys/names stored in the context - * - * @return - */ - public String[] getAttributeNames() - { - return (String[])this.contextMap.keySet().toArray(); - } + + /** + * + * + */ + public PortalCMSSecurityContext(User portalUser) + { + super(); + this.portalUser = portalUser; + this.contextMap = new HashMap(); + } + + /** + * This method returns the Identity of the user logged into the portal. The return value is of type + * org.jboss.portal.identity.User + * + * @return Identity related information associated with the user logged into the portal + */ + public Object getIdentity() + { + return this.portalUser; + } + + /** + * Returns value corresponding to the specified attribute name + * + * @param name + * @return + */ + public Object getAttribute(String name) + { + return this.contextMap.get(name); + } + + /** + * Sets a specified value corresponding to the specified name in the context + * + * @param name + * @param value + */ + public void setAttribute(String name, Object value) + { + this.contextMap.put(name, value); + } + + /** + * Removes the specified attribute + * + * @param name + */ + public void removeAttribute(String name) + { + this.contextMap.remove(name); + } + + /** + * Returns an array of Strings consisting of all keys/names stored in the context + * + * @return + */ + public String[] getAttributeNames() + { + return (String[])this.contextMap.keySet().toArray(); + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/security/PortalCMSSecurityContext.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/FileUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,11 +22,10 @@ ******************************************************************************/ package org.jboss.portal.cms.workflow; -import java.util.Set; - import org.jboss.portal.workflow.WorkflowException; import java.util.Collection; +import java.util.Set; /** * Created on : Dec 19, 2006 @@ -36,8 +35,8 @@ public interface ApprovePublish { /** - * Called when content is added to the CMS, and needs to be approved by the managers - * before it can be published to go live + * Called when content is added to the CMS, and needs to be approved by the managers before it can be published to go + * live * * @param content * @return returns the process id of the workflow process set in motion @@ -45,8 +44,7 @@ public long requestApproval(Content content) throws WorkflowException; /** - * Called when a manager either approves or rejects the publishing of a specific content to - * go live + * Called when a manager either approves or rejects the publishing of a specific content to go live * * @param processId * @param manager userId of the manager @@ -70,13 +68,12 @@ * @throws WorkflowException */ public Collection getAllPendingInQueue() throws WorkflowException; - + /** - * Returns role names of Roles that are designated to be Managers in this workflow. - * Managers approve/deny all content publish requests before the content goes live in the - * CMS - * - * @return a Set of role names + * Returns role names of Roles that are designated to be Managers in this workflow. Managers approve/deny all content + * publish requests before the content goes live in the CMS + * + * @return a Set of role names */ public Set getManagers(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,18 +22,6 @@ ******************************************************************************/ package org.jboss.portal.cms.workflow; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.StringTokenizer; - -import javax.xml.parsers.DocumentBuilderFactory; - import org.apache.log4j.Logger; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.identity.IdentityContext; @@ -54,6 +42,16 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; /** @@ -83,7 +81,7 @@ private String subject = null; private String body = null; private JNDI.Binding jndiBinding; - + private MembershipModule membershipModule = null; private UserModule userModule = null; @@ -164,12 +162,12 @@ this.managers[i] = st.nextToken(); this.managerSet.add(this.managers[i]); } - + this.membershipModule = (MembershipModule)identityServiceController.getIdentityContext(). - getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); - - this.userModule = (UserModule)identityServiceController.getIdentityContext(). - getObject(IdentityContext.TYPE_USER_MODULE); + getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); + + this.userModule = (UserModule)identityServiceController.getIdentityContext(). + getObject(IdentityContext.TYPE_USER_MODULE); } /** @@ -247,24 +245,21 @@ { this.jndiName = jndiName; } - + /** - * - */ - public IdentityServiceController getIdentityServiceController() - { - return identityServiceController; - } + * + */ + public IdentityServiceController getIdentityServiceController() + { + return identityServiceController; + } - /** - * - * @param identityServiceController - */ - public void setIdentityServiceController( - IdentityServiceController identityServiceController) - { - this.identityServiceController = identityServiceController; - } + /** @param identityServiceController */ + public void setIdentityServiceController( + IdentityServiceController identityServiceController) + { + this.identityServiceController = identityServiceController; + } /** @return the body */ @@ -305,8 +300,8 @@ //----------ApprovePublish Implementation------------------------------------------------------------------ /** - * Called when content is added to the CMS, and needs to be approved by the managers - * before it can be published to go live + * Called when content is added to the CMS, and needs to be approved by the managers before it can be published to go + * live * * @param content * @return returns the process id of the workflow process set in motion @@ -363,15 +358,14 @@ } /** - * Called when a manager either approves or rejects the publishing of a specific content to - * go live + * Called when a manager either approves or rejects the publishing of a specific content to go live * * @param processId * @param manager userId of the manager * @param approved true if approved, false if rejected */ public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException - { + { JbpmContext jbpmContext = null; ProcessInstance processInstance = null; boolean isManager = false; @@ -396,9 +390,9 @@ for (Iterator itr = allTasks.iterator(); itr.hasNext();) { TaskInstance cour = (TaskInstance)itr.next(); - if (this.isManager(manager,cour.getActorId())) + if (this.isManager(manager, cour.getActorId())) { - isManager = true; + isManager = true; log.debug("Manager=" + cour.getActorId() + "(" + processId + ")"); //check and make sure this task instance is not marked for deletion @@ -433,11 +427,11 @@ { jbpmContext.save(processInstance); } - - if(!isManager) + + if (!isManager) { - WorkflowException we = new WorkflowException("You are not authorized to Approve/Deny content publish requests"); - throw we; + WorkflowException we = new WorkflowException("You are not authorized to Approve/Deny content publish requests"); + throw we; } IOTools.safeClose(jbpmContext); } @@ -480,7 +474,7 @@ if (criteriaPath.trim().equals(filePath.trim())) { - content.setProcessId(String.valueOf(cour.getId())); + content.setProcessId(String.valueOf(cour.getId())); pendingQueue.add(content); } } @@ -526,7 +520,7 @@ //apply proper criteria to extract pending content only for the specified file if (content != null) { - content.setProcessId(String.valueOf(cour.getId())); + content.setProcessId(String.valueOf(cour.getId())); pendingQueue.add(content); } } @@ -539,44 +533,41 @@ } return pendingQueue; } - - /** - * - * @return - */ + + /** @return */ public Set getManagers() { - return this.managerSet; - } + return this.managerSet; + } + //---------------------------------------------------------------------------------------------------------------- /** - * checks to see if the user trying to approve/deny a publish request belongs to the - * approved list of managers - * + * checks to see if the user trying to approve/deny a publish request belongs to the approved list of managers + * * @param user * @param managerRole * @return */ - private boolean isManager(String user,String managerRole) throws Exception + private boolean isManager(String user, String managerRole) throws Exception { - boolean isManager = false; - - Set userRoles = this.membershipModule.getRoles( - this.userModule.findUserByUserName(user)); - if(userRoles != null) - { - for(Iterator itr=userRoles.iterator();itr.hasNext();) - { - Role cour = (Role)itr.next(); - if(cour.getName().equalsIgnoreCase(managerRole)) - { - //user is allowed to be a manager for this workflow - isManager = true; - break; - } - } - } - - return isManager; + boolean isManager = false; + + Set userRoles = this.membershipModule.getRoles( + this.userModule.findUserByUserName(user)); + if (userRoles != null) + { + for (Iterator itr = userRoles.iterator(); itr.hasNext();) + { + Role cour = (Role)itr.next(); + if (cour.getName().equalsIgnoreCase(managerRole)) + { + //user is allowed to be a manager for this workflow + isManager = true; + break; + } + } + } + + return isManager; } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishServlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishServlet.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishServlet.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,16 +22,14 @@ ******************************************************************************/ package org.jboss.portal.cms.workflow; -import java.io.IOException; - +import javax.naming.InitialContext; import javax.servlet.ServletException; +import javax.servlet.UnavailableException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.UnavailableException; +import java.io.IOException; -import javax.naming.InitialContext; - /** * Created on : Dec 20, 2006 * Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishServlet.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/Content.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/Content.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/Content.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,9 +23,9 @@ package org.jboss.portal.cms.workflow; import java.io.Serializable; -import java.util.Date; import java.text.Format; import java.text.SimpleDateFormat; +import java.util.Date; /** * Created on : Dec 20, 2006 @@ -40,7 +40,7 @@ private String mimeType = null; private int size = 0; private Date creationDate = null; - + private String processId = null; /** @@ -52,65 +52,49 @@ } - /** - * @return the path - */ + /** @return the path */ public String getPath() { return path; } - /** - * @param path the path to set - */ + /** @param path the path to set */ public void setPath(String path) { this.path = path; } - /** - * @return the userName - */ + /** @return the userName */ public String getUserName() { return userName; } - /** - * @param userName the userName to set - */ + /** @param userName the userName to set */ public void setUserName(String userName) { this.userName = userName; } - /** - * @return the mimeType - */ + /** @return the mimeType */ public String getMimeType() { return mimeType; } - /** - * @param mimeType the mimeType to set - */ + /** @param mimeType the mimeType to set */ public void setMimeType(String mimeType) { this.mimeType = mimeType; } - /** - * @return the size - */ + /** @return the size */ public int getSize() { return size; } - /** - * @param size the size to set - */ + /** @param size the size to set */ public void setSize(int size) { this.size = size; @@ -121,17 +105,13 @@ return String.valueOf((this.size / 1024)) + "kb"; } - /** - * @return the creationDate - */ + /** @return the creationDate */ public Date getCreationDate() { return creationDate; } - /** - * @param creationDate the creationDate to set - */ + /** @param creationDate the creationDate to set */ public void setCreationDate(Date creationDate) { this.creationDate = creationDate; @@ -148,21 +128,15 @@ return date; } - /** - * - * @return - */ - public String getProcessId() - { - return processId; - } - - /** - * - * @param processId - */ - public void setProcessId(String processId) - { - this.processId = processId; - } + /** @return */ + public String getProcessId() + { + return processId; + } + + /** @param processId */ + public void setProcessId(String processId) + { + this.processId = processId; + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/Content.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,129 +22,119 @@ ******************************************************************************/ package org.jboss.portal.cms.workflow; -import java.util.Locale; -import java.util.List; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - import org.apache.log4j.Logger; - -import org.jbpm.graph.def.*; -import org.jbpm.graph.exe.*; - -import org.jboss.portal.cms.workflow.Content; import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.cms.impl.jcr.JCRCMS; import org.jboss.portal.cms.impl.interceptors.ACLInterceptor; +import org.jboss.portal.cms.impl.jcr.JCRCMS; +import org.jboss.portal.cms.model.File; +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.exe.ExecutionContext; +import javax.naming.InitialContext; +import java.util.List; +import java.util.Locale; + /** - * * Created on : Dec 20, 2006 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ -public class FinalizePublish implements ActionHandler +public class FinalizePublish implements ActionHandler { - /** - * - */ - private static Logger log = Logger.getLogger(FinalizePublish.class); - - /** - * - */ - public void execute(ExecutionContext executionContext) - { - Content content = (Content)executionContext.getContextInstance().getVariable("content"); - boolean approved = ((Boolean)executionContext.getContextInstance().getVariable("approved")).booleanValue(); - long processId = executionContext.getProcessInstance().getId(); - CMS cms = this.getCMSService(); - - if(approved) - { - ACLInterceptor.turnOff(); - JCRCMS.turnOffWorkflow(); - - //create this content in the CMS and make it live - int lastIndex = content.getPath().lastIndexOf('/'); - String path = content.getPath().substring(0,lastIndex); - String language = content.getPath().substring(lastIndex+1); - - Command command = cms.getCommandFactory().createContentGetVersionsCommand(content.getPath()); - List versions = (List)cms.execute(command); - org.jboss.portal.cms.model.Content processContent = this.findProcessContent(processId, versions); - - /** - * if processContent is null, a pending version of the content was not found - * this could be due to an outdated link. let the process finish, but nothing - * new will be published - */ - if(processContent != null) - { - //get the file to be updated and published live - command = cms.getCommandFactory().createFileGetCommand(path,processContent.getVersionNumber(), - new Locale(language)); - File file = (File)cms.execute(command); - - //now publish this - file.getContent().setApprovalProcessId(null); - file.getContent().setWaitingForPublishApproval(false); - command = cms.getCommandFactory().createUpdateFileCommand(file, file.getContent(), true); - cms.execute(command); - } - - - JCRCMS.turnOnWorkflow(); - ACLInterceptor.turnOn(); - } - } - - /** - * - * @param processId - * @param versions - * @return - */ - private org.jboss.portal.cms.model.Content findProcessContent(long processId,List versions) - { - org.jboss.portal.cms.model.Content content = null; - - if(versions != null) - { - for(int i=0;i<versions.size();i++) - { - org.jboss.portal.cms.model.Content cour = (org.jboss.portal.cms.model.Content)versions.get(i); - if(cour.isWaitingForPublishApproval()) - { - if( cour.getApprovalProcessId()!=null && - cour.getApprovalProcessId().trim().equals(String.valueOf(processId))) - { - //not if found...the content of this version should be published to go live - return cour; - } - } - } - } - - return content; - } - - /** - * - * @return - */ - private CMS getCMSService() - { - try - { - return (CMS)new InitialContext().lookup("java:/portal/CMS"); - } - catch(Exception e) - { - throw new RuntimeException(e); - } - } + /** + * + */ + private static Logger log = Logger.getLogger(FinalizePublish.class); + + /** + * + */ + public void execute(ExecutionContext executionContext) + { + Content content = (Content)executionContext.getContextInstance().getVariable("content"); + boolean approved = ((Boolean)executionContext.getContextInstance().getVariable("approved")).booleanValue(); + long processId = executionContext.getProcessInstance().getId(); + CMS cms = this.getCMSService(); + + if (approved) + { + ACLInterceptor.turnOff(); + JCRCMS.turnOffWorkflow(); + + //create this content in the CMS and make it live + int lastIndex = content.getPath().lastIndexOf('/'); + String path = content.getPath().substring(0, lastIndex); + String language = content.getPath().substring(lastIndex + 1); + + Command command = cms.getCommandFactory().createContentGetVersionsCommand(content.getPath()); + List versions = (List)cms.execute(command); + org.jboss.portal.cms.model.Content processContent = this.findProcessContent(processId, versions); + + /** + * if processContent is null, a pending version of the content was not found + * this could be due to an outdated link. let the process finish, but nothing + * new will be published + */ + if (processContent != null) + { + //get the file to be updated and published live + command = cms.getCommandFactory().createFileGetCommand(path, processContent.getVersionNumber(), + new Locale(language)); + File file = (File)cms.execute(command); + + //now publish this + file.getContent().setApprovalProcessId(null); + file.getContent().setWaitingForPublishApproval(false); + command = cms.getCommandFactory().createUpdateFileCommand(file, file.getContent(), true); + cms.execute(command); + } + + + JCRCMS.turnOnWorkflow(); + ACLInterceptor.turnOn(); + } + } + + /** + * @param processId + * @param versions + * @return + */ + private org.jboss.portal.cms.model.Content findProcessContent(long processId, List versions) + { + org.jboss.portal.cms.model.Content content = null; + + if (versions != null) + { + for (int i = 0; i < versions.size(); i++) + { + org.jboss.portal.cms.model.Content cour = (org.jboss.portal.cms.model.Content)versions.get(i); + if (cour.isWaitingForPublishApproval()) + { + if (cour.getApprovalProcessId() != null && + cour.getApprovalProcessId().trim().equals(String.valueOf(processId))) + { + //not if found...the content of this version should be published to go live + return cour; + } + } + } + } + + return content; + } + + /** @return */ + private CMS getCMSService() + { + try + { + return (CMS)new InitialContext().lookup("java:/portal/CMS"); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/FinalizePublish.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/PublishAssignmentHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/PublishAssignmentHandler.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/PublishAssignmentHandler.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,53 +22,51 @@ ******************************************************************************/ package org.jboss.portal.cms.workflow; -import java.util.Collection; - -import org.apache.log4j.Logger; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.taskmgmt.def.AssignmentHandler; import org.jbpm.taskmgmt.exe.Assignable; import org.jbpm.taskmgmt.exe.TaskInstance; +import java.util.Collection; + /** - * * Created on : Dec 20, 2006 - * @author Sohil Shah - sohil.shah(a)jboss.com * + * @author Sohil Shah - sohil.shah(a)jboss.com */ public class PublishAssignmentHandler implements AssignmentHandler { - // private static Logger log = Logger.getLogger(PublishAssignmentHandler.class); - - /** - * - */ - public void assign(Assignable assignable,ExecutionContext executionContext) - { - int taskInstances = 0; - Collection assignedTasks = executionContext.getTaskMgmtInstance().getTaskInstances(); - if(assignedTasks!=null) - { - taskInstances = assignedTasks.size(); - } - - if(taskInstances == 1) - { - String[] managers = (String[])executionContext.getContextInstance().getVariable("managers"); - if(managers!=null && managers.length>0) - { - //this.notifyManagers(executionContext,managers[0]); - assignable.setActorId(managers[0]); - - for(int i=1;i<managers.length;i++) - { - //this.notifyManagers(executionContext,managers[i]); - TaskInstance t = executionContext.getTaskMgmtInstance(). - createTaskInstance(((TaskInstance)assignable).getTask(),executionContext); - t.setActorId(managers[i]); - } - } - } - } + // private static Logger log = Logger.getLogger(PublishAssignmentHandler.class); + + /** + * + */ + public void assign(Assignable assignable, ExecutionContext executionContext) + { + int taskInstances = 0; + Collection assignedTasks = executionContext.getTaskMgmtInstance().getTaskInstances(); + if (assignedTasks != null) + { + taskInstances = assignedTasks.size(); + } + + if (taskInstances == 1) + { + String[] managers = (String[])executionContext.getContextInstance().getVariable("managers"); + if (managers != null && managers.length > 0) + { + //this.notifyManagers(executionContext,managers[0]); + assignable.setActorId(managers[0]); + + for (int i = 1; i < managers.length; i++) + { + //this.notifyManagers(executionContext,managers[i]); + TaskInstance t = executionContext.getTaskMgmtInstance(). + createTaskInstance(((TaskInstance)assignable).getTask(), executionContext); + t.setActorId(managers[i]); + } + } + } + } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/PublishAssignmentHandler.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/TaskExceptionHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/TaskExceptionHandler.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/TaskExceptionHandler.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.cms.workflow; +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.taskmgmt.exe.TaskInstance; -import org.jbpm.graph.exe.ExecutionContext; -import org.jbpm.graph.def.ActionHandler; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/workflow/TaskExceptionHandler.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,20 +24,20 @@ import junit.framework.TestCase; import junit.framework.TestSuite; +import org.jboss.portal.test.framework.embedded.DataSourceSupport; +import org.jboss.portal.test.framework.embedded.HibernateSupport; +import org.jboss.portal.test.framework.junit.JUnitAdapter; import org.jboss.portal.test.framework.junit.POJOJUnitTest; -import org.jboss.portal.test.framework.junit.JUnitAdapter; import org.jboss.portal.test.framework.mc.TestRuntimeContext; -import org.jboss.portal.test.framework.embedded.DataSourceSupport; -import org.jboss.portal.test.framework.embedded.HibernateSupport; import java.net.URL; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision$ + * @version $Revision: 7954 $ */ public abstract class AbstractCMSTestCase extends TestCase { @@ -47,10 +47,10 @@ /** . */ protected TestRuntimeContext runtimeContext; - + /** - * * + * */ protected String configuration = "org/jboss/portal/cms/jboss-beans.xml"; @@ -74,7 +74,7 @@ runtimeContext = new TestRuntimeContext(this.configuration); runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter); runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName())); - + //Start the context runtimeContext.start(); } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -39,7 +39,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ + * @version $Revision: 6653 $ */ public class JackrabbitTestCase extends AbstractCMSTestCase { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,11 +24,10 @@ import junit.framework.TestSuite; import org.jboss.portal.cms.util.RepositoryUtil; +import org.jboss.portal.test.cms.commands.AbstractCommandTestCase; import javax.jcr.Session; -import org.jboss.portal.test.cms.commands.AbstractCommandTestCase; - /** * Tests JCRCMS Service * Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -25,8 +25,6 @@ import junit.framework.TestSuite; import org.jboss.portal.cms.util.NodeUtil; -import java.util.Map; - /** * Tests RepositoryUtil * Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,26 +22,26 @@ ******************************************************************************/ package org.jboss.portal.test.cms.clustering; -import org.jboss.portal.test.framework.server.driver.AbstractTest; +import org.jboss.portal.cms.CMS; +import org.jboss.portal.cms.Command; +import org.jboss.portal.cms.impl.ContentImpl; +import org.jboss.portal.cms.impl.FileImpl; +import org.jboss.portal.cms.model.Content; +import org.jboss.portal.cms.model.File; +import org.jboss.portal.common.junit.ExtendedAssert; +import org.jboss.portal.server.AbstractServerURL; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.test.framework.driver.DriverResponse; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; -import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.driver.response.EndTestResponse; import org.jboss.portal.test.framework.driver.response.ErrorResponse; -import org.jboss.portal.common.junit.ExtendedAssert; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.server.AbstractServerURL; -import org.jboss.portal.cms.CMS; -import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.impl.FileImpl; -import org.jboss.portal.cms.impl.ContentImpl; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.cms.model.Content; +import org.jboss.portal.test.framework.driver.response.FailureResponse; +import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.portal.test.framework.server.driver.AbstractTest; +import java.net.MalformedURLException; import java.util.Locale; -import java.net.MalformedURLException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,26 +22,26 @@ ******************************************************************************/ package org.jboss.portal.test.cms.clustering; +import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.impl.ContentImpl; import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.model.Content; import org.jboss.portal.cms.model.File; -import org.jboss.portal.test.framework.driver.response.EndTestResponse; -import org.jboss.portal.test.framework.driver.response.FailureResponse; -import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.common.junit.ExtendedAssert; +import org.jboss.portal.server.AbstractServerURL; +import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.test.framework.driver.DriverResponse; -import org.jboss.portal.common.junit.ExtendedAssert; -import org.jboss.portal.test.framework.server.driver.AbstractTest; import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse; import org.jboss.portal.test.framework.driver.remote.TestContext; +import org.jboss.portal.test.framework.driver.response.EndTestResponse; +import org.jboss.portal.test.framework.driver.response.ErrorResponse; +import org.jboss.portal.test.framework.driver.response.FailureResponse; import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.server.AbstractServerURL; +import org.jboss.portal.test.framework.server.driver.AbstractTest; +import java.net.MalformedURLException; import java.util.Locale; -import java.net.MalformedURLException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/CMSInterceptorStackFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/CMSInterceptorStackFactory.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/CMSInterceptorStackFactory.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,20 +21,20 @@ */ package org.jboss.portal.test.cms.commands; +import org.jboss.portal.common.invocation.InterceptorStack; import org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory; -import org.jboss.portal.common.invocation.InterceptorStack; public class CMSInterceptorStackFactory extends JBossInterceptorStackFactory { - public CMSInterceptorStackFactory() - { - super(); - } - - public void setInterceptorStack(InterceptorStack stack) - { - this.stack = stack; - } + public CMSInterceptorStackFactory() + { + super(); + } + public void setInterceptorStack(InterceptorStack stack) + { + this.stack = stack; + } + } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/CMSInterceptorStackFactory.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -54,7 +54,7 @@ String sJPG = "/hibernate_logo.gif"; String sText = "/training.txt"; - + String foreignArchive = "resources/test/jcr/prueba.zip"; @@ -108,12 +108,12 @@ Folder whopper3 = (Folder)service.execute(listCMD3); List folders3 = whopper3.getFolders(); List files3 = whopper3.getFiles(); - + //Create and Test an archive containing foreign files is = IOTools.safeBufferedWrapper(new FileInputStream(this.foreignArchive)); storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en"); contentsToVersion = (List)service.execute(storearchiveCMD); - assertTrue("Foreign Archive Creation Failed",(contentsToVersion != null && !contentsToVersion.isEmpty() && contentsToVersion.size() == 2)); + assertTrue("Foreign Archive Creation Failed", (contentsToVersion != null && !contentsToVersion.isEmpty() && contentsToVersion.size() == 2)); is.close(); } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -31,7 +31,6 @@ import org.jboss.portal.cms.model.File; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -34,7 +34,6 @@ import javax.jcr.Node; import javax.jcr.Session; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -37,7 +37,6 @@ import javax.jcr.Node; import javax.jcr.Session; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -33,7 +33,6 @@ import javax.jcr.Session; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -31,7 +31,6 @@ import org.jboss.portal.cms.model.File; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -32,7 +32,6 @@ import java.util.List; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -75,29 +75,29 @@ public void testFileGetVersion() throws CMSException { createFile(); - + // get specific file version Command getCMDV = service.getCommandFactory().createFileGetCommand(sFilePath, "1.0", Locale.ENGLISH); File Vnewfile = (File)service.execute(getCMDV); assertTrue("Incorrect version number for file object", Vnewfile.getContent().getVersionNumber().equals("1.0")); - + //Update this file and create a new version that goes "LIVE" this.updateFile(Vnewfile); - + //Make sure a new version 1.1 is created and thats the one that is "LIVE" getCMDV = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH); Vnewfile = (File)service.execute(getCMDV); assertTrue("Incorrect version number for file object", Vnewfile.getContent().getVersionNumber().equals("1.1")); - + //Now switch to 1.0 as being the "LIVE" version Command makeLiveCommand = service.getCommandFactory().createMakeLiveVersionCommand(sFilePath, Locale.ENGLISH.getLanguage(), "1.0"); String liveVersion = (String)service.execute(makeLiveCommand); - assertEquals("Incorrect version number is 'LIVE'",liveVersion,"1.0"); - + assertEquals("Incorrect version number is 'LIVE'", liveVersion, "1.0"); + //Verify that 1.0 is the "LIVE" version and not 1.1 getCMDV = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH); Vnewfile = (File)service.execute(getCMDV); - assertEquals("Incorrect version number for file object ("+liveVersion+")", Vnewfile.getContent().getVersionNumber(), liveVersion); + assertEquals("Incorrect version number for file object (" + liveVersion + ")", Vnewfile.getContent().getVersionNumber(), liveVersion); } /** @@ -135,11 +135,8 @@ Command newFileSPCMD = service.getCommandFactory().createNewFileCommand(file, contentSP); service.execute(newFileSPCMD); } - - /** - * - * @throws CMSException - */ + + /** @throws CMSException */ private void updateFile(File updatedFile) throws CMSException { Command updateFileCMD = service.getCommandFactory().createUpdateFileCommand(updatedFile, updatedFile.getContent(), true); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -36,7 +36,6 @@ import javax.jcr.Property; import javax.jcr.Session; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -33,7 +33,6 @@ import java.util.Date; import java.util.Locale; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -32,7 +32,6 @@ import javax.jcr.Property; import javax.jcr.Session; import java.util.Date; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -27,7 +27,6 @@ import org.jboss.portal.cms.util.RepositoryUtil; import javax.jcr.Session; -import java.util.Map; /** Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -29,7 +29,6 @@ import org.jboss.portal.cms.model.Folder; import java.util.Date; -import java.util.Map; /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -32,7 +32,6 @@ import javax.jcr.Property; import javax.jcr.Session; import java.util.Date; -import java.util.Map; /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,22 +22,18 @@ ******************************************************************************/ package org.jboss.portal.test.cms.commands; -import java.util.List; - import junit.framework.TestSuite; - import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.Command; import org.jboss.portal.cms.model.File; import org.jboss.portal.search.FederatedQuery; -import org.jboss.portal.search.Query; import org.jboss.portal.search.impl.jcr.JCRQuery; import org.jboss.portal.search.impl.jcr.JCRQueryConverter; +import java.util.List; -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - */ + +/** @author <a href="mailto:theute@jboss.org">Thomas Heute</a> */ public class TestSearch extends AbstractCommandTestCase { @@ -54,9 +50,9 @@ public void testFileGet() throws CMSException { FederatedQuery query = new FederatedQuery("risks"); - + JCRQueryConverter converter = new JCRQueryConverter(); - + Command searchCMD = service.getCommandFactory().createSearchCommand((JCRQuery)converter.convert(query)); List list = (List)service.execute(searchCMD); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestSearch.java ___________________________________________________________________ Name: svn:keywords + Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/IdentityDataLoader.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/IdentityDataLoader.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/IdentityDataLoader.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.cms.security; -import javax.naming.InitialContext; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -32,94 +31,84 @@ import org.jboss.portal.identity.db.HibernateRoleImpl; import org.jboss.portal.identity.db.HibernateUserImpl; -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - * - */ +import javax.naming.InitialContext; + +/** @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> */ public class IdentityDataLoader { /** - * + * */ private IdentityServiceController identityServiceController = null; - + /** - * + * */ private String identitySessionFactory = null; - - /** - * - * @return - */ + + /** @return */ public IdentityServiceController getIdentityServiceController() { return this.identityServiceController; } - + public void setIdentityServiceController(IdentityServiceController identityServiceController) { this.identityServiceController = identityServiceController; } - - /** - * - * @return - */ + + /** @return */ public String getIdentitySessionFactory() { return identitySessionFactory; } - /** - * - * @param identitySessionFactory - */ + /** @param identitySessionFactory */ public void setIdentitySessionFactory(String identitySessionFactory) { this.identitySessionFactory = identitySessionFactory; } /** - * * + * */ public IdentityDataLoader() { - + } - + /** - * * + * */ public void start() throws Exception { SessionFactory sessionFactory = (SessionFactory)new InitialContext().lookup(this.identitySessionFactory); - this.loadData(sessionFactory,this.identityServiceController); + this.loadData(sessionFactory, this.identityServiceController); } - + /** - * + * */ public void stop() throws Exception { } - + /** - * * + * */ - private void loadData(SessionFactory sessionFactory,IdentityServiceController service) throws Exception + private void loadData(SessionFactory sessionFactory, IdentityServiceController service) throws Exception { UserModule userModule = (UserModule)service.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); - + Session session = sessionFactory.openSession(); Transaction tx = session.beginTransaction(); boolean success = false; try { - if(userModule.getUserCount()==0) + if (userModule.getUserCount() == 0) { // HibernateRoleImpl adminRole = new HibernateRoleImpl("Admin", "Administrators"); @@ -146,7 +135,7 @@ // user.getRoles().add(userRole); userRole.getUsers().add(user); - + //Another admin user besides the core admin user HibernateUserImpl sysAdmin = new HibernateUserImpl("sysadmin"); sysAdmin.setPassword(org.jboss.portal.common.util.Tools.md5AsHexString("sysadmin")); @@ -165,15 +154,15 @@ session.save(admin); session.save(user); session.save(sysAdmin); - + success = true; } } finally { - if(tx != null) + if (tx != null) { - if(success) + if (success) { tx.commit(); } @@ -182,10 +171,10 @@ tx.rollback(); } } - if(session != null) + if (session != null) { session.close(); } - } + } } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/IdentityDataLoader.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/SecureCommandTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/SecureCommandTestCase.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/SecureCommandTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,8 +21,6 @@ */ package org.jboss.portal.test.cms.security; -import javax.naming.InitialContext; - import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -32,19 +30,16 @@ import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.server.impl.invocation.JBossInterceptorStack; - import org.jboss.portal.test.cms.commands.AbstractCommandTestCase; import org.jboss.portal.test.cms.commands.CMSInterceptorStackFactory; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +import javax.naming.InitialContext; + +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public abstract class SecureCommandTestCase extends AbstractCommandTestCase -{ +{ /** - * + * */ public SecureCommandTestCase() { @@ -52,16 +47,16 @@ } /** - * + * */ public void setUp() throws Exception { //override the configration location to include workflow services this.configuration = "org/jboss/portal/cms/jboss-beans-security.xml"; super.setUp(); - + ACLInterceptor aclInterceptor = this.getACLInterceptor(); - + //Setup the interceptor stack CMSInterceptorStackFactory stackFactory = new CMSInterceptorStackFactory(); Interceptor[] interceptors = new Interceptor[1]; @@ -70,38 +65,32 @@ stackFactory.setInterceptorStack(stack); this.service.setStackFactory(stackFactory); - + //Register the IdentityService with the JCR service IdentityServiceController identityService = ((AuthorizationProviderImpl)aclInterceptor.getAuthorizationManager().getProvider()). - getIdentityServiceController(); - this.service.setIdentityServiceController(identityService); + getIdentityServiceController(); + this.service.setIdentityServiceController(identityService); } - + /** - * + * */ public void tearDown() throws Exception - { + { super.tearDown(); } - - /** - * - * @return - */ + + /** @return */ protected ACLInterceptor getACLInterceptor() throws Exception - { + { ACLInterceptor aclInterceptor = (ACLInterceptor)new InitialContext().lookup("java:/portal/cms/ACLInterceptor"); return aclInterceptor; - } - - /** - * - * @param username - */ + } + + /** @param username */ protected void runAs(String username) throws Exception - { + { SessionFactory sessionFactory = (SessionFactory)new InitialContext().lookup("java:/SessionFactory"); Session session = sessionFactory.openSession(); Transaction tx = session.beginTransaction(); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/SecureCommandTestCase.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestManageAccess.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestManageAccess.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestManageAccess.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -25,46 +25,38 @@ import junit.framework.TestSuite; import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.Folder; import org.jboss.portal.cms.impl.FolderImpl; +import org.jboss.portal.cms.model.Folder; - import java.util.Date; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public class TestManageAccess extends SecureCommandTestCase { String rejectPath = "/default/private"; String allowedPath = "/default/images"; String supportPath = "/default/support.html"; String copyPath = "/support.html"; - + /** - * - * + * + * */ public TestManageAccess() { } /** - * - * + * + * */ public static TestSuite suite() throws Exception { return createTestSuite(TestManageAccess.class); } - - /** - * - * @return - */ + + /** @return */ private Folder getNewPublicFolder() { //create folder object @@ -75,14 +67,11 @@ folder.setLastModified(new Date()); folder.setName("images"); folder.setBasePath(this.allowedPath); - + return folder; } - - /** - * - * @return - */ + + /** @return */ private Folder getNewProtectedFolder() { //create folder object @@ -93,23 +82,23 @@ folder.setLastModified(new Date()); folder.setName("private"); folder.setBasePath(this.rejectPath); - + return folder; } - - + + /** - * * + * */ private void runManageScenario(Folder folder) throws CMSException - { + { //Copy the specified folder String copySrc = folder.getBasePath(); String copyDest = folder.getBasePath() + "/" + "copy"; - Command copyCommand = this.service.getCommandFactory().createCopyCommand(copySrc,copyDest); + Command copyCommand = this.service.getCommandFactory().createCopyCommand(copySrc, copyDest); this.service.execute(copyCommand); - + //Assert the copy execution Command get = this.service.getCommandFactory().createFolderGetCommand(copySrc); Folder copyFrom = (Folder)this.service.execute(get); @@ -117,13 +106,13 @@ Folder copyTo = (Folder)this.service.execute(get); assertNotNull(copyFrom); assertNotNull(copyTo); - + //Move a folder String moveSrc = copyDest; String moveDest = folder.getBasePath() + "/" + "move"; - Command moveCommand = this.service.getCommandFactory().createMoveCommand(moveSrc,moveDest); + Command moveCommand = this.service.getCommandFactory().createMoveCommand(moveSrc, moveDest); this.service.execute(moveCommand); - + //Assert the move execution get = this.service.getCommandFactory().createFolderGetCommand(moveSrc); Folder moveFrom = (Folder)this.service.execute(get); @@ -131,30 +120,27 @@ Folder moveTo = (Folder)this.service.execute(get); assertNull(moveFrom); assertNotNull(moveTo); - + //Delete the folder - String delete = moveDest; + String delete = moveDest; Command deleteCommand = this.service.getCommandFactory().createDeleteCommand(delete); this.service.execute(deleteCommand); - + //Assert delete execution get = this.service.getCommandFactory().createFolderGetCommand(delete); - Folder deletedFolder = (Folder)this.service.execute(get); + Folder deletedFolder = (Folder)this.service.execute(get); assertNull(deletedFolder); } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testAnonymous() throws Exception - { + { // first run against non-access scenario try { this.runManageScenario(this.getNewProtectedFolder()); assertTrue("Access should not have been granted to" + this.rejectPath, - false); + false); } catch (CMSException cme) { @@ -168,8 +154,8 @@ try { this.runManageScenario(this.getNewPublicFolder()); - assertTrue("Access should not have been granted to" + this.rejectPath, - false); + assertTrue("Access should not have been granted to" + this.rejectPath, + false); } catch (CMSException cme) { @@ -179,20 +165,17 @@ } } - /** - * - * @throws Exception - */ + /** @throws Exception */ public void testUser() throws Exception { this.runAs("user"); - + // first run against non-access scenario try { this.runManageScenario(this.getNewProtectedFolder()); assertTrue("Access should not have been granted to" + this.rejectPath, - false); + false); } catch (CMSException cme) { @@ -205,7 +188,7 @@ //for anonymous, this should still result in an access denied try { - this.runManageScenario(this.getNewPublicFolder()); + this.runManageScenario(this.getNewPublicFolder()); } catch (CMSException cme) { @@ -214,15 +197,12 @@ assertTrue(cmeMessage.indexOf("Access to this resource is denied") != -1); } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testAdmin() throws Exception { this.runAs("admin"); - + // first run against non-access scenario try { @@ -248,34 +228,31 @@ assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testCopyToDeniedDestination() throws Exception { this.runAs("user"); - + //Copy the file to the folder try { - Command copyCommand = this.service.getCommandFactory().createCopyCommand(this.supportPath,this.copyPath); + Command copyCommand = this.service.getCommandFactory().createCopyCommand(this.supportPath, this.copyPath); this.service.execute(copyCommand); - + //Make sure copy operation did not happen //I should not get here assertTrue(false); } - catch(CMSException cme) + catch (CMSException cme) { String cmeMessage = cme.toString(); - if(cmeMessage.indexOf("Access to this resource is denied") != -1) + if (cmeMessage.indexOf("Access to this resource is denied") != -1) { //Make sure copy operation did not happen Command exists = (Command)this.service.getCommandFactory().createItemExistsCommand(this.copyPath); boolean existsValue = ((Boolean)this.service.execute(exists)).booleanValue(); - assertFalse(existsValue); + assertFalse(existsValue); } else { @@ -283,35 +260,32 @@ } } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testMoveToDeniedDestination() throws Exception { this.runAs("user"); - + //Move the file from the folder try { - Command moveCommand = this.service.getCommandFactory().createMoveCommand(this.supportPath,this.copyPath); + Command moveCommand = this.service.getCommandFactory().createMoveCommand(this.supportPath, this.copyPath); this.service.execute(moveCommand); - + //Make sure copy operation did not happen //I should not get here assertTrue(false); } - catch(CMSException cme) + catch (CMSException cme) { String cmeMessage = cme.toString(); - if(cmeMessage.indexOf("Access to this resource is denied") != -1) + if (cmeMessage.indexOf("Access to this resource is denied") != -1) { //Make sure move operation didnot happen Command exists = (Command)this.service.getCommandFactory().createItemExistsCommand(this.copyPath); boolean existsValue = ((Boolean)this.service.execute(exists)).booleanValue(); assertFalse(existsValue); - + exists = (Command)this.service.getCommandFactory().createItemExistsCommand(this.supportPath); existsValue = ((Boolean)this.service.execute(exists)).booleanValue(); assertTrue(existsValue); Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestManageAccess.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestReadAccess.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestReadAccess.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestReadAccess.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,20 +22,16 @@ ******************************************************************************/ package org.jboss.portal.test.cms.security; -import java.util.List; import junit.framework.TestSuite; import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.Folder; import org.jboss.portal.cms.model.File; +import org.jboss.portal.cms.model.Folder; +import java.util.List; import java.util.Locale; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public class TestReadAccess extends SecureCommandTestCase { String rejectFolderPath = "/default/private"; @@ -44,45 +40,44 @@ String allowedFilePath = "/default/images/check.gif"; /** - * - * + * + * */ public TestReadAccess() { } /** - * - * + * + * */ public static TestSuite suite() throws Exception { return createTestSuite(TestReadAccess.class); } - - + + /** - * * + * */ private void runFileScenario(String filePath) throws CMSException - { + { //Get the specified file - Command get = this.service.getCommandFactory().createFileGetCommand(filePath,new Locale(this.service.getDefaultLocale())); + Command get = this.service.getCommandFactory().createFileGetCommand(filePath, new Locale(this.service.getDefaultLocale())); File file = (File)this.service.execute(get); assertNotNull(file); - assertEquals(file.getBasePath(),filePath); - + assertEquals(file.getBasePath(), filePath); + //Get a list of file versions get = this.service.getCommandFactory() - .createFileGetListCommand(filePath); + .createFileGetListCommand(filePath); List versions = (List)this.service.execute(get); assertNotNull(versions); - assertTrue(versions.size()>0); + assertTrue(versions.size() > 0); } - + /** - * * @param folderPath * @throws CMSException */ @@ -92,27 +87,24 @@ Command get = this.service.getCommandFactory().createFolderGetCommand(folderPath); Folder folder = (Folder)this.service.execute(get); assertNotNull(folder); - assertEquals(folder.getBasePath(),folderPath); - + assertEquals(folder.getBasePath(), folderPath); + //Get the specified folder list get = this.service.getCommandFactory().createFolderGetListCommand(folderPath); Folder folderList = (Folder)this.service.execute(get); assertNotNull(folderList); - assertTrue(folderList.getFolders()!=null || folderList.getFiles()!=null); + assertTrue(folderList.getFolders() != null || folderList.getFiles() != null); } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testAnonymous() throws Exception - { + { try { - this.runFileScenario(this.rejectFilePath); + this.runFileScenario(this.rejectFilePath); assertTrue("Access should not have been granted to" + this.rejectFilePath, - false); + false); } catch (CMSException cme) { @@ -120,12 +112,12 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") != -1); } - + try { - this.runFolderScenario(this.rejectFolderPath); + this.runFolderScenario(this.rejectFolderPath); assertTrue("Access should not have been granted to" + this.rejectFolderPath, - false); + false); } catch (CMSException cme) { @@ -136,7 +128,7 @@ try { - this.runFileScenario(this.allowedFilePath); + this.runFileScenario(this.allowedFilePath); } catch (CMSException cme) { @@ -144,10 +136,10 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } - + try { - this.runFolderScenario(this.allowedFolderPath); + this.runFolderScenario(this.allowedFolderPath); } catch (CMSException cme) { @@ -157,19 +149,16 @@ } } - /** - * - * @throws Exception - */ + /** @throws Exception */ public void testUser() throws Exception - { + { this.runAs("user"); - + try { - this.runFileScenario(this.rejectFilePath); + this.runFileScenario(this.rejectFilePath); assertTrue("Access should not have been granted to" + this.rejectFilePath, - false); + false); } catch (CMSException cme) { @@ -177,12 +166,12 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") != -1); } - + try { - this.runFolderScenario(this.rejectFolderPath); + this.runFolderScenario(this.rejectFolderPath); assertTrue("Access should not have been granted to" + this.rejectFolderPath, - false); + false); } catch (CMSException cme) { @@ -193,7 +182,7 @@ try { - this.runFileScenario(this.allowedFilePath); + this.runFileScenario(this.allowedFilePath); } catch (CMSException cme) { @@ -201,10 +190,10 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } - + try { - this.runFolderScenario(this.allowedFolderPath); + this.runFolderScenario(this.allowedFolderPath); } catch (CMSException cme) { @@ -213,18 +202,15 @@ assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testAdmin() throws Exception - { + { this.runAs("admin"); - + try { - this.runFileScenario(this.rejectFilePath); + this.runFileScenario(this.rejectFilePath); } catch (CMSException cme) { @@ -232,10 +218,10 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } - + try { - this.runFolderScenario(this.rejectFolderPath); + this.runFolderScenario(this.rejectFolderPath); } catch (CMSException cme) { @@ -246,7 +232,7 @@ try { - this.runFileScenario(this.allowedFilePath); + this.runFileScenario(this.allowedFilePath); } catch (CMSException cme) { @@ -254,10 +240,10 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } - + try { - this.runFolderScenario(this.allowedFolderPath); + this.runFolderScenario(this.allowedFolderPath); } catch (CMSException cme) { Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestReadAccess.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestWriteAccess.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestWriteAccess.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestWriteAccess.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,25 +22,21 @@ ******************************************************************************/ package org.jboss.portal.test.cms.security; -import java.util.List; import junit.framework.TestSuite; import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.Folder; -import org.jboss.portal.cms.impl.FolderImpl; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.ContentImpl; +import org.jboss.portal.cms.impl.FileImpl; +import org.jboss.portal.cms.impl.FolderImpl; import org.jboss.portal.cms.model.Content; +import org.jboss.portal.cms.model.File; +import org.jboss.portal.cms.model.Folder; import java.util.Date; +import java.util.List; import java.util.Locale; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public class TestWriteAccess extends SecureCommandTestCase { String rejectPath = "/default/private"; @@ -48,26 +44,23 @@ String rootFolderPath = "/"; /** - * - * + * + * */ public TestWriteAccess() { } /** - * - * + * + * */ public static TestSuite suite() throws Exception { return createTestSuite(TestWriteAccess.class); } - - /** - * - * @return - */ + + /** @return */ private Folder getNewPublicFolder() { //create folder object @@ -77,15 +70,12 @@ folder.setTitle("Folder Title"); folder.setLastModified(new Date()); folder.setName("Unit Test"); - folder.setBasePath(this.allowedPath+"/"+folder.getName()); - + folder.setBasePath(this.allowedPath + "/" + folder.getName()); + return folder; } - - /** - * - * @return - */ + + /** @return */ private Folder getNewProtectedFolder() { //create folder object @@ -95,15 +85,12 @@ folder.setTitle("Folder Title"); folder.setLastModified(new Date()); folder.setName("Unit Test"); - folder.setBasePath(this.rejectPath+"/"+folder.getName()); - + folder.setBasePath(this.rejectPath + "/" + folder.getName()); + return folder; } - - /** - * - * @return - */ + + /** @return */ private Folder getNewRootFolder() { //create folder object @@ -113,20 +100,19 @@ folder.setTitle("Folder Title"); folder.setLastModified(new Date()); folder.setName("Unit Test"); - folder.setBasePath(this.rootFolderPath+folder.getName()); - + folder.setBasePath(this.rootFolderPath + folder.getName()); + return folder; } - + /** - * * @param folder * @return */ - private File getFile(Folder folder,String fileName,String data) + private File getFile(Folder folder, String fileName, String data) { File file = new FileImpl(); - file.setBasePath(folder.getBasePath()+"/"+fileName); + file.setBasePath(folder.getBasePath() + "/" + fileName); Content content = new ContentImpl(); content.setEncoding("UTF-8"); @@ -136,90 +122,87 @@ content.setBytes(data.getBytes()); content.setMimeType("text/html"); file.setContent(Locale.ENGLISH, content); - + return file; } - + /** - * * + * */ private void runWriteScenario(Folder folder) throws CMSException - { + { //Create a new folder Command newFolder = this.service.getCommandFactory().createFolderSaveCommand(folder); this.service.execute(newFolder); - + //Assert the successfull creation of the folder Command get = service.getCommandFactory().createFolderGetCommand(folder.getBasePath()); - Folder assertFolder = (Folder) service.execute(get); + Folder assertFolder = (Folder)service.execute(get); assertNotNull(assertFolder); - assertEquals(folder.getDescription(),assertFolder.getDescription()); - assertEquals(folder.getName(),assertFolder.getName()); - assertEquals(folder.getBasePath(),assertFolder.getBasePath()); - + assertEquals(folder.getDescription(), assertFolder.getDescription()); + assertEquals(folder.getName(), assertFolder.getName()); + assertEquals(folder.getBasePath(), assertFolder.getBasePath()); + //Create a new file into the newly created folder - File file = this.getFile(assertFolder,"testFile.html","newdata"); - Command newFile = this.service.getCommandFactory().createNewFileCommand(file,file.getContent()); + File file = this.getFile(assertFolder, "testFile.html", "newdata"); + Command newFile = this.service.getCommandFactory().createNewFileCommand(file, file.getContent()); this.service.execute(newFile); - + //Assert the creation of the new file - get = this.service.getCommandFactory().createFileGetCommand(file.getBasePath(),file.getContent().getLocale()); + get = this.service.getCommandFactory().createFileGetCommand(file.getBasePath(), file.getContent().getLocale()); File assertFile = (File)this.service.execute(get); assertNotNull(assertFile); - assertEquals(file.getBasePath(),assertFile.getBasePath()); - assertEquals(new String(file.getContent().getBytes()),new String(assertFile.getContent().getBytes())); - + assertEquals(file.getBasePath(), assertFile.getBasePath()); + assertEquals(new String(file.getContent().getBytes()), new String(assertFile.getContent().getBytes())); + //Update the newly created file file = assertFile; file.getContent().setBytes(new String("updateddata").getBytes()); - Command updateFile = this.service.getCommandFactory().createUpdateFileCommand(file,file.getContent(),true); + Command updateFile = this.service.getCommandFactory().createUpdateFileCommand(file, file.getContent(), true); this.service.execute(updateFile); - + //Assert the updated file - get = this.service.getCommandFactory().createFileGetCommand(file.getBasePath(),file.getContent().getLocale()); + get = this.service.getCommandFactory().createFileGetCommand(file.getBasePath(), file.getContent().getLocale()); assertFile = (File)this.service.execute(get); assertNotNull(assertFile); - assertEquals(file.getBasePath(),assertFile.getBasePath()); - assertEquals(new String(file.getContent().getBytes()),new String(assertFile.getContent().getBytes())); - + assertEquals(file.getBasePath(), assertFile.getBasePath()); + assertEquals(new String(file.getContent().getBytes()), new String(assertFile.getContent().getBytes())); + //Get the versions of the file get = this.service.getCommandFactory().createContentGetVersionsCommand(file.getContent().getBasePath()); List before = (List)this.service.execute(get); - + //Create a new version of this file - file = this.getFile(folder,"testFile.html","newversion"); + file = this.getFile(folder, "testFile.html", "newversion"); Command fileUpdate = this.service.getCommandFactory().createFileUpdateCommand(file); - Command createNewVersion = this.service.getCommandFactory().createContentCreateNewVersionCommand(file.getContent(),true); + Command createNewVersion = this.service.getCommandFactory().createContentCreateNewVersionCommand(file.getContent(), true); this.service.execute(fileUpdate); this.service.execute(createNewVersion); - + //Assert new version creation - get = this.service.getCommandFactory().createFileGetCommand(file.getBasePath(),file.getContent().getLocale()); + get = this.service.getCommandFactory().createFileGetCommand(file.getBasePath(), file.getContent().getLocale()); assertFile = (File)this.service.execute(get); assertNotNull(assertFile); - assertEquals(file.getBasePath(),assertFile.getBasePath()); - assertEquals(new String(file.getContent().getBytes()),new String(assertFile.getContent().getBytes())); - + assertEquals(file.getBasePath(), assertFile.getBasePath()); + assertEquals(new String(file.getContent().getBytes()), new String(assertFile.getContent().getBytes())); + //Assert number of versions after get = this.service.getCommandFactory().createContentGetVersionsCommand(file.getContent().getBasePath()); List after = (List)this.service.execute(get); - assertEquals(before.size()+1,after.size()); + assertEquals(before.size() + 1, after.size()); } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testAnonymous() throws Exception - { + { // first run against non-access scenario try { this.runWriteScenario(this.getNewProtectedFolder()); assertTrue("Access should not have been granted to" + this.rejectPath, - false); + false); } catch (CMSException cme) { @@ -233,8 +216,8 @@ try { this.runWriteScenario(this.getNewPublicFolder()); - assertTrue("Access should not have been granted to" + this.rejectPath, - false); + assertTrue("Access should not have been granted to" + this.rejectPath, + false); } catch (CMSException cme) { @@ -244,20 +227,17 @@ } } - /** - * - * @throws Exception - */ + /** @throws Exception */ public void testUser() throws Exception { this.runAs("user"); - + // first run against non-access scenario try { this.runWriteScenario(this.getNewProtectedFolder()); assertTrue("Access should not have been granted to" + this.rejectPath, - false); + false); } catch (CMSException cme) { @@ -270,7 +250,7 @@ //for anonymous, this should still result in an access denied try { - this.runWriteScenario(this.getNewPublicFolder()); + this.runWriteScenario(this.getNewPublicFolder()); } catch (CMSException cme) { @@ -279,15 +259,12 @@ assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testAdmin() throws Exception { this.runAs("admin"); - + // first run against non-access scenario try { @@ -312,7 +289,7 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } - + //now run against scenario where access should be granted for a registered user //for anonymous, this should still result in an access denied try @@ -326,15 +303,12 @@ assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void testSysAdmin() throws Exception { this.runAs("sysadmin"); - + // first run against non-access scenario try { @@ -359,8 +333,7 @@ String cmeMessage = cme.toString(); assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1); } - - + //now run against scenario where access should be granted for a registered user //for anonymous, this should still result in an access denied try Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/security/TestWriteAccess.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/AbstractWorkflowTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/AbstractWorkflowTestCase.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/AbstractWorkflowTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,12 +21,12 @@ */ package org.jboss.portal.test.cms.workflow; -import javax.naming.InitialContext; - import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor; +import org.jboss.portal.cms.workflow.ApprovePublish; +import org.jboss.portal.cms.workflow.ApprovePublishImpl; import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityServiceController; @@ -34,21 +34,16 @@ import org.jboss.portal.identity.db.HibernateRoleImpl; import org.jboss.portal.identity.db.HibernateUserImpl; import org.jboss.portal.server.impl.invocation.JBossInterceptorStack; -import org.jboss.portal.cms.workflow.ApprovePublish; -import org.jboss.portal.cms.workflow.ApprovePublishImpl; - import org.jboss.portal.test.cms.commands.AbstractCommandTestCase; import org.jboss.portal.test.cms.commands.CMSInterceptorStackFactory; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +import javax.naming.InitialContext; + +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public abstract class AbstractWorkflowTestCase extends AbstractCommandTestCase -{ +{ /** - * + * */ public AbstractWorkflowTestCase() { @@ -56,21 +51,21 @@ } /** - * + * */ public void setUp() throws Exception { //override the configration location to include workflow services - this.configuration = "org/jboss/portal/cms/jboss-beans-workflow.xml"; + this.configuration = "org/jboss/portal/cms/jboss-beans-workflow.xml"; super.setUp(); - + ApprovalWorkflowInterceptor workflowInterceptor = this.getApprovalWorkflowInterceptor(); ApprovePublish approvePublish = this.getApprovePublish(); IdentityServiceController identityService = ((ApprovePublishImpl)approvePublish).getIdentityServiceController(); - + //Setup bootstrapped Identity data into the Identity store SessionFactory sessionFactory = (SessionFactory)new InitialContext().lookup("java:/SessionFactory"); - this.loadData(sessionFactory,identityService); + this.loadData(sessionFactory, identityService); //Setup the interceptor stack CMSInterceptorStackFactory stackFactory = new CMSInterceptorStackFactory(); @@ -83,28 +78,24 @@ this.service.setApprovePublishWorkflow(approvePublish); this.service.setIdentityServiceController(identityService); } - + /** - * + * */ public void tearDown() throws Exception { super.tearDown(); } - - /** - * - * @return - */ + + /** @return */ protected ApprovalWorkflowInterceptor getApprovalWorkflowInterceptor() throws Exception - { + { ApprovalWorkflowInterceptor approvalWorkflowInterceptor = (ApprovalWorkflowInterceptor)new InitialContext().lookup("java:/portal/cms/ApprovalWorkflowInterceptor"); return approvalWorkflowInterceptor; - } - + } + /** - * * @return * @throws Exception */ @@ -112,21 +103,21 @@ { return (ApprovePublish)new InitialContext().lookup("java:/portal/ApprovePublishWorkflow"); } - + /** - * * + * */ - private void loadData(SessionFactory sessionFactory,IdentityServiceController service) throws Exception + private void loadData(SessionFactory sessionFactory, IdentityServiceController service) throws Exception { UserModule userModule = (UserModule)service.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); - + Session session = sessionFactory.openSession(); Transaction tx = session.beginTransaction(); boolean success = false; try { - if(userModule.getUserCount()==0) + if (userModule.getUserCount() == 0) { // HibernateRoleImpl adminRole = new HibernateRoleImpl("Admin", "Administrators"); @@ -159,15 +150,15 @@ session.save(userRole); session.save(admin); session.save(user); - + success = true; } } finally { - if(tx != null) + if (tx != null) { - if(success) + if (success) { tx.commit(); } @@ -176,10 +167,10 @@ tx.rollback(); } } - if(session != null) + if (session != null) { session.close(); } - } + } } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/AbstractWorkflowTestCase.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestApprovedPublish.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestApprovedPublish.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestApprovedPublish.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,35 +22,30 @@ ******************************************************************************/ package org.jboss.portal.test.cms.workflow; -import java.util.Locale; -import java.util.Collection; -import java.util.Set; -import javax.naming.InitialContext; - -import org.hibernate.SessionFactory; +import junit.framework.TestSuite; import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.Transaction; -import junit.framework.TestSuite; - import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.cms.model.Content; -import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.ContentImpl; -import org.jboss.portal.cms.workflow.ApprovePublish; +import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.jcr.JCRCMS; +import org.jboss.portal.cms.model.Content; +import org.jboss.portal.cms.model.File; +import org.jboss.portal.cms.workflow.ApprovePublish; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +import javax.naming.InitialContext; +import java.util.Collection; +import java.util.Locale; +import java.util.Set; + +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public class TestApprovedPublish extends AbstractWorkflowTestCase { private String file = "/default/workflow.html"; private Transaction tx = null; private Session session = null; - + /** * * @@ -67,41 +62,38 @@ { return createTestSuite(TestApprovedPublish.class); } - + /** - * + * */ public void setUp() throws Exception { super.setUp(); JCRCMS.turnOnWorkflow(); - + SessionFactory sessionFactory = (SessionFactory)new InitialContext().lookup("java:/SessionFactory"); this.session = sessionFactory.openSession(); this.tx = session.beginTransaction(); } - + /** - * + * */ public void tearDown() throws Exception - { + { this.tx.commit(); this.session.close(); - - super.tearDown(); + + super.tearDown(); } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void test() throws Exception { //Execute file creation as a regular user/non-manager this.runAs("user"); - + //Add a new file to the CMS File file = new FileImpl(); file.setBasePath(this.file); @@ -114,81 +106,77 @@ content.setBytes("newdata".getBytes()); content.setMimeType("text/html"); file.setContent(Locale.ENGLISH, content); - + Command newFileCommand = this.service.getCommandFactory().createNewFileCommand(file, content); this.service.execute(newFileCommand); - + //Make sure this resource is not published into the CMS yet Command fileGet = this.service.getCommandFactory().createFileGetCommand(this.file, Locale.ENGLISH); File assertFile = (File)this.service.execute(fileGet); assertNull(assertFile.getContent()); - + //Check the pending queue for this file ApprovePublish approvePublish = this.service.getApprovePublishWorkflow(); - Collection queueItems = approvePublish.getPendingQueue(this.file); + Collection queueItems = approvePublish.getPendingQueue(this.file); assertNotNull(queueItems); - assertEquals(1,queueItems.size()); - + assertEquals(1, queueItems.size()); + //Approve and publish this file into the CMS Set managers = approvePublish.getManagers(); String manager = (String)managers.iterator().next(); org.jboss.portal.cms.workflow.Content pendingItem = (org.jboss.portal.cms.workflow.Content)queueItems.iterator().next(); approvePublish.processManagerResponse(Long.parseLong(pendingItem.getProcessId()), manager.toLowerCase(), true); - + //Make sure this resource is successfully published into the CMS, and removed from the pending queue assertFile = (File)this.service.execute(fileGet); assertNotNull(assertFile.getContent()); assertTrue(assertFile.getContent().isLive()); assertFalse(assertFile.getContent().isWaitingForPublishApproval()); - assertEquals(new String(assertFile.getContent().getBytes()),"newdata"); + assertEquals(new String(assertFile.getContent().getBytes()), "newdata"); queueItems = approvePublish.getPendingQueue(this.file); - if(queueItems != null) + if (queueItems != null) { assertTrue(queueItems.isEmpty()); } - + String currentLiveVersion = assertFile.getContent().getVersionNumber(); - - + //Now testing the update side of it //modify this file file.getContent().setBytes("updateddata".getBytes()); - Command updateFileCommand = this.service.getCommandFactory().createUpdateFileCommand(file,content,true); + Command updateFileCommand = this.service.getCommandFactory().createUpdateFileCommand(file, content, true); this.service.execute(updateFileCommand); - + //Make sure a new LIVE version of this resource is not published into the CMS assertFile = (File)this.service.execute(fileGet); - assertEquals(new String(assertFile.getContent().getBytes()),"newdata"); - assertEquals(assertFile.getContent().getVersionNumber(),currentLiveVersion); - + assertEquals(new String(assertFile.getContent().getBytes()), "newdata"); + assertEquals(assertFile.getContent().getVersionNumber(), currentLiveVersion); + //Checking pending queue for a version of this file to be approved queueItems = approvePublish.getPendingQueue(this.file); assertNotNull(queueItems); - assertEquals(1,queueItems.size()); - + assertEquals(1, queueItems.size()); + //Approve and publish this new version into the CMS pendingItem = (org.jboss.portal.cms.workflow.Content)queueItems.iterator().next(); - approvePublish.processManagerResponse(Long.parseLong(pendingItem.getProcessId()), manager.toLowerCase(),true); - + approvePublish.processManagerResponse(Long.parseLong(pendingItem.getProcessId()), manager.toLowerCase(), true); + //Check for the success of this publish, and removal from the pending queue assertFile = (File)this.service.execute(fileGet); assertFalse(assertFile.getContent().isWaitingForPublishApproval()); - assertEquals(new String(assertFile.getContent().getBytes()),"updateddata"); + assertEquals(new String(assertFile.getContent().getBytes()), "updateddata"); assertTrue(assertFile.getContent().getVersionNumber() != currentLiveVersion); queueItems = approvePublish.getPendingQueue(this.file); - if(queueItems != null) + if (queueItems != null) { assertTrue(queueItems.isEmpty()); } } - - /** - * - * @param username - */ + + /** @param username */ private void runAs(String username) throws Exception - { + { JCRCMS.getUserInfo().set(this.service.getUserModule().findUserByUserName(username)); } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestApprovedPublish.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestDeniedPublish.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestDeniedPublish.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestDeniedPublish.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,38 +22,32 @@ ******************************************************************************/ package org.jboss.portal.test.cms.workflow; -import java.util.Locale; -import java.util.Collection; -import java.util.Set; -import java.util.List; -import javax.naming.InitialContext; - -import org.hibernate.SessionFactory; +import junit.framework.TestSuite; import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.Transaction; - -import junit.framework.TestSuite; - import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.cms.model.Content; -import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.ContentImpl; -import org.jboss.portal.cms.workflow.ApprovePublish; +import org.jboss.portal.cms.impl.FileImpl; import org.jboss.portal.cms.impl.jcr.JCRCMS; +import org.jboss.portal.cms.model.Content; +import org.jboss.portal.cms.model.File; +import org.jboss.portal.cms.workflow.ApprovePublish; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ +import javax.naming.InitialContext; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Set; + +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public class TestDeniedPublish extends AbstractWorkflowTestCase { private String newFile = "/default/workflow.html"; private String updateFile = "/default/index.html"; private Transaction tx = null; private Session session = null; - + /** * * @@ -70,41 +64,38 @@ { return createTestSuite(TestDeniedPublish.class); } - + /** - * + * */ public void setUp() throws Exception { super.setUp(); JCRCMS.turnOnWorkflow(); - + SessionFactory sessionFactory = (SessionFactory)new InitialContext().lookup("java:/SessionFactory"); this.session = sessionFactory.openSession(); this.tx = session.beginTransaction(); } - + /** - * + * */ public void tearDown() throws Exception - { + { this.tx.commit(); this.session.close(); - - super.tearDown(); + + super.tearDown(); } - - /** - * - * @throws Exception - */ + + /** @throws Exception */ public void test() throws Exception { //Execute file creation as a regular user/non-manager this.runAs("user"); - + //Add a new file to the CMS File file = new FileImpl(); file.setBasePath(this.newFile); @@ -117,98 +108,92 @@ content.setBytes("newdata".getBytes()); content.setMimeType("text/html"); file.setContent(Locale.ENGLISH, content); - + Command newFileCommand = this.service.getCommandFactory().createNewFileCommand(file, content); this.service.execute(newFileCommand); - + //Make sure this resource is not published into the CMS yet Command fileGet = this.service.getCommandFactory().createFileGetCommand(this.newFile, Locale.ENGLISH); File assertFile = (File)this.service.execute(fileGet); assertNull(assertFile.getContent()); - + //Check the pending queue for this file ApprovePublish approvePublish = this.service.getApprovePublishWorkflow(); Collection queueItems = approvePublish.getPendingQueue(this.newFile); assertNotNull(queueItems); - assertEquals(1,queueItems.size()); - + assertEquals(1, queueItems.size()); + //Deny the publish of this file into the CMS Set managers = approvePublish.getManagers(); String manager = (String)managers.iterator().next(); org.jboss.portal.cms.workflow.Content pendingItem = (org.jboss.portal.cms.workflow.Content)queueItems.iterator().next(); approvePublish.processManagerResponse(Long.parseLong(pendingItem.getProcessId()), manager.toLowerCase(), false); - + //Make sure this resource is not published into the CMS, and removed from the pending queue assertFile = (File)this.service.execute(fileGet); - assertNull(assertFile.getContent()); + assertNull(assertFile.getContent()); queueItems = approvePublish.getPendingQueue(this.newFile); - if(queueItems != null) + if (queueItems != null) { assertTrue(queueItems.isEmpty()); } - - + //Check for the existence of a file to be updated first Command existsCommand = this.service.getCommandFactory().createItemExistsCommand(this.updateFile); Boolean exists = (Boolean)this.service.execute(existsCommand); assertTrue(exists.booleanValue()); - - + //Get the file to be updated - fileGet = this.service.getCommandFactory().createFileGetCommand(this.updateFile,new Locale(this.service.getDefaultLocale())); + fileGet = this.service.getCommandFactory().createFileGetCommand(this.updateFile, new Locale(this.service.getDefaultLocale())); File updateFile = (File)this.service.execute(fileGet); assertNotNull(updateFile); assertNotNull(updateFile.getContent()); assertTrue(updateFile.getContent().isLive()); - + //Get some data related to this CMS in the file before sending in an update Command getVersions = this.service.getCommandFactory().createContentGetVersionsCommand(updateFile.getContent().getBasePath()); - List versions = (List)this.service.execute(getVersions); + List versions = (List)this.service.execute(getVersions); String oldLiveVersion = updateFile.getContent().getVersionNumber(); String oldContent = new String(updateFile.getContent().getBytes()); - assertEquals(1,versions.size()); - + assertEquals(1, versions.size()); + //Peform the file update updateFile.getContent().setBytes("updateddata".getBytes()); - Command updateFileCommand = this.service.getCommandFactory().createUpdateFileCommand(updateFile,updateFile.getContent(),true); + Command updateFileCommand = this.service.getCommandFactory().createUpdateFileCommand(updateFile, updateFile.getContent(), true); this.service.execute(updateFileCommand); - - + //Make sure a new LIVE version of this resource is not published into the CMS assertFile = (File)this.service.execute(fileGet); versions = (List)this.service.execute(getVersions); - assertEquals(new String(assertFile.getContent().getBytes()),oldContent); - assertEquals(assertFile.getContent().getVersionNumber(),oldLiveVersion); - assertEquals(2,versions.size()); - + assertEquals(new String(assertFile.getContent().getBytes()), oldContent); + assertEquals(assertFile.getContent().getVersionNumber(), oldLiveVersion); + assertEquals(2, versions.size()); + //Checking pending queue for a version of this file to be approved queueItems = approvePublish.getPendingQueue(this.updateFile); assertNotNull(queueItems); - assertEquals(1,queueItems.size()); - + assertEquals(1, queueItems.size()); + //Deny publishing of this new version into the CMS pendingItem = (org.jboss.portal.cms.workflow.Content)queueItems.iterator().next(); - approvePublish.processManagerResponse(Long.parseLong(pendingItem.getProcessId()), manager.toLowerCase(),false); - + approvePublish.processManagerResponse(Long.parseLong(pendingItem.getProcessId()), manager.toLowerCase(), false); + //Check for the success of this denial, and removal from the pending queue assertFile = (File)this.service.execute(fileGet); versions = (List)this.service.execute(getVersions); - assertEquals(new String(assertFile.getContent().getBytes()),oldContent); - assertEquals(assertFile.getContent().getVersionNumber(),oldLiveVersion); - assertEquals(2,versions.size()); + assertEquals(new String(assertFile.getContent().getBytes()), oldContent); + assertEquals(assertFile.getContent().getVersionNumber(), oldLiveVersion); + assertEquals(2, versions.size()); queueItems = approvePublish.getPendingQueue(this.updateFile); - if(queueItems != null) + if (queueItems != null) { assertTrue(queueItems.isEmpty()); - } + } } - - /** - * - * @param username - */ + + /** @param username */ private void runAs(String username) throws Exception - { + { JCRCMS.getUserInfo().set(this.service.getUserModule().findUserByUserName(username)); } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestDeniedPublish.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestWorkflowEnvironment.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestWorkflowEnvironment.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestWorkflowEnvironment.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,26 +22,21 @@ ******************************************************************************/ package org.jboss.portal.test.cms.workflow; -import java.util.Set; - import junit.framework.Assert; import junit.framework.TestSuite; - import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.workflow.ApprovePublish; +import java.util.Set; -/** - * - * @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 - * - */ + +/** @author Sohil Shah - sohil.shah(a)jboss.com - Nov 30, 2006 */ public class TestWorkflowEnvironment extends AbstractWorkflowTestCase { String rejectPath = "/default/private/license.html"; String allowedPath = "/default/images/check.gif"; - + /** * * @@ -59,21 +54,18 @@ return createTestSuite(TestWorkflowEnvironment.class); } - /** - * - * @throws CMSException - */ + /** @throws CMSException */ public void test() throws Exception - { + { //Get the ApprovePublish service ApprovePublish service = this.getApprovePublish(); - + //Get the list of managers allowed to approve content Set managers = service.getManagers(); - + //Assert and make sure there is atleast one portal role that is allowed //to function of content manager Assert.assertNotNull(managers); - Assert.assertTrue(managers.size()>0); + Assert.assertTrue(managers.size() > 0); } } Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/workflow/TestWorkflowEnvironment.java ___________________________________________________________________ Name: svn:keywords + Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/hibernate/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/hibernate/domain.hbm.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/hibernate/domain.hbm.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -274,103 +274,103 @@ type="long" not-null="true"/> </class> - + <!-- mapping to persist CMS Fine Grained Security related objects --> <class name="org.jboss.portal.cms.security.PermRoleAssoc" table="jbp_cms_perm_role"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="roleId" - column="ROLE_ID" - type="string" - not-null="true" - /> + name="roleId" + column="ROLE_ID" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.PermUserAssoc" table="jbp_cms_perm_user"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="userId" - column="USER_ID" - type="string" - not-null="true" - /> + name="userId" + column="USER_ID" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.Criteria" table="jbp_cms_perm_criteria"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="name" - column="NAME" - type="string" - not-null="true" - /> + name="name" + column="NAME" + type="string" + not-null="true" + /> <property - name="value" - column="VALUE" - type="string" - not-null="true" - /> + name="value" + column="VALUE" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.Permission" table="jbp_cms_perm"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> - <!-- one-to-many association with the criteria object --> - <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan"> + <!-- one-to-many association with the criteria object --> + <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.Criteria"/> </set> - <!-- many-to-many association with the role object --> - <set name="roleAssoc" lazy="false" cascade="all-delete-orphan"> + <!-- many-to-many association with the role object --> + <set name="roleAssoc" lazy="false" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.PermRoleAssoc"/> </set> - <!-- many-to-many association with the user object --> - <set name="userAssoc" lazy="false" cascade="all-delete-orphan"> + <!-- many-to-many association with the user object --> + <set name="userAssoc" lazy="false" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.PermUserAssoc"/> </set> <property - name="service" - column="NAME" - type="string" - not-null="true" - /> + name="service" + column="NAME" + type="string" + not-null="true" + /> <property - name="action" - column="ACTION" - type="string" - not-null="true" - /> + name="action" + column="ACTION" + type="string" + not-null="true" + /> <property - name="negated" - column="NEGATED" - type="boolean" - not-null="true" - /> + name="negated" + column="NEGATED" + type="boolean" + not-null="true" + /> </class> </hibernate-mapping> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/hibernate/domain.hbm.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-security.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-security.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-security.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -79,7 +79,7 @@ <property name="identityServiceController"><inject bean="IdentityServiceController"/></property> <property name="identitySessionFactory">java:/SessionFactory</property> </bean> - + <!-- setup for cms security testing --> <bean name="AuthorizationProvider" class="org.jboss.portal.cms.security.AuthorizationProviderImpl"> <property name="identityServiceController"><inject bean="IdentityServiceController"/></property> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-security.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -163,8 +163,8 @@ <property name="defaultConfigFile">standardidentity-config.xml</property> <property name="registerMBeans">false</property> </bean> - - + + <!-- setup for cms workflow testing --> <bean name="WorkflowService" class="org.jboss.portal.workflow.service.WorkflowServiceImpl"> <property name="jbpmConfigurationXml"> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/index.html ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/private/license.html =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/private/license.html 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/private/license.html 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,38 +1,54 @@ <!-- begin: portlet content --> <table width="100%" border="0" cellpadding="2"> -<tr> -<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td> -<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td> -</tr> -<tr> -<td colspan="2"> -<table width="100%" border="0" cellpadding="2"> -<tr> -<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> -<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> -<a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a> -<br/> -The JBoss Subscription is a set of services and tools that assist you during every stage of the application lifecycle - from design and development, thru testing and deployment, to on-going management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to reduce business, legal, and technical risks while enabling you to more effectively utilize your team's resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of your JEMS-based projects. -</font></td> -</tr> -<tr> -<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> -<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> -<a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a> -<br/> -JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at various stages of the application lifecycle. All engagements are delivered by certified JEMS consultants. -</font></td> -</tr> -<tr> -<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> -<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> -<a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a> -<br/> -A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on JBoss Portal implementation. -</font></td> -</tr> + <tr> + <td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the + Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, + deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td> + <td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" border="0" cellpadding="2"> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + src="default/images/check.gif"></td> + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a> + <br/> + The JBoss Subscription is a set of services and tools that assist you during every stage of the + application lifecycle - from design and development, thru testing and deployment, to on-going + management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to + reduce business, legal, and technical risks while enabling you to more effectively utilize your team's + resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of + your JEMS-based projects. + </font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + src="default/images/check.gif"></td> + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a> + <br/> + JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at + various stages of the application lifecycle. All engagements are delivered by certified JEMS + consultants. + </font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + src="default/images/check.gif"></td> + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a> + <br/> + A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE + applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, + Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to + implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on + JBoss Portal implementation. + </font></td> + </tr> + </table> </table> -</table> <br/> <a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a> <!-- end: portlet content --> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/private/license.html ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/project.html =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/project.html 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/project.html 2007-10-28 01:09:21 UTC (rev 8785) @@ -8,61 +8,65 @@ </tr> <tr> <td colspan="2"> - <table width="100%" border="0" cellpadding="2"> - <tr> - <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + <table width="100%" border="0" cellpadding="2"> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> - <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> - <a href="http://labs.jboss.com/portal/jbossportal/index.html" target="_blank">JBoss Portal Home</a> - <br/> - The Epicenter of everything JBoss Portal.</font></td> - </tr> - <tr> - <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://labs.jboss.com/portal/jbossportal/index.html" target="_blank">JBoss Portal Home</a> + <br/> + The Epicenter of everything JBoss Portal.</font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> - <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> - <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">Documentation</a> - <br/> - Here you will find user documentation, reference documentation, tutorials, and javadoc.</font></td> - </tr> - <tr> - <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">Documentation</a> + <br/> + Here you will find user documentation, reference documentation, tutorials, and javadoc.</font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> - <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> - <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&... target="_blank">Forums</a> - <br/> - Our forums are the main channel of communication between all community - members. If you have any questions or concerns, please use - our <a href="http://www.jboss.org/index.html?module=bb&amp;op=viewforum... target="_blank">User - Forums</a>, <a href="/index.html?module=bb&amp;op=viewforum&amp;f=205" target="_blank">Developer - Forums</a>, or <a href="http://jboss.org/index.html?module=bb&op=viewforum&f=2... target="_blank">WSRP Forums</a> to voice them. Project developers and community members are always there to help. - </font></td> - </tr> - <tr> - <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&... target="_blank">Forums</a> + <br/> + Our forums are the main channel of communication between all community + members. If you have any questions or concerns, please use + our <a href="http://www.jboss.org/index.html?module=bb&amp;op=viewforum... target="_blank">User + Forums</a>, <a href="/index.html?module=bb&amp;op=viewforum&amp;f=205" target="_blank">Developer + Forums</a>, or <a href="http://jboss.org/index.html?module=bb&op=viewforum&f=2... target="_blank">WSRP + Forums</a> to voice them. Project developers and community members are always there to help. + </font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> - <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> - <a href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal" target="_blank">Wiki</a> - <br/> - Our wiki knowledge base is a user and developer contributed collection of important resources regarding - JBoss Portal.</font></td> - </tr> - <tr> - <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal" target="_blank">Wiki</a> + <br/> + Our wiki knowledge base is a user and developer contributed collection of important resources + regarding + JBoss Portal.</font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> - <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> - <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050&... target="_blank">Jira</a> - <br/> - JBoss Portal uses the JIRA tracking and project management system to organize and prioritize tasks.<br> - <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050&... target="_blank">JBoss Portal</a> - &nbsp;|&nbsp;<a + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050&... target="_blank">Jira</a> + <br/> + JBoss Portal uses the JIRA tracking and project management system to organize and prioritize + tasks.<br> + <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050&... target="_blank">JBoss + Portal</a> + &nbsp;|&nbsp;<a href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassia... target="_blank">Open Issues</a> - &nbsp;|&nbsp;<a + &nbsp;|&nbsp;<a href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassia... target="_blank">Roadmap</a></font></td> - </tr> - </table> + </tr> + </table> </table> <br/> <a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/project.html ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/support.html =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/support.html 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/support.html 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,38 +1,54 @@ <!-- begin: portlet content --> <table width="100%" border="0" cellpadding="2"> -<tr> -<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td> -<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td> -</tr> -<tr> -<td colspan="2"> -<table width="100%" border="0" cellpadding="2"> -<tr> -<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> -<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> -<a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a> -<br/> -The JBoss Subscription is a set of services and tools that assist you during every stage of the application lifecycle - from design and development, thru testing and deployment, to on-going management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to reduce business, legal, and technical risks while enabling you to more effectively utilize your team's resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of your JEMS-based projects. -</font></td> -</tr> -<tr> -<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> -<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> -<a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a> -<br/> -JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at various stages of the application lifecycle. All engagements are delivered by certified JEMS consultants. -</font></td> -</tr> -<tr> -<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td> -<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> -<a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a> -<br/> -A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on JBoss Portal implementation. -</font></td> -</tr> + <tr> + <td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the + Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, + deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td> + <td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td> + </tr> + <tr> + <td colspan="2"> + <table width="100%" border="0" cellpadding="2"> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + src="default/images/check.gif"></td> + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a> + <br/> + The JBoss Subscription is a set of services and tools that assist you during every stage of the + application lifecycle - from design and development, thru testing and deployment, to on-going + management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to + reduce business, legal, and technical risks while enabling you to more effectively utilize your team's + resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of + your JEMS-based projects. + </font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + src="default/images/check.gif"></td> + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a> + <br/> + JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at + various stages of the application lifecycle. All engagements are delivered by certified JEMS + consultants. + </font></td> + </tr> + <tr> + <td class="portlet-section-alternate" width="16" valign="top" align="left"><img + src="default/images/check.gif"></td> + <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"> + <a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a> + <br/> + A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE + applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, + Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to + implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on + JBoss Portal implementation. + </font></td> + </tr> + </table> </table> -</table> <br/> <a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a> <!-- end: portlet content --> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-content/default/support.html ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/datasource/ports01-ds.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/datasource/ports02-ds.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -58,12 +58,12 @@ <depends>portal:service=JAASLoginModule</depends> <depends>portal:service=Hibernate,type=CMS</depends> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> - + <!-- Add this to activate publish/approval workflow integration --> <!-- <depends optional-attribute-name="ApprovePublishWorkflow" proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> --> - + <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends> <attribute name="DoChecking">true</attribute> <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute> @@ -127,7 +127,7 @@ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> <param name="path" value="${wsp.home}/index"/> - <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter" /> + <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/> <param name="useCompoundFile" value="true"/> <param name="minMergeDocs" value="100"/> <param name="volatileIdleTime" value="3"/> @@ -432,7 +432,7 @@ <attribute name="CacheLoaderFetchPersistentState">false</attribute> <attribute name="CacheLoaderAsynchronous">false</attribute--> </mbean> - + <!-- interceptor factory where all cms interceptors are registered --> <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" @@ -444,8 +444,8 @@ <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> </depends-list> - </mbean> - + </mbean> + <!-- CMS Authorization Security Service --> <mbean code="org.jboss.portal.cms.security.AuthorizationManagerImpl" @@ -466,7 +466,7 @@ <xmbean/> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> </mbean> - + <!-- ACL Security Interceptor --> <mbean code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" @@ -519,7 +519,7 @@ <depends>portal:service=Hibernate,type=CMS</depends> <depends>portal:service=Module,type=IdentityServiceController</depends> </mbean> - + <!-- Approval Workflow Interceptor --> <mbean code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" @@ -530,7 +530,7 @@ <attribute name="JNDIName">java:/portal/cms/ApprovalWorkflowInterceptor</attribute> <depends>portal:service=Hibernate,type=CMS</depends> </mbean> - + <!-- logging interceptor --> <!--mbean code="org.jboss.portal.cms.impl.interceptors.LogInterceptor" @@ -539,7 +539,7 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean--> - + <!-- <mbean code="org.jboss.portal.cms.impl.interceptors.CacheInterceptor" Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -274,103 +274,103 @@ type="long" not-null="true"/> </class> - + <!-- mapping to persist CMS Fine Grained Security related objects --> <class name="org.jboss.portal.cms.security.PermRoleAssoc" table="jbp_cms_perm_role"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="roleId" - column="ROLE_ID" - type="string" - not-null="true" - /> + name="roleId" + column="ROLE_ID" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.PermUserAssoc" table="jbp_cms_perm_user"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="userId" - column="USER_ID" - type="string" - not-null="true" - /> + name="userId" + column="USER_ID" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.Criteria" table="jbp_cms_perm_criteria"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="name" - column="NAME" - type="string" - not-null="true" - /> + name="name" + column="NAME" + type="string" + not-null="true" + /> <property - name="value" - column="VALUE" - type="string" - not-null="true" - /> + name="value" + column="VALUE" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.Permission" table="jbp_cms_perm"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> - <!-- one-to-many association with the criteria object --> - <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan"> + <!-- one-to-many association with the criteria object --> + <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.Criteria"/> </set> - <!-- many-to-many association with the role object --> - <set name="roleAssoc" lazy="false" cascade="all-delete-orphan"> + <!-- many-to-many association with the role object --> + <set name="roleAssoc" lazy="false" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.PermRoleAssoc"/> </set> - <!-- many-to-many association with the user object --> - <set name="userAssoc" lazy="false" cascade="all-delete-orphan"> + <!-- many-to-many association with the user object --> + <set name="userAssoc" lazy="false" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.PermUserAssoc"/> </set> <property - name="service" - column="NAME" - type="string" - not-null="true" - /> + name="service" + column="NAME" + type="string" + not-null="true" + /> <property - name="action" - column="ACTION" - type="string" - not-null="true" - /> + name="action" + column="ACTION" + type="string" + not-null="true" + /> <property - name="negated" - column="NEGATED" - type="boolean" - not-null="true" - /> + name="negated" + column="NEGATED" + type="boolean" + not-null="true" + /> </class> </hibernate-mapping> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,9 +22,9 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!--<!DOCTYPE identity-configuration PUBLIC - "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" - "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> +<!--<!DOCTYPE identity-configuration PUBLIC +"-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" +"http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> <identity-configuration> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/domain-identity.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/domain-identity.hbm.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/domain-identity.hbm.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -30,10 +30,10 @@ name="org.jboss.portal.identity.db.HibernateUserImpl" table="jbp_users"> <!--<cache usage=&quot;@portal.hibernate.cache.usage(a)&quot;/&gt;--&gt; - <id - name="key" - column="jbp_uid" - type="java.lang.Long"> + <id + name="key" + column="jbp_uid" + type="java.lang.Long"> <generator class="native"> <param name="sequence">user_seq</param> </generator> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/domain-identity.hbm.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-ehcache.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-hibernate.cfg.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-hibernate.cfg.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,59 +1,60 @@ <?xml version='1.0' encoding='utf-8'?> <!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> <session-factory> <!-- jdbc connection properties --> - <property name="connection.datasource">java:/DefaultDS</property> + <property name="connection.datasource">java:/DefaultDS</property> - <!-- other hibernate properties --> - <property name="show_sql">false</property> + <!-- other hibernate properties --> + <property name="show_sql">false</property> <property name="hibernate.format_sql">true</property> <property name="hibernate.use_sql_comments">true</property> - <!-- caching properties --> - <property name="cache.use_second_level_cache">true</property> + <!-- caching properties --> + <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> <property name="cache.provider_configuration_file_resource_path">jbpm-ehcache.xml</property> <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> - <!-- managed environment transaction configuration --> - <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> + <!-- managed environment transaction configuration --> + <property + name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - - <!-- ############################################ --> - <!-- # mapping files with external dependencies # --> - <!-- ############################################ --> - <!-- following mapping file has a dependendy on --> - <!-- 'bsh-{version}.jar'. --> - <!-- uncomment this if you don't have bsh on your --> - <!-- classpath. you won't be able to use the --> - <!-- script element in process definition files --> - <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + <!-- ############################################ --> + <!-- # mapping files with external dependencies # --> + <!-- ############################################ --> - <!-- following mapping files have a dependendy on --> - <!-- 'jbpm-identity-{version}.jar', mapping files --> - <!-- of the pluggable jbpm identity component. --> - <!-- comment out the following 3 lines if you don't--> - <!-- want to use the default jBPM identity mgmgt --> - <!-- component --> - <mapping resource="org/jbpm/identity/User.hbm.xml"/> + <!-- following mapping file has a dependendy on --> + <!-- 'bsh-{version}.jar'. --> + <!-- uncomment this if you don't have bsh on your --> + <!-- classpath. you won't be able to use the --> + <!-- script element in process definition files --> + <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + + <!-- following mapping files have a dependendy on --> + <!-- 'jbpm-identity-{version}.jar', mapping files --> + <!-- of the pluggable jbpm identity component. --> + <!-- comment out the following 3 lines if you don't--> + <!-- want to use the default jBPM identity mgmgt --> + <!-- component --> + <mapping resource="org/jbpm/identity/User.hbm.xml"/> <mapping resource="org/jbpm/identity/Group.hbm.xml"/> <mapping resource="org/jbpm/identity/Membership.hbm.xml"/> - <!-- ###################### --> - <!-- # jbpm mapping files # --> - <!-- ###################### --> + <!-- ###################### --> + <!-- # jbpm mapping files # --> + <!-- ###################### --> - <!-- hql queries and type defs --> - <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/> + <!-- hql queries and type defs --> + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/> - <!-- graph.def mapping files --> - <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> + <!-- graph.def mapping files --> + <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/> <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/> <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> @@ -62,8 +63,8 @@ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/> <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/> - <!-- graph.node mapping files --> - <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <!-- graph.node mapping files --> + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> @@ -72,40 +73,40 @@ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> - <!-- context.def mapping files --> - <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <!-- context.def mapping files --> + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> - <!-- taskmgmt.def mapping files --> - <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <!-- taskmgmt.def mapping files --> + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> - <!-- module.def mapping files --> - <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> + <!-- module.def mapping files --> + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> - <!-- bytes mapping files --> - <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> + <!-- bytes mapping files --> + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> - <!-- file.def mapping files --> - <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> + <!-- file.def mapping files --> + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> - <!-- scheduler.def mapping files --> - <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <!-- scheduler.def mapping files --> + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> - <!-- graph.exe mapping files --> - <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> + <!-- graph.exe mapping files --> + <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/> <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> - <!-- module.exe mapping files --> - <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + <!-- module.exe mapping files --> + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> - <!-- context.exe mapping files --> - <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <!-- context.exe mapping files --> + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> @@ -117,25 +118,25 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- msg.db mapping files --> - <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <!-- msg.db mapping files --> + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/> - <!-- taskmgmt.exe mapping files --> - <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <!-- taskmgmt.exe mapping files --> + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> - <!-- scheduler.exe mapping files --> - <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> + <!-- scheduler.exe mapping files --> + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> - <!-- logging mapping files --> - <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <!-- logging mapping files --> + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jbpm-hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/fs-repository.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/fs-repository.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/fs-repository.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -41,7 +41,7 @@ </FileSystem> <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> <param name="path" value="${wsp.home}/index"/> - <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter" /> + <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/> <param name="useCompoundFile" value="true"/> <param name="minMergeDocs" value="100"/> <param name="volatileIdleTime" value="3"/> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/fs-repository.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/repository.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/repository.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/repository.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -75,9 +75,9 @@ <!-- XMLPersistenceManager: uses FileSystem for storage --> <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>--> - <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> + <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> <param name="path" value="${wsp.home}/index"/> - <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter" /> + <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/> <param name="useCompoundFile" value="true"/> <param name="minMergeDocs" value="100"/> <param name="volatileIdleTime" value="3"/> Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/jcr/repository.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/log4j.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/log4j.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/log4j.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -30,7 +30,7 @@ <!-- --> <!-- ===================================================================== --> -<!-- $Id: log4j.xml,v 1.26.2.10 2006/04/21 17:29:20 csuconic Exp $ --> +<!-- $Id$ --> <!-- | For more configuration infromation and examples see the Jakarta Log4j Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/log4j.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/pm-cache.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/standardidentity-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.bat =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.bat 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.bat 2007-10-28 01:09:21 UTC (rev 8785) @@ -8,7 +8,7 @@ rem @author Jason Dillon <jason(a)planet57.com&gt; rem -rem $Id: build.bat 1015 2005-11-04 20:15:13Z mholzner $ +rem $Id$ setlocal Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/build.bat ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.sh =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.sh 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.sh 2007-10-28 01:09:21 UTC (rev 8785) @@ -8,7 +8,7 @@ ## @author Jason Dillon <jason(a)planet57.com&gt; ## -# $Id: build.sh 1015 2005-11-04 20:15:13Z mholzner $ +# $Id$ PROGNAME=`basename $0` DIRNAME=`dirname $0` Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/build.sh ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-10-28 01:09:21 UTC (rev 8785) @@ -10,10 +10,10 @@ text-decoration: underline; } -div.admin-ui div.tab-container{ - border-bottom:1px solid #B3C0C7; - border-right:1px solid #B3C0C7; - border-left:1px solid #B3C0C7; +div.admin-ui div.tab-container { + border-bottom: 1px solid #B3C0C7; + border-right: 1px solid #B3C0C7; + border-left: 1px solid #B3C0C7; padding: 15px 0 10px 0; } @@ -411,11 +411,10 @@ border-top-style: solid; } - div.admin-ui div.wizard-tab-container { - border-bottom:1px solid #B3C0C7; - border-right:1px solid #B3C0C7; - border-left:1px solid #B3C0C7; + border-bottom: 1px solid #B3C0C7; + border-right: 1px solid #B3C0C7; + border-left: 1px solid #B3C0C7; padding: 0 0 10px 0; margin: 10px 0 0 0; } @@ -503,6 +502,6 @@ vertical-align: middle; } -.admin-ui .objectList img.windowStateIcon{ +.admin-ui .objectList img.windowStateIcon { margin: 0 5px 0 0; } Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -70,7 +70,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AdminPropertyResolver extends DelegatingPropertyResolver { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,17 +23,18 @@ package org.jboss.portal.core.admin.ui; import org.jboss.portal.common.util.Tools; +import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.faces.el.dynamic.AbstractDynamicBean; -import org.jboss.portal.faces.el.PropertyValue; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.RoleModule; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.security.spi.provider.SecurityConfigurationException; -import org.jboss.portal.identity.RoleModule; -import org.jboss.portal.identity.Role; -import org.jboss.portal.identity.IdentityException; import javax.faces.model.SelectItem; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -41,11 +42,10 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6252 $ + * @version $Revision$ */ public abstract class AuthorizationBean { @@ -178,7 +178,7 @@ try { Map map = new HashMap(); - for (Iterator i = getRoleModule().findRoles().iterator();i.hasNext();) + for (Iterator i = getRoleModule().findRoles().iterator(); i.hasNext();) { Role role = (Role)i.next(); String displayName = role.getDisplayName(); Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AuthorizationBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public class ControlPropertiesBean extends PropertyBeanContainer { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -30,7 +30,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ControlPropertyBean extends PropertyBean { @@ -56,7 +56,6 @@ // - // if (event.getNewValue().toString().equalsIgnoreCase("true")) { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertyBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -57,7 +57,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 6252 $ + * @version $Revision$ */ public class InstanceManagerBean { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -381,11 +381,13 @@ return theme; } - public Boolean getMaximizedStateExists() { + public Boolean getMaximizedStateExists() + { return maximizedStateExists; } - public void setMaximizedStateExists(Boolean maximizedStateExists) { + public void setMaximizedStateExists(Boolean maximizedStateExists) + { this.maximizedStateExists = maximizedStateExists; } @@ -527,7 +529,8 @@ selectedPlugin = (String)pmap.get("plugin"); } - public Map getRequestParameterMap(){ + public Map getRequestParameterMap() + { return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap(); } Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -55,7 +55,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 6252 $ + * @version $Revision$ */ public class PortletManagerBean { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,20 +22,20 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.value.StringValue; import org.jboss.portal.common.value.Value; -import org.jboss.portal.common.value.StringValue; -import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.faces.el.dynamic.DynamicBean; -import org.jboss.portal.faces.el.PropertyValue; import org.jboss.portal.portlet.info.PreferenceInfo; import javax.faces.event.ActionEvent; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PreferenceBean implements Comparable, DynamicBean { @@ -126,7 +126,7 @@ public List getIndices() { List list = new ArrayList(value.size()); - for (int i = 0;i < value.size();i++) + for (int i = 0; i < value.size(); i++) { list.add("index_" + i); } Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferenceBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.common.value.Value; -import java.util.List; import java.util.ArrayList; import java.util.Collections; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PreferencesBean { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PreferencesBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,17 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; -import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.admin.ui.actions.PropertyAction; +import org.jboss.portal.core.model.portal.PortalObject; import javax.faces.model.DataModel; import javax.faces.model.ListDataModel; import javax.faces.model.SelectItem; -import javax.faces.context.FacesContext; -import javax.faces.el.VariableResolver; import java.util.ArrayList; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.SortedMap; import java.util.TreeMap; @@ -40,7 +38,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PropertiesBean extends PropertyBeanContainer { @@ -78,7 +76,7 @@ boolean inheritable = selectedObject.getType() != PortalObject.TYPE_CONTEXT; // - for (Iterator i = selectedObject.getProperties().keySet().iterator();i.hasNext();) + for (Iterator i = selectedObject.getProperties().keySet().iterator(); i.hasNext();) { String propertyName = (String)i.next(); String propertyValue = selectedObject.getProperty(propertyName); @@ -135,7 +133,7 @@ if (items == null) { items = new ArrayList(); - for (Iterator i = info.getNames().iterator();i.hasNext();) + for (Iterator i = info.getNames().iterator(); i.hasNext();) { String propertyName = (String)i.next(); Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -37,7 +37,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:boleslaw dot dawidowicz at redhat dot com>Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PropertiesInfo { @@ -105,9 +105,7 @@ /** . */ private static final PropertyInfoSet ALL_PROPERTIES = new PropertyInfoSet(); - /** - * Just avoid to write put(propertyInfo.getName(), propertyInfo). - */ + /** Just avoid to write put(propertyInfo.getName(), propertyInfo). */ private static class PropertyInfoSet extends HashMap { public void add(PropertyInfo propertyInfo) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -28,7 +28,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PropertyBean implements Comparable { @@ -38,7 +38,7 @@ /** . */ private final PropertyBeanContainer container; - + /** . */ protected final PropertyInfo info; @@ -112,7 +112,7 @@ String parentValue = portalObject.getProperty(getName()); if (value.equals(parentValue)) { - return; + return; } } Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class PropertyBeanContainer { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBeanContainer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PropertyInfo { @@ -51,7 +51,7 @@ /** . */ private final int accessMode; - + /** . */ private final String type; @@ -73,7 +73,7 @@ this.type = type; this.scope = scope; } - + public LocalizedString getDisplayName() { return displayName; Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -33,7 +33,7 @@ * Refresh the beans before JSF performs the render. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ + * @version $Revision$ */ public class Refresher implements PhaseListener { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.theme.ThemeConstants; + import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; import javax.faces.event.ActionEvent; -import javax.faces.event.AbortProcessingException; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.theme.ThemeConstants; - /** * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> - * @version $Revision: 5448 $ + * @version $Revision$ */ public class ThemeBean { @@ -140,7 +140,7 @@ boolean successful = true; // - switch(portalObject.getType()) + switch (portalObject.getType()) { case PortalObject.TYPE_CONTEXT: case PortalObject.TYPE_PORTAL: @@ -162,7 +162,7 @@ if (successful) { String stringMessage = null; - switch(this.portalObject.getType()) + switch (this.portalObject.getType()) { case PortalObject.TYPE_PORTAL: stringMessage = "Theme has been correctly updated on the portal named: " + portalObject.getName(); Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ThemeBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5763 $ + * @version $Revision$ */ public class AddPageAction { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AddPageAction.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AssignContentToWindowAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AssignContentToWindowAction.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AssignContentToWindowAction.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -27,7 +27,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AssignContentToWindowAction { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/AssignContentToWindowAction.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -38,7 +38,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5915 $ + * @version $Revision$ */ public class CreateInstanceAction { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,13 +24,13 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.core.model.portal.PortalContainer; +import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Portal; +import org.jboss.portal.core.model.portal.PortalContainer; import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.model.portal.PortalObjectPermission; -import org.jboss.portal.core.model.portal.PortalObjectPath; -import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.spi.provider.DomainConfigurator; @@ -47,7 +47,7 @@ /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5763 $ + * @version $Revision$ */ public class PortalAction { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalAction.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,21 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import java.util.Map; - import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.impl.model.portal.PortalObjectImpl; -import org.jboss.portal.core.model.portal.PortalObject; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.validator.ValidatorException; -import javax.faces.event.ValueChangeEvent; +import java.util.Map; /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 5448 $ + * @version $Revision$ */ public class PropertyAction { @@ -49,7 +46,7 @@ /** . */ private String propertyValue; - + /** . */ private String otherPropertyName; Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,35 +22,32 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.actions; -import java.util.Set; - -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; - import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; import org.jboss.portal.core.admin.ui.dashboard.DashboardBean; import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; -import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PageContainer; import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.security.spi.provider.DomainConfigurator; +import javax.faces.application.FacesMessage; +import javax.faces.context.FacesContext; +import java.util.Set; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 5763 $ + * @version $Revision$ */ public class RenameAction { private String newName; - + /** The page container that will create the child. */ public PageContainer pageContainer; private DomainConfigurator domainConfigurator; - + public Object bean; public void setNewName(String newName) @@ -95,20 +92,20 @@ try { // TODO: Should be in a tx - + // Clone portal object newObject = pageContainer.copy(parent, newName, true); // Copy security settings Set set = domainConfigurator.getSecurityBindings(pageContainer.getId().toString(PortalObjectPath.CANONICAL_FORMAT)); domainConfigurator.setSecurityBindings(newObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT), set); - + String defaultObject = (String)parent.getDeclaredProperties().get(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); if (pageContainer.getName().equals(defaultObject)) { parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName); } - + // Destroy previous object parent.destroyChild(pageContainer.getName()); } @@ -137,9 +134,9 @@ { ((DashboardBean)bean).selectedPageName = newObject.getName(); } - + return null; } - + } Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -29,7 +29,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class WindowComparator implements Comparator { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,44 +22,44 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.common; +import org.jboss.portal.core.admin.ui.actions.WindowComparator; +import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService; +import org.jboss.portal.core.model.content.Content; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; +import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; -import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.content.Content; -import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.core.admin.ui.actions.WindowComparator; -import org.jboss.portal.core.impl.model.content.ContentProviderRegistryService; -import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.theme.PortalLayout; -import org.jboss.portal.theme.LayoutService; import org.jboss.portal.faces.component.portlet.PortletActionEvent; import org.jboss.portal.faces.component.portlet.PortletRenderEvent; -import org.jboss.portal.faces.el.dynamic.DynamicBean; import org.jboss.portal.faces.el.PropertyValue; +import org.jboss.portal.faces.el.dynamic.DynamicBean; import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.theme.LayoutService; +import org.jboss.portal.theme.PortalLayout; +import org.jboss.portal.theme.ThemeConstants; -import javax.faces.model.SelectItem; -import javax.faces.event.ActionEvent; -import javax.faces.event.AbortProcessingException; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -import java.util.Map; -import java.util.LinkedHashMap; -import java.util.Iterator; -import java.util.TreeSet; -import java.util.SortedSet; -import java.util.List; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.ActionEvent; +import javax.faces.model.SelectItem; import java.util.ArrayList; import java.util.Collections; -import java.util.LinkedList; import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; +import java.util.TreeSet; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PageManagerBean { @@ -123,7 +123,7 @@ public List getContentTypeItems() { LinkedList types = new LinkedList(); - for (Iterator i = ContentProviderRegistryService.getInstance().getContentTypes().iterator();i.hasNext();) + for (Iterator i = ContentProviderRegistryService.getInstance().getContentTypes().iterator(); i.hasNext();) { ContentType contentType = (ContentType)i.next(); SelectItem item = new SelectItem(); @@ -182,7 +182,7 @@ // Get the windows belonging to the selected region sorted by order List windows = new ArrayList(); - for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator();i.hasNext();) + for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator(); i.hasNext();) { Window window = (Window)i.next(); if (regionName.equals(window.getProperty(ThemeConstants.PORTAL_PROP_REGION))) @@ -249,7 +249,7 @@ { Window window = page.createWindow(windowName, selectedContentType, selectedContentURI); Content content = window.getContent(); - for (Iterator i = selectedContentParams.entrySet().iterator();i.hasNext();) + for (Iterator i = selectedContentParams.entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); String paramName = (String)entry.getKey(); @@ -268,12 +268,12 @@ windows.add(window); // Update the order states - for (int i = 0;i < windows.size();i++) + for (int i = 0; i < windows.size(); i++) { Window tmp = (Window)windows.get(i); tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); } - + this.windowName = ""; } catch (DuplicatePortalObjectException unexpected) @@ -291,7 +291,7 @@ } else if (direction == MOVE_LEFT) { - for (Iterator i = windows.iterator();i.hasNext();) + for (Iterator i = windows.iterator(); i.hasNext();) { Window window = (Window)i.next(); if (selectedWindows.contains(window.getName())) @@ -310,7 +310,7 @@ } // Update the order states - for (int i = 0;i < windows.size();i++) + for (int i = 0; i < windows.size(); i++) { Window window = (Window)windows.get(i); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); @@ -332,16 +332,14 @@ this.windowName = windowName; } - /** - * Portlet event - */ + /** Portlet event */ public void assignWindow(ActionEvent event) { if (event instanceof PortletRenderEvent) { PortletRenderEvent renderEvent = (PortletRenderEvent)event; Map renderParams = renderEvent.getParameterMap(); - + // Keep window name and region defined setWindowName(((String[])renderParams.get("windowName"))[0]); } @@ -366,8 +364,8 @@ String uri = uris[0]; // - Map parameters = new HashMap(); - for (Iterator i = actionParams.entrySet().iterator();i.hasNext();) + Map parameters = new HashMap(); + for (Iterator i = actionParams.entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); String name = (String)entry.getKey(); @@ -423,7 +421,7 @@ // ArrayList regions = new ArrayList(windows.keySet()); Collections.sort(regions); - for (int i = 0; i < regions.size();i++) + for (int i = 0; i < regions.size(); i++) { String regionName = (String)regions.get(i); SelectItem regionItem = new SelectItem(regionName, regionName); @@ -445,12 +443,12 @@ public Map getWindowItemsMap() throws Exception { Map windowMap = getWindows(page); - for (Iterator i = windowMap.entrySet().iterator();i.hasNext();) + for (Iterator i = windowMap.entrySet().iterator(); i.hasNext();) { Map.Entry entry = (Map.Entry)i.next(); SortedSet windows = (SortedSet)entry.getValue(); ArrayList windowItems = new ArrayList(windows.size()); - for (Iterator j = windows.iterator();j.hasNext();) + for (Iterator j = windows.iterator(); j.hasNext();) { Window window = (Window)j.next(); SelectItem windowItem = new SelectItem(); Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/ContentTypeConverter.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/ContentTypeConverter.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/ContentTypeConverter.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,14 +24,14 @@ import org.jboss.portal.core.model.content.ContentType; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; -import javax.faces.context.FacesContext; -import javax.faces.component.UIComponent; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ContentTypeConverter implements Converter { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/ContentTypeConverter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/PortalObjectIdConverter.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/PortalObjectIdConverter.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/PortalObjectIdConverter.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -25,14 +25,14 @@ import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectIdConverter implements Converter { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/conversion/PortalObjectIdConverter.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -44,7 +44,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class DashboardBean implements AddPageAction.Listener { Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,33 +22,32 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.portlet; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.NoSuchPortletException; +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.core.model.instance.InstanceContainer; -import org.jboss.portal.core.model.instance.Instance; -import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; -import java.util.Set; -import java.util.List; -import java.util.Iterator; import java.util.Collection; import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; /** - * Adapt the instance container as a portlet invoker. Will be removed later when - * migrating the instance container to the portlet package will be done in a - * suitable form. + * Adapt the instance container as a portlet invoker. Will be removed later when migrating the instance container to the + * portlet package will be done in a suitable form. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletDefinitionInvoker implements PortletInvoker { @@ -69,7 +68,7 @@ { Collection defs = instanceContainer.getDefinitions(); Set portlets = new HashSet(defs.size()); - for (Iterator i = defs.iterator();i.hasNext();) + for (Iterator i = defs.iterator(); i.hasNext();) { Instance instance = (Instance)i.next(); portlets.add(new PortletDefinition(instance)); Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/portlet/PortletDefinitionInvoker.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,14 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui.wizard; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; - -import javax.faces.context.FacesContext; - import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; @@ -38,8 +30,8 @@ import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; @@ -53,6 +45,13 @@ import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; +import javax.faces.context.FacesContext; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Set; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -73,7 +72,7 @@ private InstanceContainer instanceContainer; private LayoutService layoutService; private AuthorizationDomainRegistry authorizationDomainRegistry; - + public NewWindowWizard() { steps = new ArrayList(); @@ -84,7 +83,7 @@ steps.add("newWindowWizardConfirm"); currentStep = 0; } - + public String next() { currentStep++; @@ -103,7 +102,7 @@ currentStep--; return (String)steps.get(currentStep); } - + public String selectPortlet() { FacesContext ctx = FacesContext.getCurrentInstance(); @@ -112,7 +111,7 @@ currentStep = 1; return (String)steps.get(currentStep); } - + public String selectPortal() { FacesContext ctx = FacesContext.getCurrentInstance(); @@ -179,7 +178,7 @@ } return null; } - + public Page getSelectedPage() { return (Page)getObjectFromId(selectedPageId); @@ -200,7 +199,7 @@ PortalObjectId objectId = PortalObjectId.parse(id, PortalObjectPath.LEGACY_BASE64_FORMAT); return getObjectFromId(objectId); } - + public PortalObject getObjectFromId(PortalObjectId id) { return portalObjectContainer.getObject(id); @@ -211,8 +210,8 @@ PortalObject root = portalObjectContainer.getContext(); return new ArrayList(root.getChildren(PortalObject.PORTAL_MASK)); } - - + + public List getPages() { if (selectedParentPageId != null) @@ -232,20 +231,20 @@ return new ArrayList(getSelectedPortal().getChildren(PortalObject.PAGE_MASK)); } } - + public String createWindow() { Portlet portlet = getSelectedPortlet(); InstanceContainer container = instanceContainer; int id = container.getDefinitions().size(); String instanceId = "wizardInstance_" + id; - String windowId = "wizardWindow_" + id; + String windowId = "wizardWindow_" + id; try { if ((container.getDefinition(instanceId) == null) && (getSelectedPage().getWindow(windowId) == null)) { Instance instance = container.createDefinition(instanceId, portlet.getContext().getId()); - + // DomainConfigurator configurator = authorizationDomainRegistry.getDomain("instance").getConfigurator(); Set constraints = Collections.singleton(new RoleSecurityBinding("view", SecurityConstants.UNCHECKED_ROLE_NAME)); @@ -254,7 +253,7 @@ Window window = getSelectedPage().createWindow(windowId, ContentType.PORTLET, instanceId); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, getSelectedRegionId()); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); - + return reset(); } } @@ -269,7 +268,7 @@ { return reset(); } - + public String reset() { selectedPortletId = null; @@ -289,17 +288,17 @@ PortalLayout layout = layoutService.getLayout(layoutId, false); return layout.getLayoutInfo().getRegionNames(); } - + public String getSelectedPortletId() { return selectedPortletId; } - + public int getCurrentStep() { return currentStep; } - + public String getSelectedPortalId() { return selectedPortalId; @@ -369,7 +368,7 @@ { this.authorizationDomainRegistry = authorizationDomainRegistry; } - + public boolean[] getEnabled() { boolean[] result = new boolean[steps.size()]; @@ -392,5 +391,5 @@ } return result; } - + } Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/wizard/NewWindowWizard.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,6 +1,6 @@ <!DOCTYPE taglib - PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" - "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> + PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" + "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"> <taglib> <tlib-version>0.01</tlib-version> <jsp-version>1.2</jsp-version> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss_portal.tld ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -5,7 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> -<br /> +<br/> <table width="100%"> <tr> <td valign="top" width="50%"> @@ -21,11 +21,12 @@ <tr> <td colspan="2"> <h:form id="windowForm"> - <label for="windowName"> - <span class="portlet-form-field-label admin-label">Window Name:</span> - <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/> - </label> - <h:message for="windowName" errorClass="portlet-msg-error"/> + <label for="windowName"> + <span class="portlet-form-field-label admin-label">Window Name:</span> + <h:inputText id="windowName" value="#{pageManager.windowName}" + styleClass="portlet-form-input-field"/> + </label> + <h:message for="windowName" errorClass="portlet-msg-error"/> </h:form> </td> </tr> @@ -49,8 +50,8 @@ document.getElementById('abc').submit(); "> <f:selectItems value="#{pageManager.contentTypeItems}"/> </h:selectOneMenu> - </label> - <h:message for="instanceId" errorClass="portlet-msg-error"/> + </label> + <h:message for="instanceId" errorClass="portlet-msg-error"/> </h:form> </td> </tr> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -14,7 +14,7 @@ <table cellpadding="0" cellspacing="0" width="100%"> <tr> <td> - + <!-- defines property creation section --> <table cellpadding="0" cellspacing="0" width="100%"> <tr> @@ -22,7 +22,7 @@ </tr> <tr> <td valign="top" class="portlet-section-body"> - + <h:form> <!-- defines layout of property form --> <table> @@ -106,18 +106,18 @@ rendered="#{prop.type eq 'java.lang.String' and prop.name ne 'portal.windowInitialState'}"/> <h:selectOneMenu styleClass="portlet-form-input-field" - value="#{prop.value}" + value="#{prop.value}" rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (!portalobjectmgr.maximizedStateExists or prop.value eq 'MAXIMIZED')}"> - <f:selectItem itemLabel="Choose One..." itemValue=""/> - <f:selectItem itemLabel="Maximized" itemValue="MAXIMIZED"/> - <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> - <f:selectItem itemLabel="Normal" itemValue="NORMAL"/> + <f:selectItem itemLabel="Choose One..." itemValue=""/> + <f:selectItem itemLabel="Maximized" itemValue="MAXIMIZED"/> + <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> + <f:selectItem itemLabel="Normal" itemValue="NORMAL"/> </h:selectOneMenu> <h:selectOneMenu styleClass="portlet-form-input-field" value="#{prop.value}" disabled="true" rendered="#{prop.type eq 'java.lang.String' and prop.name eq 'portal.windowInitialState' and (portalobjectmgr.maximizedStateExists and prop.value ne 'MAXIMIZED')}"> - <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> + <f:selectItem itemLabel="Minimized" itemValue="MINIMIZED"/> </h:selectOneMenu> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -18,7 +18,8 @@ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <td> <h:outputLabel for="cars_#{status.index}"> - Role #{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}: + Role + #{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}: </h:outputLabel> </td> <td> @@ -34,8 +35,8 @@ </tbody> </table> <div> - <h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> + <h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> </div> </h:form> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,19 +1,19 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> <table> <tr> <td class="portlet-form-field-label">Portlet name:</td> <td><h:form><h:commandLink - action="#{portletmgr.selectPortlet}"> - <f:param name="id" value="#{portlet.context.id}"/> - <f:param name="plugin" value="manager"/> - #{portlet.name.value} - </h:commandLink></h:form></td> + action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + #{portlet.name.value} + </h:commandLink></h:form></td> </tr> <tr> <td class="portlet-form-field-label">Portlet description:</td> @@ -31,7 +31,7 @@ <tr> <td class="portlet-form-field-label">Portlet locales:</td> <td> - <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> + <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> </td> </tr> </c:if> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -32,18 +32,18 @@ </td> </tr> <c:if test="#{dashboard.selectedPage.name != 'default'}"> - <tr> - <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:&#160; - <h:form id="renameForm" style="padding:0;margin:0"> - <h:message for="newName"/> - <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" - styleClass="portlet-form-input-field"/> - <h:commandButton value="Rename" - action="#{renameDashboardPageAction.execute}" - styleClass="portlet-form-button"/> - </h:form> - </td> - </tr> + <tr> + <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:&#160; + <h:form id="renameForm" style="padding:0;margin:0"> + <h:message for="newName"/> + <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" + styleClass="portlet-form-input-field"/> + <h:commandButton value="Rename" + action="#{renameDashboardPageAction.execute}" + styleClass="portlet-form-button"/> + </h:form> + </td> + </tr> </c:if> </table> </td> @@ -52,7 +52,7 @@ You can control the page titles, column layouts, page themes, and add, order, or remove portlets. - </td> + </td> </tr> </table> </td> @@ -69,77 +69,79 @@ styleClass="portlet-form-field" onchange="document.getElementById('page_selector_form').submit()"> <f:selectItems value="#{dashboard.pageItems}"/> - </h:selectOneMenu> + </h:selectOneMenu> </h:form> <br/> </td> </tr> - + <tr> <td> - <table width="100%"> - <tr> - <td valign="top" width="250"> - <table class="bottombuttonbar"> - <tr> - <td valign="top"> - <b>Theme and Layout</b> - <br/> - Apply a theme to your dashboard, or select the number of columns for the layout. - <hr/> - </td> - </tr> - <tr> - <td> - <h:form> - Choose a layout:<br/> - <h:selectOneMenu - id="layoutSelector" - value="#{dashboard.selectedPageLayout}" - styleClass="portlet-form-field"> - <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> - </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/> - </h:form> - </td> - </tr> - <tr> - <td height="20"></td> - </tr> - <tr> - <td> - <h:form> - Choose a theme:<br/> - <h:selectOneMenu - id="themeSelector" - value="#{dashboard.selectedPageTheme}" - styleClass="portlet-form-field"> - <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> - </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/> - </h:form> - </td> - </tr> - <tr> - <td height="20"></td> - </tr> - </table> - </td> - <td> - <table> - <tr> - <td> - <div class="admin-ui"> - <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml"> - <ui:param name="pageManager" value="#{dashboard.pageManager}"/> - </ui:include> - </div> - </td> - </tr> - </table> - </td> - </tr> - </table> + <table width="100%"> + <tr> + <td valign="top" width="250"> + <table class="bottombuttonbar"> + <tr> + <td valign="top"> + <b>Theme and Layout</b> + <br/> + Apply a theme to your dashboard, or select the number of columns for the layout. + <hr/> + </td> + </tr> + <tr> + <td> + <h:form> + Choose a layout:<br/> + <h:selectOneMenu + id="layoutSelector" + value="#{dashboard.selectedPageLayout}" + styleClass="portlet-form-field"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + <h:commandButton value="Select" styleClass="portlet-form-button" + action="#{dashboard.updateLayout}"/> + </h:form> + </td> + </tr> + <tr> + <td height="20"></td> + </tr> + <tr> + <td> + <h:form> + Choose a theme:<br/> + <h:selectOneMenu + id="themeSelector" + value="#{dashboard.selectedPageTheme}" + styleClass="portlet-form-field"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + <h:commandButton value="Select" styleClass="portlet-form-button" + action="#{dashboard.updateTheme}"/> + </h:form> + </td> + </tr> + <tr> + <td height="20"></td> + </tr> + </table> + </td> + <td> + <table> + <tr> + <td> + <div class="admin-ui"> + <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml"> + <ui:param name="pageManager" value="#{dashboard.pageManager}"/> + </ui:include> + </div> + </td> + </tr> + </table> + </td> + </tr> + </table> </td> </tr> </table> @@ -149,7 +151,8 @@ <tr> <td align="left"> <h:form style="padding:0;margin:0"> - <h:commandButton value="Delete this Page" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/> + <h:commandButton value="Delete this Page" styleClass="portlet-form-button" + action="#{dashboard.destroyPage}"/> <br/> <font color="red">You cannot undo this action!</font> </h:form> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -10,7 +10,8 @@ <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> + <h:commandLink value="Portal Objects" action="objects" + actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> <h:commandLink value="Portlet Instances" action="instances"/> @@ -22,12 +23,13 @@ </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> - <ui:define name="tab-container-content"> - <!-- Status message --> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <ui:define name="tab-container-content"> + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <!-- Content --> - <ui:insert name="content">Content</ui:insert> - </ui:define> + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + </ui:define> </ui:decorate> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -7,11 +7,11 @@ xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Layout"/> - <ui:define name="content"> - <ui:include src="common/editPageLayout.xhtml"> - <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> - </ui:include> - </ui:define> + <ui:param name="portalObjectScreen" value="Layout"/> + <ui:define name="content"> + <ui:include src="common/editPageLayout.xhtml"> + <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> + </ui:include> + </ui:define> </ui:composition> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -26,9 +26,9 @@ </div> <div style="padding:5px"> - <ui:include src="common/editProperties.xhtml"> - <ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/> - </ui:include> + <ui:include src="common/editProperties.xhtml"> + <ui:param name="properties" value="#{portalobjectmgr.selectedProperties}"/> + </ui:include> </div> <br/> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,9 +1,9 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:ct="http://www.julien.com" - xmlns:jbp="http://www.jboss.org/portal" - xmlns:h="http://java.sun.com/jsf/html"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:ct="http://www.julien.com" + xmlns:jbp="http://www.jboss.org/portal" + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="objectTemplate.xhtml"> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindow.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,13 +21,13 @@ </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> - <ui:define name="tab-container-content"> - <!-- Status message --> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <ui:define name="tab-container-content"> + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <!-- Content --> - <ui:insert name="content">Content</ui:insert> - </ui:define> + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + </ui:define> </ui:decorate> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -130,24 +130,26 @@ <h:outputText value="Window"/> </f:facet> - <h:graphicImage title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" - rendered="#{!maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" - styleClass="windowStateIcon" - alt="" /> + <h:graphicImage + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" + rendered="#{!maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" + styleClass="windowStateIcon" + alt=""/> - <h:graphicImage title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" - rendered="#{maximizedStateExists}" - value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" - styleClass="windowStateIcon" - alt="" /> - + <h:graphicImage + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" + rendered="#{maximizedStateExists}" + value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" + styleClass="windowStateIcon" + alt=""/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} - <f:param name="id" value="#{object.id}"/> + <f:param name="id" value="#{object.id}"/> </h:commandLink> - </h:column> - <h:column> + </h:column> + <h:column> <f:facet name="header"> <h:outputText value="Actions"/> </f:facet> @@ -160,11 +162,11 @@ <f:param name="id" value="#{object.id}"/> <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> Properties - </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" + </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> Rename - </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}" + </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionDelete"> <f:param name="id" value="#{object.id}"/> Delete Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,35 +22,35 @@ </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> - <ui:define name="tab-container-content"> - <!-- Path nav --> - <h:form> - <ul class="objectpath"> - <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> - <c:if test="#{node.type != PortalObject.TYPE_CONTEXT}"> - <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - </c:if> - <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}"> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> - <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - <h:outputText value="&#160;#{portalObjectScreen}" - rendered="#{portalObjectScreen != null and node.id == portalobjectmgr.selectedObject.id}"/> - </li> - </c:forEach> - </ul> - </h:form> + <ui:define name="tab-container-content"> + <!-- Path nav --> + <h:form> + <ul class="objectpath"> + <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> + <c:if test="#{node.type != PortalObject.TYPE_CONTEXT}"> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + </c:if> + <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : 'pathItem'}"> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:choose> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> + </c:choose> + </h:commandLink> + <h:outputText value="&#160;#{portalObjectScreen}" + rendered="#{portalObjectScreen != null and node.id == portalobjectmgr.selectedObject.id}"/> + </li> + </c:forEach> + </ul> + </h:form> - <!-- Status message --> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <!-- Content --> - <ui:insert name="content">Content</ui:insert> - </ui:define> + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + </ui:define> </ui:decorate> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,7 +21,8 @@ </c:choose> <h:form> - <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard mode</h:commandLink></p> + <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard + mode</h:commandLink></p> </h:form> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -21,13 +21,13 @@ </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> - <ui:define name="tab-container-content"> - <!-- Status message --> - <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <ui:define name="tab-container-content"> + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <!-- Content --> - <ui:insert name="content">Content</ui:insert> - </ui:define> + <!-- Content --> + <ui:insert name="content">Content</ui:insert> + </ui:define> </ui:decorate> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -10,169 +10,190 @@ <div class="wizard-tab-container"> <h3 class="sectionTitle"> -Adding a new Portlet + Adding a new Portlet </h3> - <c:choose> - <c:when test="#{newWindowWizard.currentStep == 0}"> - <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 1</p> - <p class="stepText">Select Portlet</p> - </div> - </c:when> - <c:otherwise> - <c:choose> - <c:when test="#{newWindowWizard.enabled[0]}"> - <h:form><h:commandLink action="#{newWindowWizard.goTo}"> - <f:param name="step" value="0"/> - <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> - <p class="stepText">Select Portlet</p> - </div> - </h:commandLink></h:form> - </c:when> - <c:otherwise> - <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> - <p class="stepText">Select Portlet</p> - </div> - </c:otherwise> - </c:choose> - </c:otherwise> - </c:choose> +<c:choose> + <c:when test="#{newWindowWizard.currentStep == 0}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 1</p> - <c:choose> - <c:when test="#{newWindowWizard.currentStep == 1}"> - <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 2</p> - <p class="stepText">Select Portal</p> - </div> - </c:when> - <c:otherwise> - <c:choose> - <c:when test="#{newWindowWizard.enabled[1]}"> - <h:form><h:commandLink action="#{newWindowWizard.goTo}"> - <f:param name="step" value="1"/> - <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> - <p class="stepText">Select Portal</p> - </div> - </h:commandLink></h:form> - </c:when> - <c:otherwise> - <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> - <p class="stepText">Select Portal</p> - </div> - </c:otherwise> - </c:choose> - </c:otherwise> - </c:choose> + <p class="stepText">Select Portlet</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[0]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="0"/> - <c:choose> - <c:when test="#{newWindowWizard.currentStep == 2}"> - <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 3</p> - <p class="stepText">Select Page</p> - </div> - </c:when> - <c:otherwise> - <c:choose> - <c:when test="#{newWindowWizard.enabled[2]}"> - <h:form><h:commandLink action="#{newWindowWizard.goTo}"> - <f:param name="step" value="2"/> - <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> - <p class="stepText">Select Page</p> - </div> - </h:commandLink></h:form> - </c:when> - <c:otherwise> - <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> - <p class="stepText">Select Page</p> - </div> - </c:otherwise> - </c:choose> - </c:otherwise> - </c:choose> + <div class="wizardStepBox"> + <p class="stepNumber">Step 1</p> - <c:choose> - <c:when test="#{newWindowWizard.currentStep == 3}"> - <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 4</p> - <p class="stepText">Select Region</p> - </div> - </c:when> - <c:otherwise> - <c:choose> - <c:when test="#{newWindowWizard.enabled[3]}"> - <h:form><h:commandLink action="#{newWindowWizard.goTo}"> - <f:param name="step" value="3"/> - <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> - <p class="stepText">Select Region</p> - </div> - </h:commandLink></h:form> - </c:when> - <c:otherwise> - <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> - <p class="stepText">Select Region</p> - </div> - </c:otherwise> - </c:choose> - </c:otherwise> - </c:choose> + <p class="stepText">Select Portlet</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 1</p> - <c:choose> - <c:when test="#{newWindowWizard.currentStep == 4}"> - <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 5</p> - <p class="stepText">Confirm</p> - </div> - </c:when> - <c:otherwise> - <c:choose> - <c:when test="#{newWindowWizard.enabled[4]}"> - <h:form><h:commandLink action="#{newWindowWizard.goTo}"> - <f:param name="step" value="4"/> - <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> - <p class="stepText">Confirm</p> - </div> - </h:commandLink></h:form> - </c:when> - <c:otherwise> - <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> - <p class="stepText">Confirm</p> - </div> - </c:otherwise> - </c:choose> - </c:otherwise> - </c:choose> + <p class="stepText">Select Portlet</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> +</c:choose> - <!-- Status message --> - <h:message id="status" for="status"/> +<c:choose> + <c:when test="#{newWindowWizard.currentStep == 1}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 2</p> + <p class="stepText">Select Portal</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[1]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="1"/> - <!-- Content --> - <div class="wizardContent"> - <ui:insert name="content">Content</ui:insert> - </div> + <div class="wizardStepBox"> + <p class="stepNumber">Step 2</p> - <div class="wizardButtonBox"> - <h:form> - <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous" - action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/> - <h:commandButton rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}" - value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> - </h:form> - </div> + <p class="stepText">Select Portal</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 2</p> + <p class="stepText">Select Portal</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> +</c:choose> + +<c:choose> + <c:when test="#{newWindowWizard.currentStep == 2}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 3</p> + + <p class="stepText">Select Page</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[2]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="2"/> + + <div class="wizardStepBox"> + <p class="stepNumber">Step 3</p> + + <p class="stepText">Select Page</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 3</p> + + <p class="stepText">Select Page</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> +</c:choose> + +<c:choose> + <c:when test="#{newWindowWizard.currentStep == 3}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 4</p> + + <p class="stepText">Select Region</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[3]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="3"/> + + <div class="wizardStepBox"> + <p class="stepNumber">Step 4</p> + + <p class="stepText">Select Region</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 4</p> + + <p class="stepText">Select Region</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> +</c:choose> + +<c:choose> + <c:when test="#{newWindowWizard.currentStep == 4}"> + <div class="wizardStepBox" id="selected"> + <p class="stepNumber">Step 5</p> + + <p class="stepText">Confirm</p> + </div> + </c:when> + <c:otherwise> + <c:choose> + <c:when test="#{newWindowWizard.enabled[4]}"> + <h:form><h:commandLink action="#{newWindowWizard.goTo}"> + <f:param name="step" value="4"/> + + <div class="wizardStepBox"> + <p class="stepNumber">Step 5</p> + + <p class="stepText">Confirm</p> + </div> + </h:commandLink></h:form> + </c:when> + <c:otherwise> + <div class="wizardStepBox"> + <p class="stepNumber">Step 5</p> + + <p class="stepText">Confirm</p> + </div> + </c:otherwise> + </c:choose> + </c:otherwise> +</c:choose> + +<!-- Status message --> +<h:message id="status" for="status"/> + + +<!-- Content --> +<div class="wizardContent"> + <ui:insert name="content">Content</ui:insert> +</div> + +<div class="wizardButtonBox"> <h:form> - <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p> + <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous" + action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/> + <h:commandButton + rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}" + value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> </h:form> </div> + +<h:form> + <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p> +</h:form> </div> +</div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -4,23 +4,35 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - + <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> - - <table> - <tr><td><b>Portlet:</b></td><td>#{newWindowWizard.selectedPortlet.name.defaultString}</td></tr> - <tr><td><b>Portal:</b></td><td>#{newWindowWizard.selectedPortal.name}</td></tr> - <tr><td><b>Page:</b></td><td>#{newWindowWizard.selectedPage.name}</td></tr> - <tr><td><b>Region:</b></td><td>#{newWindowWizard.selectedRegionId}</td></tr> - </table> - - <h:form> - <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> - </h:form> - - </ui:define> - </ui:composition> - + + <table> + <tr> + <td><b>Portlet:</b></td> + <td>#{newWindowWizard.selectedPortlet.name.defaultString}</td> + </tr> + <tr> + <td><b>Portal:</b></td> + <td>#{newWindowWizard.selectedPortal.name}</td> + </tr> + <tr> + <td><b>Page:</b></td> + <td>#{newWindowWizard.selectedPage.name}</td> + </tr> + <tr> + <td><b>Region:</b></td> + <td>#{newWindowWizard.selectedRegionId}</td> + </tr> + </table> + + <h:form> + <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> + <h:commandButton value="Cancel" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> + </h:form> + + </ui:define> + </ui:composition> + </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-10-28 01:09:21 UTC (rev 8785) @@ -17,7 +17,8 @@ </tbody> <tbody> <h:form> - <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}"> + <h:commandLink action="#{newWindowWizard.up}" + rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}"> <h:outputText value="Up"/> <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> </h:commandLink> Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portal.taglib.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSConstants.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSConstants.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CMSConstants { Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSConstants.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.cms; +import org.jboss.portal.core.controller.command.mapper.CommandFactory; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.controller.command.mapper.CommandFactory; /** * This command mapper is used to map urls to cms content objects Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,23 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.cms; -import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; +import org.jboss.portal.Mode; +import org.jboss.portal.cms.CMS; +import org.jboss.portal.cms.CMSException; +import org.jboss.portal.cms.Command; +import org.jboss.portal.cms.model.Content; +import org.jboss.portal.cms.model.File; +import org.jboss.portal.core.cms.command.StreamContentCommand; +import org.jboss.portal.core.cms.ui.CMSPortlet; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.cms.command.StreamContentCommand; -import org.jboss.portal.core.cms.ui.CMSPortlet; -import org.jboss.portal.cms.CMS; -import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.CMSException; -import org.jboss.portal.cms.model.File; -import org.jboss.portal.cms.model.Content; +import org.jboss.portal.portlet.PortletParametersStateString; +import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.config.ServerConfig; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.Mode; import java.util.Locale; @@ -165,21 +165,21 @@ } catch (CMSException e) { - if(e.toString().indexOf("Access to this resource is denied")!=-1) - { - PortletParametersStateString parameters = new PortletParametersStateString(); - parameters.setValue("path", requestPath); - return new InvokePortletWindowRenderCommand(targetWindowId, Mode.VIEW, null, parameters); - } - else - { - log.error("CMS error", e); - } + if (e.toString().indexOf("Access to this resource is denied") != -1) + { + PortletParametersStateString parameters = new PortletParametersStateString(); + parameters.setValue("path", requestPath); + return new InvokePortletWindowRenderCommand(targetWindowId, Mode.VIEW, null, parameters); + } + else + { + log.error("CMS error", e); + } } return null; // TODO: 404? } - + private boolean isStreamable(String mimeType) { return (!"text/html".equalsIgnoreCase(mimeType) && !"text/plain".equalsIgnoreCase(mimeType)); Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactoryService.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.cms; +import org.jboss.portal.core.cms.command.StreamContentCommand; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.command.mapper.URLFactoryDelegate; -import org.jboss.portal.core.cms.command.StreamContentCommand; import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerURL; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6007 $ + * @version $Revision$ */ public class CMSObjectURLFactory extends URLFactoryDelegate { Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/aspect/IdentityBindingInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/aspect/IdentityBindingInterceptor.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/aspect/IdentityBindingInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.cms.aspect; +import org.jboss.portal.cms.impl.jcr.JCRCMS; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.core.aspects.server.UserInterceptor; import org.jboss.portal.identity.User; -import org.jboss.portal.cms.impl.jcr.JCRCMS; import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.aspects.server.UserInterceptor; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class IdentityBindingInterceptor extends ServerInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/aspect/IdentityBindingInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.cms.content; +import org.jboss.portal.Mode; +import org.jboss.portal.core.cms.CMSObjectCommandFactory; import org.jboss.portal.core.impl.model.content.generic.InternalGenericContentProvider; +import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.content.WindowRendition; -import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.core.cms.CMSObjectCommandFactory; -import org.jboss.portal.Mode; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InternalCMSContentProvider extends InternalGenericContentProvider { Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,26 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.cms.ui; -import java.io.IOException; -import java.io.PrintWriter; -import java.lang.reflect.UndeclaredThrowableException; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.portlet.GenericPortlet; -import javax.portlet.PortletException; -import javax.portlet.PortletPreferences; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletSecurityException; -import javax.portlet.PortletURL; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; -import javax.portlet.PortletConfig; -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; -import javax.portlet.PortletMode; - import org.apache.log4j.Logger; import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.CMSException; @@ -50,21 +30,40 @@ import org.jboss.portal.cms.search.CMSFederatedSearch; import org.jboss.portal.cms.util.FileUtil; import org.jboss.portal.core.cms.CMSConstants; +import org.jboss.portal.core.cms.command.StreamContentCommand; import org.jboss.portal.core.cms.content.InternalCMSContentProvider; import org.jboss.portal.core.cms.ui.admin.CMSContentEditorPortlet; -import org.jboss.portal.core.cms.command.StreamContentCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.search.federation.SearchFederation; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; import org.jboss.portlet.JBossRenderRequest; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletConfig; +import javax.portlet.PortletException; +import javax.portlet.PortletMode; +import javax.portlet.PortletPreferences; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletSecurityException; +import javax.portlet.PortletURL; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.lang.reflect.UndeclaredThrowableException; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * Displays content from the CMS. * * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6007 $ + * @version $Revision$ * <p/> * TODO: use portlet preferences for default homepage, and allow for preference modification in doEdit() */ @@ -347,17 +346,13 @@ return content; } - /** - * Creates CMS urls which is used for image src calls from the html. - */ + /** Creates CMS urls which is used for image src calls from the html. */ protected abstract static class URLFactory { public abstract String createURL(String path); } - /** - * Implementation that uses a PortletURL object. - */ + /** Implementation that uses a PortletURL object. */ protected static class LocalURLFactory extends URLFactory { @@ -376,9 +371,7 @@ } } - /** - * Implementation that routes thru the CMSObjectCommandMapper. - */ + /** Implementation that routes thru the CMSObjectCommandMapper. */ protected static class GlobalURLFactory extends URLFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/CMSPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -105,6 +105,6 @@ public static final String OP_VIEWPENDING = "view_pending_items"; public static final String OP_VIEWSEARCHRESULTS = "view_search_results"; - + public static final String OP_CREATEFILE_VALIDATION_ERROR = "create_file_validation_error"; } Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,26 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.cms.ui.admin; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Set; -import java.util.Vector; - -import javax.naming.InitialContext; -import javax.portlet.PortletException; -import javax.portlet.PortletRequest; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletSession; -import javax.portlet.UnavailableException; - import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.portlet.PortletFileUpload; @@ -85,6 +65,25 @@ import org.jboss.portlet.JBossRenderRequest; import org.jboss.portlet.JBossRenderResponse; +import javax.naming.InitialContext; +import javax.portlet.PortletException; +import javax.portlet.PortletRequest; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletSession; +import javax.portlet.UnavailableException; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import java.util.Vector; + /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> @@ -98,8 +97,8 @@ private MembershipModule membershipModule; private ApprovePublish approvePublish; private AuthorizationManager authorizationManager; - + public void init() throws PortletException { CMSService = (CMS)getPortletContext().getAttribute("CMS"); @@ -124,12 +123,12 @@ { throw new PortletException("No membership module"); } - if(this.authorizationManager == null) + if (this.authorizationManager == null) { - throw new PortletException("Authorization Service not found"); + throw new PortletException("Authorization Service not found"); } - this.initializeApprovePublishWorkflow(); + this.initializeApprovePublishWorkflow(); } protected void doView(final JBossRenderRequest rReq, final JBossRenderResponse rRes) @@ -209,19 +208,19 @@ rReq.setAttribute("folders", folders); rReq.setAttribute("files", files); rReq.setAttribute("currpath", sPath); - + //manage workflow accessibility check boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq); boolean isWorkflowActivated = this.CMSService.isWorkflowActivated(); - if(isWorkflowManagementAccessible && isWorkflowActivated) + if (isWorkflowManagementAccessible && isWorkflowActivated) { - rReq.setAttribute("manageWorkflowAccessible", new Boolean(true)); + rReq.setAttribute("manageWorkflowAccessible", new Boolean(true)); } else { - rReq.setAttribute("manageWorkflowAccessible", new Boolean(false)); + rReq.setAttribute("manageWorkflowAccessible", new Boolean(false)); } - + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/main.jsp"); prd.include(rReq, rRes); } @@ -289,31 +288,31 @@ rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); rReq.setAttribute("contents", contents); - + //manage workflow accessibility check boolean isWorkflowManagementAccessible = this.isWorkflowManagementAccessible(rReq); boolean isWorkflowActivated = this.CMSService.isWorkflowActivated(); - if(isWorkflowManagementAccessible && isWorkflowActivated) + if (isWorkflowManagementAccessible && isWorkflowActivated) { - rReq.setAttribute("manageWorkflowAccessible", new Boolean(true)); + rReq.setAttribute("manageWorkflowAccessible", new Boolean(true)); } else { - rReq.setAttribute("manageWorkflowAccessible", new Boolean(false)); + rReq.setAttribute("manageWorkflowAccessible", new Boolean(false)); } - + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/viewfile.jsp"); prd.include(rReq, rRes); } else if (CMSAdminConstants.OP_VIEWSEARCHRESULTS.equals(op)) { rRes.setContentType("text/html"); - + String textQuery = rReq.getParameter("search"); FederatedQuery query = new FederatedQuery(textQuery); - - JCRQueryConverter converter = new JCRQueryConverter(); - + + JCRQueryConverter converter = new JCRQueryConverter(); + List files; try { @@ -394,7 +393,8 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/editbinary.jsp"); prd.include(rReq, rRes); } - else if (CMSAdminConstants.OP_CREATENEWTEXT.equals(op) || CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR.equals(op)) + else + if (CMSAdminConstants.OP_CREATENEWTEXT.equals(op) || CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR.equals(op)) { String sPath = rReq.getParameter("path"); @@ -425,28 +425,28 @@ rRes.setContentType("text/html"); rReq.setAttribute("currpath", sPath); rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rReq, "/")); - + //If a validation error occurred, re-populate data already submitted - if(rReq.getParameter("error:content") != null) + if (rReq.getParameter("error:content") != null) { rReq.setAttribute("error:content", rReq.getParameter("error:content")); } - if(rReq.getParameter("error:description") != null) + if (rReq.getParameter("error:description") != null) { rReq.setAttribute("error:description", rReq.getParameter("error:description")); } - if(rReq.getParameter("error:title") != null) + if (rReq.getParameter("error:title") != null) { rReq.setAttribute("error:title", rReq.getParameter("error:title")); } - if(rReq.getParameter("error:language") != null) + if (rReq.getParameter("error:language") != null) { rReq.setAttribute("error:language", rReq.getParameter("error:language")); } - + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/create.jsp"); prd.include(rReq, rRes); - } + } else if (CMSAdminConstants.OP_EDIT.equals(op)) { String sPath = rReq.getParameter("path"); @@ -559,7 +559,7 @@ String uri = this.authorizationManager.getProvider().getCriteriaURI("path", sPath); Collection permissions = this.authorizationManager.getProvider(). - getSecurityBindings(uri); + getSecurityBindings(uri); readRoleSet = this.processRolePermissions(permissions, "read"); readUserSet = this.processUserPermissions(permissions, "read"); @@ -620,7 +620,7 @@ javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/pending_items.jsp"); prd.include(rReq, rRes); - } + } } public void processAction(final JBossActionRequest aReq, final JBossActionResponse aRes) throws PortletException @@ -786,7 +786,7 @@ } else if (CMSAdminConstants.OP_DOSEARCH.equals(op)) { - String search = (String) aReq.getParameter("search"); + String search = (String)aReq.getParameter("search"); aRes.setRenderParameter("search", search); aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWSEARCHRESULTS); @@ -1006,27 +1006,27 @@ String sTitle = aReq.getParameter("title"); String sDescription = aReq.getParameter("description"); String sLanguage = aReq.getParameter("language"); - + //Perform server side data validation - if(sFileName == null || sFileName.trim().length() == 0) + if (sFileName == null || sFileName.trim().length() == 0) { //Validation Error occurred //FileName should not be empty aRes.setRenderParameter("op", CMSAdminConstants.OP_CREATEFILE_VALIDATION_ERROR); - + //set render parameters here aRes.setRenderParameter("path", sDirectory); - + //used to remember the data already submitted by the user aRes.setRenderParameter("error:content", aReq.getParameter("elm1")); aRes.setRenderParameter("error:description", aReq.getParameter("description")); aRes.setRenderParameter("error:title", aReq.getParameter("title")); aRes.setRenderParameter("error:language", aReq.getParameter("language")); - + return; } - - + + if (!"".equals(sFileName) && !"".equals(sDirectory)) { String sContent = aReq.getParameter("elm1"); @@ -1069,7 +1069,7 @@ CMSService.execute(newFileCMD); } aRes.setRenderParameter("path", sNewFilePath); - } + } aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); } @@ -1196,15 +1196,15 @@ //show an error message on the pending item screen aRes.setRenderParameter("path", aReq.getParameter("path")); aRes.setRenderParameter("exception", e.getMessage()); - + String from = aReq.getParameter("from"); - if(from == null || from.trim().length()==0) + if (from == null || from.trim().length() == 0) { - aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWPENDING); + aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWPENDING); } else { - aRes.setRenderParameter("op", from); + aRes.setRenderParameter("op", from); } return; } @@ -1213,42 +1213,42 @@ } else if (CMSAdminConstants.OP_DENY.equals(op)) { - String sManager = aReq.getUser().getUserName(); - String sPID = aReq.getParameter("pid"); - try - { - this.getApprovePublish().processManagerResponse(Long.parseLong(sPID), sManager, false); - } - catch (Exception e) - { - //show an error message on the pending item screen - aRes.setRenderParameter("path", aReq.getParameter("path")); - aRes.setRenderParameter("exception", e.getMessage()); - - String from = aReq.getParameter("from"); - if(from == null || from.trim().length()==0) - { - aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWPENDING); - } - else - { - aRes.setRenderParameter("op", from); - } - return; - } - aRes.setRenderParameter("path", aReq.getParameter("path")); - aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); + String sManager = aReq.getUser().getUserName(); + String sPID = aReq.getParameter("pid"); + try + { + this.getApprovePublish().processManagerResponse(Long.parseLong(sPID), sManager, false); + } + catch (Exception e) + { + //show an error message on the pending item screen + aRes.setRenderParameter("path", aReq.getParameter("path")); + aRes.setRenderParameter("exception", e.getMessage()); + + String from = aReq.getParameter("from"); + if (from == null || from.trim().length() == 0) + { + aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWPENDING); + } + else + { + aRes.setRenderParameter("op", from); + } + return; + } + aRes.setRenderParameter("path", aReq.getParameter("path")); + aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); } - else if(CMSAdminConstants.OP_MAKELIVE.equals(op)) + else if (CMSAdminConstants.OP_MAKELIVE.equals(op)) { String path = aReq.getParameter("path"); String language = aReq.getParameter("language"); String version = aReq.getParameter("version"); - + //Perform the change in live version here Command makeLiveCommand = CMSService.getCommandFactory().createMakeLiveVersionCommand(path, language, version); CMSService.execute(makeLiveCommand); - + aRes.setRenderParameter("path", path); aRes.setRenderParameter("op", CMSAdminConstants.OP_VIEWFILE); } @@ -1280,8 +1280,7 @@ /** * Rewrites urls. Typically, this is used for image src calls from the html, so they route thru the - * CMSObjectCommandMapper and invoke the StreamObjectCommand. - * TODO : need to make this not a hack + * CMSObjectCommandMapper and invoke the StreamObjectCommand. TODO : need to make this not a hack */ public String buildURL(JBossRenderRequest req, String path) { @@ -1376,7 +1375,7 @@ permission.setUsers(usersSet); Set securityBinding = new HashSet(); securityBinding.add(permission); - this.authorizationManager.getProvider().setSecurityBindings(null,securityBinding); + this.authorizationManager.getProvider().setSecurityBindings(null, securityBinding); } /** @@ -1492,33 +1491,30 @@ return false; } } - - /** - * - * @return - */ + + /** @return */ private boolean isWorkflowManagementAccessible(JBossRenderRequest renderRequest) { - boolean isAccessible = false; + boolean isAccessible = false; - User user = renderRequest.getUser(); - try - { - user = userModule.findUserById(user.getId()); - } - catch (Exception e) - { - return false; - } + User user = renderRequest.getUser(); + try + { + user = userModule.findUserById(user.getId()); + } + catch (Exception e) + { + return false; + } - PortalCMSSecurityContext securityContext = new PortalCMSSecurityContext(user); - securityContext.setAttribute("manageWorkflow", "true"); - securityContext.setAttribute("approvePublish", getApprovePublish()); - - PortalPermission cmsPermission = new CMSPermission(securityContext); - isAccessible = this.authorizationManager.checkPermission(cmsPermission); - - return isAccessible; + PortalCMSSecurityContext securityContext = new PortalCMSSecurityContext(user); + securityContext.setAttribute("manageWorkflow", "true"); + securityContext.setAttribute("approvePublish", getApprovePublish()); + + PortalPermission cmsPermission = new CMSPermission(securityContext); + isAccessible = this.authorizationManager.checkPermission(cmsPermission); + + return isAccessible; } /** @return */ @@ -1548,10 +1544,10 @@ { this.approvePublish = approvePublish; } - + /** - * * + * */ private void initializeAuthorizationManager() { Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,11 +22,10 @@ ******************************************************************************/ package org.jboss.portal.core.cms.ui.admin; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; +import org.jboss.portal.cms.CMS; +import org.jboss.portal.cms.Command; +import org.jboss.portal.cms.model.Content; +import org.jboss.portal.cms.model.Folder; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; @@ -36,12 +35,12 @@ import javax.portlet.PortletSecurityException; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; -import org.jboss.portal.cms.CMS; -import org.jboss.portal.cms.Command; -import org.jboss.portal.cms.model.Content; -import org.jboss.portal.cms.model.Folder; - /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -54,7 +53,7 @@ /** . */ private static final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); - + public void init() throws PortletException { cmsService = (CMS)getPortletContext().getAttribute("CMS"); @@ -124,15 +123,15 @@ { Command getContentCMD = cmsService.getCommandFactory().createContentGetCommand(contentUri, null, req.getLocale()); Content content = (Content)cmsService.execute(getContentCMD); - + if (content == null) { getContentCMD = cmsService.getCommandFactory().createContentGetCommand(contentUri, null, new Locale(cmsService.getDefaultLocale())); content = (Content)cmsService.execute(getContentCMD); } - req.setAttribute("content" , content); + req.setAttribute("content", content); } - + javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSEditorConstants.CMS_EDITOR_JSP_PATH + "/main.jsp"); prd.include(req, resp); } Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSContentEditorPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSEditorConstants.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -37,8 +37,8 @@ <xmbean/> </mbean> --> - - <mbean + + <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate,type=CMS" xmbean-dd="" @@ -62,12 +62,12 @@ <depends>portal:service=Hibernate,type=CMS</depends> <depends>cms.pm.cache:service=TreeCache</depends> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> - + <!-- Add this to activate publish/approval workflow integration --> <!-- <depends optional-attribute-name="ApprovePublishWorkflow" proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> --> - + <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends> <attribute name="DoChecking">true</attribute> <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute> @@ -132,7 +132,7 @@ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> <param name="path" value="${wsp.home}/index"/> - <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter" /> + <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/> <param name="useCompoundFile" value="true"/> <param name="minMergeDocs" value="100"/> <param name="volatileIdleTime" value="3"/> @@ -270,7 +270,7 @@ name="cms.pm.cache:service=TreeCache"> <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> - <depends>portal:service=Hibernate,type=CMS</depends> + <depends>portal:service=Hibernate,type=CMS</depends> <!-- Configure the TransactionManager --> @@ -434,7 +434,7 @@ <attribute name="CacheLoaderFetchPersistentState">false</attribute> <attribute name="CacheLoaderAsynchronous">false</attribute--> </mbean> - + <!-- interceptor factory where all cms interceptors are registered --> <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" @@ -446,8 +446,8 @@ <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> </depends-list> - </mbean> - + </mbean> + <!-- CMS Authorization Security Service --> <mbean code="org.jboss.portal.cms.security.AuthorizationManagerImpl" @@ -468,7 +468,7 @@ <xmbean/> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> </mbean> - + <!-- ACL Security Interceptor --> <mbean code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" @@ -521,7 +521,7 @@ <depends>portal:service=Hibernate,type=CMS</depends> <depends>portal:service=Module,type=IdentityServiceController</depends> </mbean> - + <!-- Approval Workflow Interceptor --> <mbean code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" @@ -573,8 +573,8 @@ optional-attribute-name="PortalAuthorizationManagerFactory" proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> </mbean> - - <!-- ApprovePublish workflow service --> + + <!-- ApprovePublish workflow service --> <mbean code="org.jboss.portal.cms.workflow.ApprovePublishImpl" name="portal:service=ApprovePublish,type=Workflow" @@ -586,7 +586,7 @@ </depends> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> portal:service=Module,type=IdentityServiceController - </depends> + </depends> <!-- JBPM process definition --> <attribute name="Process"> <![CDATA[ @@ -632,34 +632,34 @@ approve/reject content publish requests --> <attribute name="ManagerRoles">Admin</attribute> - <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> - - <!-- Now that a manager GUI is integrated..no need for email based manager screen --> -<!-- - <attribute name=&quot;From&quot;&gt;do-not-reply(a)jboss.com&lt;/attribute&gt; - <attribute name="Subject">Content Approval Requested</attribute> - <attribute name="Body"> - <![CDATA[ - Approval is needed to publish the following Content: - - Content Location : {0} - - Content Type : {1} - - Content Size : {2} - - Creation Date : {3} - - User : {4} - - - <a href="http://localhost/workflow/approve?pId={5}&manager={6}">Approve</a> - - - <a href="http://localhost/workflow/reject?pId={7}&manager={8}">Reject</a> - ]]> - </attribute> ---> + <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> + + <!-- Now that a manager GUI is integrated..no need for email based manager screen --> + <!-- + <attribute name=&quot;From&quot;&gt;do-not-reply(a)jboss.com&lt;/attribute&gt; + <attribute name="Subject">Content Approval Requested</attribute> + <attribute name="Body"> + <![CDATA[ + Approval is needed to publish the following Content: + + Content Location : {0} + + Content Type : {1} + + Content Size : {2} + + Creation Date : {3} + + User : {4} + + + <a href="http://localhost/workflow/approve?pId={5}&manager={6}">Approve</a> + + + <a href="http://localhost/workflow/reject?pId={7}&manager={8}">Reject</a> + ]]> + </attribute> + --> </mbean> </server> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -274,103 +274,103 @@ type="long" not-null="true"/> </class> - + <!-- mapping to persist CMS Fine Grained Security related objects --> <class name="org.jboss.portal.cms.security.PermRoleAssoc" table="jbp_cms_perm_role"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="roleId" - column="ROLE_ID" - type="string" - not-null="true" - /> + name="roleId" + column="ROLE_ID" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.PermUserAssoc" table="jbp_cms_perm_user"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="userId" - column="USER_ID" - type="string" - not-null="true" - /> + name="userId" + column="USER_ID" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.Criteria" table="jbp_cms_perm_criteria"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> <property - name="name" - column="NAME" - type="string" - not-null="true" - /> + name="name" + column="NAME" + type="string" + not-null="true" + /> <property - name="value" - column="VALUE" - type="string" - not-null="true" - /> + name="value" + column="VALUE" + type="string" + not-null="true" + /> </class> <class name="org.jboss.portal.cms.security.Permission" table="jbp_cms_perm"> <cache usage="read-write"/> <id - name="id" - column="ID" - type="java.lang.Long"> + name="id" + column="ID" + type="java.lang.Long"> <generator class="native"/> </id> - <!-- one-to-many association with the criteria object --> - <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan"> + <!-- one-to-many association with the criteria object --> + <set name="criteria" lazy="false" table="jbp_cms_perm_criteria" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.Criteria"/> </set> - <!-- many-to-many association with the role object --> - <set name="roleAssoc" lazy="false" cascade="all-delete-orphan"> + <!-- many-to-many association with the role object --> + <set name="roleAssoc" lazy="false" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.PermRoleAssoc"/> </set> - <!-- many-to-many association with the user object --> - <set name="userAssoc" lazy="false" cascade="all-delete-orphan"> + <!-- many-to-many association with the user object --> + <set name="userAssoc" lazy="false" cascade="all-delete-orphan"> <cache usage="read-write"/> <key column="CMS_PERM_ID"/> <one-to-many class="org.jboss.portal.cms.security.PermUserAssoc"/> </set> <property - name="service" - column="NAME" - type="string" - not-null="true" - /> + name="service" + column="NAME" + type="string" + not-null="true" + /> <property - name="action" - column="ACTION" - type="string" - not-null="true" - /> + name="action" + column="ACTION" + type="string" + not-null="true" + /> <property - name="negated" - column="NEGATED" - type="boolean" - not-null="true" - /> + name="negated" + column="NEGATED" + type="boolean" + not-null="true" + /> </class> </hibernate-mapping> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/ehcache.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -28,8 +28,8 @@ <hibernate-configuration> <session-factory> <property name="connection.datasource">java:@portal.datasource.name@</property> - <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; - + <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; + <!-- caching properties --> <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_es.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_fr.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/default-object.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -4,47 +4,54 @@ <%@ page isELIgnored="false" %> <% - String sCurrPath = (String) request.getAttribute("currpath"); + String sCurrPath = (String)request.getAttribute("currpath"); String OP = CMSAdminConstants.OP_CONFIRMCOPY; - String sType = (String) request.getAttribute("type"); + String sType = (String)request.getAttribute("type"); String sBackPath = NodeUtil.getParentPath(sCurrPath); %> <portlet:defineObjects/> <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> -<div class=" cms-tab-container"> -<table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th> - <tr> - <td class="portlet-section-body" align="left"> - <form name="pickform" action="<portlet:actionURL> + <div class=" cms-tab-container"> + <table width="100%"> + <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th> + <tr> + <td class="portlet-section-body" align="left"> + <form name="pickform" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_COPY %>"/> <portlet:param name="source" value="<%= sCurrPath %>"/> <portlet:param name="type" value="<%= sType %>"/> </portlet:actionURL>" method="post"> - <input type="hidden" name="destination" value="/"> - <table> - <tr> - <td>${n:i18n("CMS_SOURCE")}:</td> - <td><%= sCurrPath %></td> - </tr> - <tr> - <td height="25" valign="bottom">${n:i18n("CMS_DESTINATION")}:</td><td><input DISABLED type="text" size="40" - name="showdestination" value="/" - class="portlet-form-input-field"/></td> - </tr> - <tr><td></td><td valign="top"><input class="portlet-form-input-field" type="submit" value="${n:i18n("CMS_COPY")}" - name="submit"> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </form> - </td> - <td valign="top" class="portlet-section-alternate"> - <%@ include file="folderlist.jsp" %> - </td> - </tr> -</table> + <input type="hidden" name="destination" value="/"> + <table> + <tr> + <td>${n:i18n("CMS_SOURCE")}:</td> + <td><%= sCurrPath %> + </td> + </tr> + <tr> + <td height="25" valign="bottom">${n:i18n("CMS_DESTINATION")}:</td> + <td><input DISABLED type="text" size="40" + name="showdestination" value="/" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td></td> + <td valign="top"><input class="portlet-form-input-field" type="submit" + value="${n:i18n("CMS_COPY")}" + name="submit"> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </form> + </td> + <td valign="top" class="portlet-section-alternate"> + <%@ include file="folderlist.jsp" %> + </td> + </tr> + </table> + </div> </div> -</div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -10,56 +10,59 @@ <portlet:defineObjects/> <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> -<div class=" cms-tab-container"> -<table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th> - <tr> - <td valign="top" width="250" class="portlet-section-alternate"> - <%@ include file="folderlist.jsp" %> - </td> - <td class="portlet-section-body" align="left"> - <form name="pickform" action="<portlet:actionURL> + <div class=" cms-tab-container"> + <table width="100%"> + <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th> + <tr> + <td valign="top" width="250" class="portlet-section-alternate"> + <%@ include file="folderlist.jsp" %> + </td> + <td class="portlet-section-body" align="left"> + <form name="pickform" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATE_COLLECTION %>"/> <portlet:param name="createpath" value="<%= sCurrPath %>"/> </portlet:actionURL>" method="post"> - <input type="hidden" name="destination" value="<%= sCurrPath %>"> - <table> - <tr> - <td valign="bottom"> - Destination: - </td> - <td> - <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="bottom">${n:i18n("CMS_NAME")}:</td> - <td align="left"><input class="portlet-form-input-field" type="text" - name="newcollectionname" size="40" maxlength="50"> - </td> - </tr> - <tr> - <td valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td> - <td align="left"><input class="portlet-form-input-field" type="text" - name="newcollectiondescription" - size="40" maxlength="80"> - </td> - </tr> - <tr> - <td></td> - <td> - <input class="portlet-form-button" type="submit" value="${n:i18n("CMS_CREATE")}" name="submit"> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </form> - </td> - </tr> -</table> -<br/><br/> + <input type="hidden" name="destination" value="<%= sCurrPath %>"> + <table> + <tr> + <td valign="bottom"> + Destination: + </td> + <td> + <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="bottom">${n:i18n("CMS_NAME")}:</td> + <td align="left"><input class="portlet-form-input-field" type="text" + name="newcollectionname" size="40" maxlength="50"> + </td> + </tr> + <tr> + <td valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td> + <td align="left"><input class="portlet-form-input-field" type="text" + name="newcollectiondescription" + size="40" maxlength="80"> + </td> + </tr> + <tr> + <td></td> + <td> + <input class="portlet-form-button" type="submit" value="${n:i18n("CMS_CREATE")}" + name="submit"> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </form> + </td> + </tr> + </table> + <br/><br/> + </div> </div> -</div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -9,34 +9,35 @@ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> -<% - String sCurrPath = (String)request.getAttribute("currpath"); - String sBackPath = NodeUtil.getParentPath(sCurrPath); -%> + <% + String sCurrPath = (String)request.getAttribute("currpath"); + String sBackPath = NodeUtil.getParentPath(sCurrPath); + %> -<form action="<portlet:actionURL> + <form action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_DELETE %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:actionURL>" method="post"> - <table width="100%"> - <th><h3 class="sectionTitle">${n:i18n("TITLE_DELETECONFIRM")}</h3></th> - <tr> - <td align="center"> - <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %> - </font> - <br><br> - <font class="portlet-font" style="color:red"><b>${n:i18n("CMS_DELETEWARN1")}</b></font> - <br><br> - <font class="portlet-font">${n:i18n("CMS_DELETEWARN2")}</font><br> - </td> - </tr> - <tr> - <td align="center"><input type="submit" value="${n:i18n("CMS_DELETE")}" name="submit" - class="portlet-form-button"> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> -</form> -</div> - </div> \ No newline at end of file + <table width="100%"> + <th><h3 class="sectionTitle">${n:i18n("TITLE_DELETECONFIRM")}</h3></th> + <tr> + <td align="center"> + <font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %> + </font> + <br><br> + <font class="portlet-font" style="color:red"><b>${n:i18n("CMS_DELETEWARN1")}</b></font> + <br><br> + <font class="portlet-font">${n:i18n("CMS_DELETEWARN2")}</font><br> + </td> + </tr> + <tr> + <td align="center"><input type="submit" value="${n:i18n("CMS_DELETE")}" name="submit" + class="portlet-form-button"> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </form> + </div> +</div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -13,48 +13,50 @@ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> -<table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th> - <tr> - <td valign="top" width="250" class="portlet-section-alternate"> - <%@ include file="folderlist.jsp" %> - </td> - <td class="portlet-section-body" align="left"> - <form name="pickform" action="<portlet:actionURL> + <table width="100%"> + <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th> + <tr> + <td valign="top" width="250" class="portlet-section-alternate"> + <%@ include file="folderlist.jsp" %> + </td> + <td class="portlet-section-body" align="left"> + <form name="pickform" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MOVE %>"/> <portlet:param name="source" value="<%= sCurrPath %>"/> <portlet:param name="type" value="<%= sType %>"/> </portlet:actionURL>" method="post"> - <input type="hidden" name="destination" value="/"> - <table> - <tr> - <td>${n:i18n("CMS_SOURCE")}:</td> - <td><%= sCurrPath %> - </td> - </tr> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_DESTINATION")}: - </td> - <td> - <input DISABLED type="text" size="40" name="showdestination" value="/" - class="portlet-form-input-field"/> - </td> - </tr> - <tr> - <td></td> - <td> - <input class="portlet-form-button" type="submit" value="${n:i18n("CMS_MOVE")}" name="submit"> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </form> - </td> - </tr> -</table> -<br/><br/> + <input type="hidden" name="destination" value="/"> + <table> + <tr> + <td>${n:i18n("CMS_SOURCE")}:</td> + <td><%= sCurrPath %> + </td> + </tr> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_DESTINATION")}: + </td> + <td> + <input DISABLED type="text" size="40" name="showdestination" value="/" + class="portlet-form-input-field"/> + </td> + </tr> + <tr> + <td></td> + <td> + <input class="portlet-form-button" type="submit" value="${n:i18n("CMS_MOVE")}" name="submit"> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </form> + </td> + </tr> + </table> + <br/><br/> -</div> - </div> \ No newline at end of file + </div> +</div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -13,27 +13,27 @@ String[] langs = Locale.getISOLanguages(); String sDocBase = (String)request.getAttribute("document_base_url"); String sCSSURL = (String)request.getAttribute("css_url"); - + //validation handling related data String sContent = (String)request.getAttribute("error:content"); String description = (String)request.getAttribute("error:description"); String title = (String)request.getAttribute("error:title"); String language = (String)request.getAttribute("error:language"); - if(sContent == null) + if (sContent == null) { - sContent = ""; + sContent = ""; } - if(description == null) + if (description == null) { - description = ""; + description = ""; } - if(title == null) + if (title == null) { - title = ""; + title = ""; } - if(language == null) + if (language == null) { - language = ""; + language = ""; } %> @@ -42,52 +42,53 @@ src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> tinyMCE.init({ - mode : "textareas", - theme : "advanced", - theme_advanced_disable : "styleselect", - plugins : "advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash", - theme_advanced_buttons1_add : "fontselect,fontsizeselect,forecolor", - theme_advanced_buttons2_add_before: "cut,copy,paste,separator", - theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom", - theme_advanced_buttons3_add : "flash,advhr", - content_css : "<%= sCSSURL %>", - plugin_insertdate_dateFormat : "%Y-%m-%d", - plugin_insertdate_timeFormat : "%H:%M:%S", - relative_urls : "false", - document_base_url : "<%= sDocBase %>", - extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" + mode : "textareas", + theme : "advanced", + theme_advanced_disable : "styleselect", + plugins : "advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash", + theme_advanced_buttons1_add : "fontselect,fontsizeselect,forecolor", + theme_advanced_buttons2_add_before: "cut,copy,paste,separator", + theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom", + theme_advanced_buttons3_add : "flash,advhr", + content_css : "<%= sCSSURL %>", + plugin_insertdate_dateFormat : "%Y-%m-%d", + plugin_insertdate_timeFormat : "%H:%M:%S", + relative_urls : "false", + document_base_url : "<%= sDocBase %>", + extended_valid_elements : + "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" }); - + var status = true; function toggleEditor() { - if(status) - { - tinyMCE.execCommand("mceRemoveControl", false, "elm1"); - status = false; - } - else - { - tinyMCE.execCommand("mceAddControl", false, "elm1"); - status = true; - } + if(status) + { + tinyMCE.execCommand("mceRemoveControl", false, "elm1"); + status = false; } + else + { + tinyMCE.execCommand("mceAddControl", false, "elm1"); + status = true; + } + } </script> <!-- /tinyMCE --> <!-- data validation --> <script language="javascript" type="text/javascript"> - function validateAndSubmit() - { - if(document.pickform.filename.value.length == 0) - { - alert("${n:i18n("CMS_FILENAME")} is required."); - } - else - { - document.pickform.submit(); - } - } + function validateAndSubmit() + { + if(document.pickform.filename.value.length == 0) + { + alert("${n:i18n("CMS_FILENAME")} is required."); + } + else + { + document.pickform.submit(); + } + } </script> <div class="admin-ui"> <div class=" cms-tab-container"> @@ -95,85 +96,97 @@ <portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/> <portlet:param name="path" value=""/> </portlet:actionURL>"> - <input type="hidden" name="savetopath" value="<%= sCurrPath %>"> +<input type="hidden" name="savetopath" value="<%= sCurrPath %>"> - <table width="100%"> - <th ><h3 class="sectionTitle">${n:i18n("TITLE_CREATE")}</h3></th> - <tr> - <td height="10"></td> - </tr> - <tr> - <td> - <table> - <tr> - <td>${n:i18n("CMS_CREATEFILEINDIR")}: - </td> - <td><%= sCurrPath %> - </td> - </tr> - <tr> - <td>${n:i18n("CMS_FILENAME")}:</td> - <td> - <input - type="text" name="filename" - class="portlet-form-input-field"/> - : Required - </td> - </tr> - <tr> - <td>${n:i18n("CMS_DESCRIPTION")}:</td> - <td><input type="text" size="40" maxlength="80" - name="description" value="<%=description%>" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td> - ${n:i18n("CMS_TITLE")}: - </td> - <td><input type="text" size="40" maxlength="80" - name="title" value="<%=title%>" - class="portlet-form-input-field"/> - </td> - </tr> - <tr> - <td> - ${n:i18n("CMS_LANGUAGE")}: - </td> - <td><select name="language" - class="portlet-form-input-field"> - - <%if(language.equals("")){%> - <% - for (int i = 0; i < langs.length; i++) - { - %> - <option value="<%= langs[i] %>" <%if(langs[i].equals(Locale.getDefault().getLanguage())){%>selected<%}%>><%= new Locale(langs[i]).getDisplayLanguage() %></option> - <% +<table width="100%"> +<th><h3 class="sectionTitle">${n:i18n("TITLE_CREATE")}</h3></th> +<tr> + <td height="10"></td> +</tr> +<tr> + <td> + <table> + <tr> + <td>${n:i18n("CMS_CREATEFILEINDIR")}: + </td> + <td><%= sCurrPath %> + </td> + </tr> + <tr> + <td>${n:i18n("CMS_FILENAME")}:</td> + <td> + <input + type="text" name="filename" + class="portlet-form-input-field"/> + : Required + </td> + </tr> + <tr> + <td>${n:i18n("CMS_DESCRIPTION")}:</td> + <td><input type="text" size="40" maxlength="80" + name="description" value="<%=description%>" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td> + ${n:i18n("CMS_TITLE")}: + </td> + <td><input type="text" size="40" maxlength="80" + name="title" value="<%=title%>" + class="portlet-form-input-field"/> + </td> + </tr> + <tr> + <td> + ${n:i18n("CMS_LANGUAGE")}: + </td> + <td><select name="language" + class="portlet-form-input-field"> + + <% + if (language.equals("")) + { + %> + <% + for (int i = 0; i < langs.length; i++) + { + %> + <option value="<%= langs[i] %>" + <%if(langs[i].equals(Locale.getDefault().getLanguage())){%>selected<%}%>><%= new Locale(langs[i]).getDisplayLanguage() %> + </option> + <% + } + %> + <% } - %> - <%}else{%> - <% - for (int i = 0; i < langs.length; i++) + else { - %> - <option value="<%= langs[i] %>" <%if(langs[i].equals(language)){%>selected<%}%>><%= new Locale(langs[i]).getDisplayLanguage() %></option> - <% - } - %> - <%}%> - </select> - </td> - </tr> - <tr> - <td class="portlet-section-header" valign="bottom"> - ${n:i18n("CMS_WYSIWYG")}: - </td> - <td> - <input type="checkbox" name="wysiwyg" class="portlet-form-input-field" checked onclick="javascript:toggleEditor();"/> - </td> - </tr> - </table> -</td> + %> + <% + for (int i = 0; i < langs.length; i++) + { + %> + <option value="<%= langs[i] %>" + <%if(langs[i].equals(language)){%>selected<%}%>><%= new Locale(langs[i]).getDisplayLanguage() %> + </option> + <% + } + %> + <%}%> + </select> + </td> + </tr> + <tr> + <td class="portlet-section-header" valign="bottom"> + ${n:i18n("CMS_WYSIWYG")}: + </td> + <td> + <input type="checkbox" name="wysiwyg" class="portlet-form-input-field" checked + onclick="javascript:toggleEditor();"/> + </td> + </tr> + </table> + </td> </tr> <tr> <td height="10"></td> @@ -193,11 +206,14 @@ </tr> <tr> <td align="center"> - <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"><%= sContent %></textarea> + <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%"><%= sContent %> + </textarea> <br> - <input type="button" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button" onclick="javascript:validateAndSubmit();"/> + <input type="button" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button" + onclick="javascript:validateAndSubmit();"/> <input type="reset" name="reset" value="Reset" class="portlet-form-button"/> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> </td> </tr> </table> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -23,38 +23,39 @@ <!-- tinyMCE --> <script language="javascript" type="text/javascript" src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/tiny_mce/tiny_mce_src.js"></script> -<script language="javascript" type="text/javascript"> +<script language="javascript" type="text/javascript"> tinyMCE.init({ - mode : "textareas", - theme : "advanced", - theme_advanced_disable : "styleselect", - plugins : "advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash", - theme_advanced_buttons1_add : "fontselect,fontsizeselect,forecolor", - theme_advanced_buttons2_add_before: "cut,copy,paste,separator", - theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom", - theme_advanced_buttons3_add : "iespell,flash,advhr", - content_css : "<%= sCSSURL %>", - plugin_insertdate_dateFormat : "%Y-%m-%d", - plugin_insertdate_timeFormat : "%H:%M:%S", - relative_urls : "false", - document_base_url : "<%= sDocBase %>", - extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" + mode : "textareas", + theme : "advanced", + theme_advanced_disable : "styleselect", + plugins : "advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash", + theme_advanced_buttons1_add : "fontselect,fontsizeselect,forecolor", + theme_advanced_buttons2_add_before: "cut,copy,paste,separator", + theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom", + theme_advanced_buttons3_add : "iespell,flash,advhr", + content_css : "<%= sCSSURL %>", + plugin_insertdate_dateFormat : "%Y-%m-%d", + plugin_insertdate_timeFormat : "%H:%M:%S", + relative_urls : "false", + document_base_url : "<%= sDocBase %>", + extended_valid_elements : + "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]" }); - + var status = true; function toggleEditor() - { - if(status) - { - tinyMCE.execCommand("mceRemoveControl", false, "elm1"); - status = false; - } - else - { - tinyMCE.execCommand("mceAddControl", false, "elm1"); - status = true; - } - } + { + if(status) + { + tinyMCE.execCommand("mceRemoveControl", false, "elm1"); + status = false; + } + else + { + tinyMCE.execCommand("mceAddControl", false, "elm1"); + status = true; + } + } </script> <!-- /tinyMCE --> @@ -65,108 +66,110 @@ </portlet:actionURL>"> <table width="100%"> - <th><h3 class="sectionTitle">${n:i18n("TITLE_EDIT")}</h3></th> - <tr> - <td height="10"></td> - </tr> - <tr> - <td> +<th><h3 class="sectionTitle">${n:i18n("TITLE_EDIT")}</h3></th> +<tr> + <td height="10"></td> +</tr> +<tr> + <td> +<tr> + <td> + <table> <tr> + <td>${n:i18n("CMS_EDITING")}: + </td> + <td><%= sCurrPath %> + </td> + </tr> + <tr> <td> - <table> - <tr> - <td>${n:i18n("CMS_EDITING")}: - </td> - <td><%= sCurrPath %> - </td> - </tr> - <tr> - <td> - ${n:i18n("CMS_DESCRIPTION")}: - </td> - <td><input type="text" - size="40" - maxlength="80" - name="description" - value="<%= sDescription %>" - class="portlet-form-input-field"/> - </td> - </tr> - <tr> - <td> - ${n:i18n("CMS_TITLE")}: - </td> - <td><input type="text" size="40" - maxlength="80" - name="title" - value="<%= sTitle %>" - class="portlet-form-input-field"/> - </td> - </tr> - <tr> - <td> - ${n:i18n("CMS_LANGUAGE")}: - </td> - <td><%= new Locale(sLanguage).getDisplayLanguage() %> - </td> - </tr> - <tr> - <td> - ${n:i18n("CMS_LIVE")}: - </td> - <td><input type="checkbox" name="makelive" checked - class="portlet-form-input-field"/> - </td> - </tr> - <tr> - <td> - ${n:i18n("CMS_VERSION")}: - </td> - <td><%= sVersion %> - </td> - </tr> - <tr> - <td class="portlet-section-header" valign="bottom"> - ${n:i18n("CMS_WYSIWYG")}: - </td> - <td> - <input type="checkbox" name="wysiwyg" class="portlet-form-input-field" checked onclick="javascript:toggleEditor();"/> - </td> - </tr> - </table> + ${n:i18n("CMS_DESCRIPTION")}: </td> + <td><input type="text" + size="40" + maxlength="80" + name="description" + value="<%= sDescription %>" + class="portlet-form-input-field"/> + </td> </tr> <tr> - <td height="10"></td> + <td> + ${n:i18n("CMS_TITLE")}: + </td> + <td><input type="text" size="40" + maxlength="80" + name="title" + value="<%= sTitle %>" + class="portlet-form-input-field"/> + </td> </tr> <tr> - <td class="portlet-section-alternate"> - <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" - border="0" - alt="Info"> Links to resources within this portal should be absolute. For example: A link to an - image - located in default/images/back.gif - should be typed in exactly as shown here. - Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking - on - the - preview button in the editor. + <td> + ${n:i18n("CMS_LANGUAGE")}: </td> + <td><%= new Locale(sLanguage).getDisplayLanguage() %> + </td> </tr> <tr> - <td height="10"></td> + <td> + ${n:i18n("CMS_LIVE")}: + </td> + <td><input type="checkbox" name="makelive" checked + class="portlet-form-input-field"/> + </td> </tr> <tr> - <td align="center"> - <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%" class="textarea"> - <%= sContent %> - </textarea> - <br> - <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/> - <input type="reset" name="reset" value="Reset" class="portlet-form-button"/> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + <td> + ${n:i18n("CMS_VERSION")}: </td> + <td><%= sVersion %> + </td> </tr> + <tr> + <td class="portlet-section-header" valign="bottom"> + ${n:i18n("CMS_WYSIWYG")}: + </td> + <td> + <input type="checkbox" name="wysiwyg" class="portlet-form-input-field" checked + onclick="javascript:toggleEditor();"/> + </td> + </tr> + </table> + </td> +</tr> +<tr> + <td height="10"></td> +</tr> +<tr> + <td class="portlet-section-alternate"> + <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" + border="0" + alt="Info"> Links to resources within this portal should be absolute. For example: A link to an + image + located in default/images/back.gif + should be typed in exactly as shown here. + Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking + on + the + preview button in the editor. + </td> +</tr> +<tr> + <td height="10"></td> +</tr> +<tr> + <td align="center"> + <textarea id="elm1" name="elm1" rows="20" cols="80" style="width: 100%" class="textarea"> + <%= sContent %> + </textarea> + <br> + <input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/> + <input type="reset" name="reset" value="Reset" class="portlet-form-button"/> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> +</tr> </table> </form> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -8,60 +8,63 @@ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> -<% - String sCurrPath = (String)request.getAttribute("currpath"); - String sLanguage = (String)request.getAttribute("language"); -%> + <% + String sCurrPath = (String)request.getAttribute("currpath"); + String sLanguage = (String)request.getAttribute("language"); + %> -<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL> + <form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_EDIT_BINARY %>"/> </portlet:actionURL>"> - <input type="hidden" name="destination" value="<%= sCurrPath %>"> - <input type="hidden" name="language" value="<%= sLanguage %>"> - <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th> - <tr> - <td align="left"> - <table> - <tr> - <td valign="top" width="150"> - ${n:i18n("CMS_EDITING")}: - </td> - <td valign="top"><%= sCurrPath %> - </td> - </tr> - <tr> - <td valign="top"> - ${n:i18n("CMS_DESCRIPTION")}: - </td> - <td valign="top"><input type="text" size="40" maxlength="80" name="description" value="" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="top"> - ${n:i18n("CMS_TITLE")}: - </td> - <td valign="top"><input type="text" size="40" maxlength="80" name="title" value="" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="top">${n:i18n("CMS_LIVE")}:</td> - <td valign="top"><input type="checkbox" name="makelive" checked - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td colspan="2"> - <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/> - <br> - <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </td> - </tr> - </table> -</form> + <input type="hidden" name="destination" value="<%= sCurrPath %>"> + <input type="hidden" name="language" value="<%= sLanguage %>"> + <table width="100%"> + <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th> + <tr> + <td align="left"> + <table> + <tr> + <td valign="top" width="150"> + ${n:i18n("CMS_EDITING")}: + </td> + <td valign="top"><%= sCurrPath %> + </td> + </tr> + <tr> + <td valign="top"> + ${n:i18n("CMS_DESCRIPTION")}: + </td> + <td valign="top"><input type="text" size="40" maxlength="80" name="description" value="" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="top"> + ${n:i18n("CMS_TITLE")}: + </td> + <td valign="top"><input type="text" size="40" maxlength="80" name="title" value="" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="top">${n:i18n("CMS_LIVE")}:</td> + <td valign="top"><input type="checkbox" name="makelive" checked + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td colspan="2"> + <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/> + <br> + <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" + class="portlet-form-button"/> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> -</div> + </div> </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,4 +1,3 @@ -<%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -13,58 +12,60 @@ %> <div class="admin-ui"> <div class=" cms-tab-container"> -<form name="pickform" method="post" action="<portlet:actionURL> + <form name="pickform" method="post" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/> </portlet:actionURL>"> - <input type="hidden" name="destination" value="<%= sCurrPath %>"> - <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> - <tr> - <td valign="top" width="250" class="portlet-section-alternate"> - <%@ include file="folderlist.jsp" %> - </td> - <td align="left"> - <table> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_EXPORTARCHIVE")}: - </td> - <td> - <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_LANGUAGE")}: - </td> - <td><select name="language" class="portlet-form-input-field"> - <option selected - value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %> - </option> - <% - for (int i = 0; i < langs.length; i++) - { - %> - <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %> - </option> - <% - } - %> - </select> - </td> - </tr> - <tr> - <td colspan="2"> - <br><br> - <input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}" - class="portlet-form-button"/> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </td> - </tr> - </table> -</form> -</div> + <input type="hidden" name="destination" value="<%= sCurrPath %>"> + <table width="100%"> + <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> + <tr> + <td valign="top" width="250" class="portlet-section-alternate"> + <%@ include file="folderlist.jsp" %> + </td> + <td align="left"> + <table> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_EXPORTARCHIVE")}: + </td> + <td> + <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_LANGUAGE")}: + </td> + <td><select name="language" class="portlet-form-input-field"> + <option selected + value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %> + </option> + <% + for (int i = 0; i < langs.length; i++) + { + %> + <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %> + </option> + <% + } + %> + </select> + </td> + </tr> + <tr> + <td colspan="2"> + <br><br> + <input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}" + class="portlet-form-button"/> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> + </div> </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -8,34 +8,39 @@ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> -<% - String sCurrPath = (String) request.getAttribute("currpath"); -%> + <% + String sCurrPath = (String)request.getAttribute("currpath"); + %> -<table width="100%"> - <th ><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> - <tr> - <td align="left"> - <table width="100%"> - <tr> - <td align="center"> - Your export of <b><%= sCurrPath %></b> is ready for download. - </td> - </tr> - <tr><td height="10">&nbsp;</td></tr> - <tr> - <td align="center"> - <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img - src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif" - alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/> - <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a> - <br/> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </td> - </tr> -</table> + <table width="100%"> + <th><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> + <tr> + <td align="left"> + <table width="100%"> + <tr> + <td align="center"> + Your export of <b><%= sCurrPath %> + </b> is ready for download. + </td> + </tr> + <tr> + <td height="10">&nbsp;</td> + </tr> + <tr> + <td align="center"> + <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img + src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif" + alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/> + <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a> + <br/> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> </div> -</div> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -8,24 +8,27 @@ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <div class="admin-ui"> <div class=" cms-tab-container"> -<% - String sCurrPath = (String)request.getAttribute("currpath"); -%> + <% + String sCurrPath = (String)request.getAttribute("currpath"); + %> -<table width="100%"> - <th ><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> - <tr> - <td align="left"> - <table width="100%"> - <tr> - <td align="center"><font color="red">ERROR processing export request!</font></td> - </tr> - <tr> - <td align="center"><input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"></td> - </tr> - </table> - </td> - </tr> -</table> -</div> + <table width="100%"> + <th><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th> + <tr> + <td align="left"> + <table width="100%"> + <tr> + <td align="center"><font color="red">ERROR processing export request!</font></td> + </tr> + <tr> + <td align="center"><input class="portlet-form-button" type="button" + value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </td> + </tr> + </table> + </div> </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -2,6 +2,7 @@ <%@ page import="org.jboss.portal.cms.util.NodeUtil" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page import="java.util.List" %> +<%@ page import="java.util.Locale" %> <%@ page import="java.util.StringTokenizer" %> <%@ page isELIgnored="false" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> @@ -15,8 +16,8 @@ <script language="JavaScript" type="text/javascript"> function fillform(val) { - this.document.pickform.destination.value = val; - this.document.pickform.showdestination.value = val; + this.document.pickform.destination.value = val; + this.document.pickform.showdestination.value = val; } </script> @@ -100,7 +101,7 @@ </portlet:renderURL> "><img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0" alt="Expand"/></a>&nbsp;<a href="javascript:fillform('<%= folder.getBasePath() %>')"><%= - folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %></a> +folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %></a> <br> <% Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/help.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -25,7 +25,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <h3 class="sectionTitle"> -${n:i18n("CMS_MANAGE")} + ${n:i18n("CMS_MANAGE")} </h3> <!-- Currently browsing --> @@ -36,94 +36,98 @@ </portlet:renderURL>">Home</a></li> -<% - StringTokenizer parser = new StringTokenizer(sCurrPath, "/"); - String sPathBuilder = ""; - while (parser.hasMoreTokens()) - { - String sPathChunk = parser.nextToken(); - sPathBuilder += "/" + sPathChunk; - if (parser.hasMoreTokens()) + <% + StringTokenizer parser = new StringTokenizer(sCurrPath, "/"); + String sPathBuilder = ""; + while (parser.hasMoreTokens()) { -%> + String sPathChunk = parser.nextToken(); + sPathBuilder += "/" + sPathChunk; + if (parser.hasMoreTokens()) + { + %> <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> - <li class="pathItem"><a href=" + <li class="pathItem"><a href=" <portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="<%= sPathBuilder %>"/> </portlet:renderURL> "><%= sPathChunk %> -</a> - </li> -<% -} -else -{ -%> -<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> - <li class="selected"><%= sPathChunk %></li> -<% + </a> + </li> + <% + } + else + { + %> + <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> + <li class="selected"><%= sPathChunk %> + </li> + <% + } } - } -%> + %> </ul> <br/> <!-- folder-level action dropdown --> <div class="menu-container"> <div class="menu"> -<select onchange="window.open(this.options[this.selectedIndex].value,'_top')"> - <option value="">Select Action...</option> - <option value="<portlet:renderURL> + <select onchange="window.open(this.options[this.selectedIndex].value,'_top')"> + <option value="">Select Action...</option> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/> </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option> - <%if(manageWorkflowAccessible.booleanValue()){%> - <option value="<portlet:renderURL> + <% + if (manageWorkflowAccessible.booleanValue()) + { + %> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option> - <%}%> - <% - if (!"/".equals(sCurrPath)) - { - %> - <option value="<portlet:renderURL> + <%}%> + <% + if (!"/".equals(sCurrPath)) + { + %> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> <portlet:param name="type" value="fo"/> </portlet:renderURL>">${n:i18n("CMS_COPY")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> <portlet:param name="type" value="fo"/> </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option> - <option value="<portlet:renderURL> + <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option> - <% } %> -</select> + <% } %> + </select> </div> @@ -134,16 +138,17 @@ <portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/> </portlet:actionURL>"> - <input type="text" - size="15" - maxlength="80" - name="search" - class="portlet-form-input-field"/> - <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/> + <input type="text" + size="15" + maxlength="80" + name="search" + class="portlet-form-input-field"/> + <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/> </form> </div> <br style="clear:both"/> + <div class="file-table-container"> <% @@ -278,14 +283,16 @@ </td> </tr> <% - } - }else{%> + } +} +else +{%> - <tr> - <td> - <p>This folder is empty.</p> - </td> - </tr> +<tr> + <td> + <p>This folder is empty.</p> + </td> +</tr> <% } Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,7 +22,7 @@ <h3 class="sectionTitle"> -${n:i18n("CMS_MAIN_USE")} + ${n:i18n("CMS_MAIN_USE")} </h3> @@ -34,52 +34,57 @@ </portlet:renderURL>">Home</a></li> -<% - StringTokenizer parser = new StringTokenizer(sCurrPath, "/"); - String sPathBuilder = ""; - while (parser.hasMoreTokens()) - { - String sPathChunk = parser.nextToken(); - sPathBuilder += "/" + sPathChunk; - if (parser.hasMoreTokens()) + <% + StringTokenizer parser = new StringTokenizer(sCurrPath, "/"); + String sPathBuilder = ""; + while (parser.hasMoreTokens()) { -%> + String sPathChunk = parser.nextToken(); + sPathBuilder += "/" + sPathChunk; + if (parser.hasMoreTokens()) + { + %> <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> - <li class="pathItem"><a href=" + <li class="pathItem"><a href=" <portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/> <portlet:param name="path" value="<%= sPathBuilder %>"/> </portlet:renderURL> "><%= sPathChunk %> -</a> - </li> -<% -} -else -{ -%> -<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> - <li class="selected"><%= sPathChunk %></li> -<% + </a> + </li> + <% + } + else + { + %> + <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> + <li class="selected"><%= sPathChunk %> + </li> + <% + } } - } -%> + %> </ul> <br/> <!-- show any errors here --> -<%if(exception!=null && exception.trim().length()>0){%> +<% + if (exception != null && exception.trim().length() > 0) + { +%> <table width="100%"> -<th colspan="2"><h3 class="sectionTitle">Error:</h3></th> -<tr colspan="2" align="center"> - <td colspan="2"> - <font color="red"> - <%=exception%> - </font> - </td> -</tr> + <th colspan="2"><h3 class="sectionTitle">Error:</h3></th> + <tr colspan="2" align="center"> + <td colspan="2"> + <font color="red"> + <%=exception%> + </font> + </td> + </tr> </table> <br/><br/> -<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'"> +<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'"> <%}%> <!-- the table listing the pending queue items --> @@ -98,7 +103,7 @@ for (Iterator itr = pendingQueue.iterator(); itr.hasNext();) { %> - <% + <% org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content)itr.next(); String linkPath = cour.getPath().substring(0, cour.getPath().lastIndexOf("/")); Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -15,7 +15,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <h3 class="sectionTitle"> -${n:i18n("CMS_MANAGE")} + ${n:i18n("CMS_MANAGE")} </h3> <!-- Currently browsing --> <ul class="objectpath"> @@ -27,22 +27,21 @@ <br/> <div class="search-container"> -<form method="post" action="<portlet:actionURL> + <form method="post" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/> </portlet:actionURL>"> - <input type="text" - size="15" - maxlength="80" - name="search" - class="portlet-form-input-field" - value="<%= request.getAttribute("textQuery") %>" - /> - <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/> -</form> + <input type="text" + size="15" + maxlength="80" + name="search" + class="portlet-form-input-field" + value="<%= request.getAttribute("textQuery") %>" + /> + <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/> + </form> </div> - <% List files = (List)request.getAttribute("files"); String createDate = ""; @@ -52,74 +51,75 @@ { %> <table> -<% + <% for (int i = 0; i < files.size(); i++) { File file = (File)files.get(i); -%> -<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';"> - <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif" - alt="${n:i18n("CMS_FILE")}" - border="0">&nbsp;<a href="<portlet:renderURL> + %> + <tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';"> + <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif" + alt="${n:i18n("CMS_FILE")}" + border="0">&nbsp;<a href="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/> <portlet:param name="path" value="<%= file.getBasePath() %>"/> </portlet:renderURL>"><%= - file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %> - </a> - </td> - <td> - <form method="POST" style="padding:0;margin:0;" action="<portlet:actionURL> + file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %> + </a> + </td> + <td> + <form method="POST" style="padding:0;margin:0;" action="<portlet:actionURL> <portlet:param name="path" value="<%= file.getBasePath() %>"/> <portlet:param name="type" value="fi"/> <portlet:param name="dispatch" value="1"/> </portlet:actionURL>"> - <select name="op"> - <option value="<%= CMSAdminConstants.OP_VIEWFILE %>">${n:i18n("CMS_VIEW")}</option> - <option value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>">${n:i18n("CMS_COPY")}</option> - <option value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>">${n:i18n("CMS_MOVE")}</option> - <option value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>">${n:i18n("CMS_DELETE")}</option> - </select> - <input type="submit" value="Go" name="Go" class="portlet-form-button"/> - </form> - </td> - <td> - <% - if (file.getCreationDate() != null) - { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - createDate = formatter.format(file.getCreationDate()); - } - %> - <%= createDate %> - </td> - <td> - <% - if (file.getLastModified() != null) - { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - modifiedDate = formatter.format(file.getLastModified()); - } - %> - <%= modifiedDate %> - </td> -</tr> -<% + <select name="op"> + <option value="<%= CMSAdminConstants.OP_VIEWFILE %>">${n:i18n("CMS_VIEW")}</option> + <option value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>">${n:i18n("CMS_COPY")}</option> + <option value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>">${n:i18n("CMS_MOVE")}</option> + <option value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>">${n:i18n("CMS_DELETE")}</option> + </select> + <input type="submit" value="Go" name="Go" class="portlet-form-button"/> + </form> + </td> + <td> + <% + if (file.getCreationDate() != null) + { + Format formatter; + formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); + createDate = formatter.format(file.getCreationDate()); + } + %> + <%= createDate %> + </td> + <td> + <% + if (file.getLastModified() != null) + { + Format formatter; + formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); + modifiedDate = formatter.format(file.getLastModified()); + } + %> + <%= modifiedDate %> + </td> + </tr> + <% } -%> + %> </table> <% +} +else +{ +%> +<h2>${n:i18n("CMS_SEARCHNORESULT")}</h2> +<% } - else - { -%> - <h2>${n:i18n("CMS_SEARCHNORESULT")}</h2> -<% - } %> -<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'"> +<input class="portlet-form-button" type="button" value="Cancel" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'"> </div> </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,7 +1,5 @@ +<%@ page import="org.jboss.portal.cms.security.AuthorizationManager" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> -<%@ page import="org.jboss.portal.identity.Role" %> -<%@ page import="org.jboss.portal.identity.User" %> -<%@ page import="org.jboss.portal.cms.security.AuthorizationManager" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.Set" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> @@ -10,14 +8,14 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> - <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> +<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/> <% String sCurrPath = (String)request.getAttribute("currpath"); Set roleSet = (Set)request.getAttribute("roles"); Set userSet = (Set)request.getAttribute("users"); String sConfirm = (String)request.getAttribute("confirm"); String returnOp = (String)request.getAttribute("returnOp"); - + Set readRoleSet = (Set)request.getAttribute("readRoleSet"); Set readUserSet = (Set)request.getAttribute("readUserSet"); Set writeRoleSet = (Set)request.getAttribute("writeRoleSet"); @@ -65,8 +63,9 @@ <tr> <td> <select name="secureroles:read" multiple="multiple"> - <option value="<%=AuthorizationManager.Anonymous%>" <%if(readRoleSet.contains(AuthorizationManager.Anonymous)){%>selected<%}%>> - Anonymous + <option value="<%=AuthorizationManager.Anonymous%>" + <%if(readRoleSet.contains(AuthorizationManager.Anonymous)){%>selected<%}%>> + Anonymous </option> <% Iterator iterator = roleSet.iterator(); @@ -75,7 +74,7 @@ Role role = (Role)iterator.next(); %> <option value="<%= role.getName() %>" <%if(readRoleSet.contains(role.getName())){%>selected<%}%>> - <%= role.getDisplayName() %> + <%= role.getDisplayName() %> </option> <% } @@ -98,8 +97,9 @@ { User user = (User)iteratorUser.next(); %> - <option value="<%= user.getUserName() %>" <%if(readUserSet.contains(user.getUserName())){%>selected<%}%>> - <%= user.getUserName() %> + <option value="<%= user.getUserName() %>" + <%if(readUserSet.contains(user.getUserName())){%>selected<%}%>> + <%= user.getUserName() %> </option> <% } @@ -125,8 +125,9 @@ <tr> <td> <select name="secureroles:write" multiple="multiple"> - <option value="<%=AuthorizationManager.Anonymous%>" <%if(writeRoleSet.contains(AuthorizationManager.Anonymous)){%>selected<%}%>> - Anonymous + <option value="<%=AuthorizationManager.Anonymous%>" + <%if(writeRoleSet.contains(AuthorizationManager.Anonymous)){%>selected<%}%>> + Anonymous </option> <% iterator = roleSet.iterator(); @@ -135,7 +136,7 @@ Role role = (Role)iterator.next(); %> <option value="<%= role.getName() %>" <%if(writeRoleSet.contains(role.getName())){%>selected<%}%>> - <%= role.getDisplayName() %> + <%= role.getDisplayName() %> </option> <% } @@ -158,8 +159,9 @@ { User user = (User)iteratorUser.next(); %> - <option value="<%= user.getUserName() %>" <%if(writeUserSet.contains(user.getUserName())){%>selected<%}%>> - <%= user.getUserName() %> + <option value="<%= user.getUserName() %>" + <%if(writeUserSet.contains(user.getUserName())){%>selected<%}%>> + <%= user.getUserName() %> </option> <% } @@ -185,8 +187,9 @@ <tr> <td> <select name="secureroles:manage" multiple="multiple"> - <option value="<%=AuthorizationManager.Anonymous%>" <%if(manageRoleSet.contains(AuthorizationManager.Anonymous)){%>selected<%}%>> - Anonymous + <option value="<%=AuthorizationManager.Anonymous%>" + <%if(manageRoleSet.contains(AuthorizationManager.Anonymous)){%>selected<%}%>> + Anonymous </option> <% iterator = roleSet.iterator(); @@ -195,7 +198,7 @@ Role role = (Role)iterator.next(); %> <option value="<%= role.getName() %>" <%if(manageRoleSet.contains(role.getName())){%>selected<%}%>> - <%= role.getDisplayName() %> + <%= role.getDisplayName() %> </option> <% } @@ -218,8 +221,9 @@ { User user = (User)iteratorUser.next(); %> - <option value="<%= user.getUserName() %>" <%if(manageUserSet.contains(user.getUserName())){%>selected<%}%>> - <%= user.getUserName() %> + <option value="<%= user.getUserName() %>" + <%if(manageUserSet.contains(user.getUserName())){%>selected<%}%>> + <%= user.getUserName() %> </option> <% } @@ -239,8 +243,9 @@ <tr> <td align="center" colspan="2"><input type="submit" value="${n:i18n("CMS_SECURE")}" name="submit" class="portlet-form-button"> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= returnOp %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> - </td> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= returnOp %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> </tr> </table> </form> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,4 +1,3 @@ -<%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -13,72 +12,75 @@ %> <div class="admin-ui"> <div class=" cms-tab-container"> -<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL> + <form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONTENT %>"/> </portlet:actionURL>"> - <input type="hidden" name="destination" value="<%= sCurrPath %>"> - <table width="100%"> - <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th> - <tr> - <td valign="top" width="250" class="portlet-section-alternate"> - <%@ include file="folderlist.jsp" %> - </td> - <td align="left"> - <table> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_DESTINATION")}: - </td> - <td> - <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_DESCRIPTION")}: - </td> - <td><input type="text" size="40" maxlength="80" name="description" value="" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_TITLE")}: - </td> - <td><input type="text" size="40" maxlength="80" name="title" value="" - class="portlet-form-input-field"/></td> - </tr> - <tr> - <td valign="bottom"> - ${n:i18n("CMS_LANGUAGE")}: - </td> - <td><select name="language" class="portlet-form-input-field"> - <option selected - value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %> - </option> - <% - for (int i = 0; i < langs.length; i++) - { - %> - <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %> - </option> - <% - } - %> - </select> - </td> - </tr> - <tr> - <td colspan="2" align="left"> - <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/> - <br><br> - <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/> - <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> - </td> - </tr> - </table> - </td> - </tr> - </table> -</form> -</div> + <input type="hidden" name="destination" value="<%= sCurrPath %>"> + <table width="100%"> + <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th> + <tr> + <td valign="top" width="250" class="portlet-section-alternate"> + <%@ include file="folderlist.jsp" %> + </td> + <td align="left"> + <table> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_DESTINATION")}: + </td> + <td> + <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_DESCRIPTION")}: + </td> + <td><input type="text" size="40" maxlength="80" name="description" value="" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_TITLE")}: + </td> + <td><input type="text" size="40" maxlength="80" name="title" value="" + class="portlet-form-input-field"/></td> + </tr> + <tr> + <td valign="bottom"> + ${n:i18n("CMS_LANGUAGE")}: + </td> + <td><select name="language" class="portlet-form-input-field"> + <option selected + value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %> + </option> + <% + for (int i = 0; i < langs.length; i++) + { + %> + <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %> + </option> + <% + } + %> + </select> + </td> + </tr> + <tr> + <td colspan="2" align="left"> + <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/> + <br><br> + <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" + class="portlet-form-button"/> + <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" + name="cancel" + onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> + </div> </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,4 +1,3 @@ -<%@ page import="java.util.Locale" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -9,7 +8,7 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <% - String sCurrPath = (String) request.getAttribute("currpath"); + String sCurrPath = (String)request.getAttribute("currpath"); String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM; String[] langs = Locale.getISOLanguages(); %> @@ -43,7 +42,8 @@ value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %> </option> <% - for (int i = 0; i < langs.length; i++) { + for (int i = 0; i < langs.length; i++) + { %> <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %> </option> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -20,19 +20,21 @@ <div class="admin-ui"> <div class=" cms-tab-container"> <% - String sCurrPath = (String) request.getAttribute("currpath"); - Vector vContents = (Vector) request.getAttribute("contents"); - Collection pendingQueue = (Collection) request.getAttribute("pendingQueue"); + String sCurrPath = (String)request.getAttribute("currpath"); + Vector vContents = (Vector)request.getAttribute("contents"); + Collection pendingQueue = (Collection)request.getAttribute("pendingQueue"); String sType = ""; - if (vContents.size() > 0) { - List contentList = (List) vContents.elementAt(0); - if (contentList.size() > 0) { - Content content = (Content) contentList.get(0); + if (vContents.size() > 0) + { + List contentList = (List)vContents.elementAt(0); + if (contentList.size() > 0) + { + Content content = (Content)contentList.get(0); sType = content.getMimeType(); } } - String sPreviewPath = (String) request.getAttribute("previewpath"); + String sPreviewPath = (String)request.getAttribute("previewpath"); String createDate = ""; String modifiedDate = ""; @@ -40,7 +42,7 @@ String rowClass = "portlet-section-body"; String exception = request.getParameter("exception"); - Boolean manageWorkflowAccessible = (Boolean) request.getAttribute("manageWorkflowAccessible"); + Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible"); %> <h3 class="sectionTitle"> @@ -58,10 +60,12 @@ <% StringTokenizer parser = new StringTokenizer(sCurrPath, "/"); String sPathBuilder = ""; - while (parser.hasMoreTokens()) { + while (parser.hasMoreTokens()) + { String sPathChunk = parser.nextToken(); sPathBuilder += "/" + sPathChunk; - if (parser.hasMoreTokens()) { + if (parser.hasMoreTokens()) + { %> <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> <li class="pathItem"><a href=" @@ -73,7 +77,9 @@ </a> </li> <% - } else { + } + else + { %> <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> <li class="selected"><%= sPathChunk %> @@ -91,14 +97,17 @@ <select onchange="window.open(this.options[this.selectedIndex].value,'_top')"> <option value="">Select Action...</option> <% - if (sType.equals("text/html") || sType.equals("text/plain")) { + if (sType.equals("text/html") || sType.equals("text/plain")) + { %> <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/> <portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/> </portlet:renderURL>">${n:i18n("CMS_CREATE")}</option> <% - } else { + } + else + { %> <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/> @@ -126,7 +135,10 @@ <portlet:param name="path" value="<%= sCurrPath %>"/> <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/> </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option> - <%if (manageWorkflowAccessible.booleanValue()) {%> + <% + if (manageWorkflowAccessible.booleanValue()) + { + %> <option value="<portlet:renderURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/> <portlet:param name="path" value="<%= sCurrPath %>"/> @@ -140,12 +152,14 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0"> <% - if (vContents.size() > 0) { + if (vContents.size() > 0) + { for (int j = 0; j < vContents.size(); j++) // cycle thru list of content nodes { - List contentList = (List) vContents.elementAt(j); - if (contentList.size() > 0) { - Content content = (Content) contentList.get(0); + List contentList = (List)vContents.elementAt(j); + if (contentList.size() > 0) + { + Content content = (Content)contentList.get(0); %> <tr> <td height="15"></td> @@ -153,7 +167,8 @@ <tr> <td colspan="6"> <% - if (sType.equals("text/html") || sType.equals("text/plain")) { + if (sType.equals("text/html") || sType.equals("text/plain")) + { %> <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif" alt="${n:i18n("CMS_EDIT")}" border="0">&nbsp;<a href="<portlet:renderURL> @@ -163,7 +178,9 @@ </portlet:renderURL>"><%= content.getLocale().getDisplayLanguage() %> </a> <% - } else { + } + else + { %> <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif" alt="${n:i18n("CMS_EDIT")}" border="0">&nbsp;<a href="<portlet:renderURL> @@ -188,22 +205,27 @@ <% for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes { - Content version = (Content) contentList.get(i); + Content version = (Content)contentList.get(i); - if (version.isWaitingForPublishApproval()) { + if (version.isWaitingForPublishApproval()) + { continue; } - if (i % 2 == 0) { + if (i % 2 == 0) + { rowClass = "portlet-section-body"; - } else { + } + else + { rowClass = "portlet-section-alternate"; } %> <tr onmouseover="this.className='portlet-section-selected';" onmouseout="this.className='<%= rowClass %>';" class="<%= rowClass %>"> <td><% - if (sType.equals("text/html") || sType.equals("text/plain")) { + if (sType.equals("text/html") || sType.equals("text/plain")) + { %> <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif" @@ -215,7 +237,9 @@ </portlet:renderURL>"><%= version.getMimeType() %> </a> <% - } else { + } + else + { %> <%= version.getMimeType() %> <% @@ -225,10 +249,13 @@ <td><%= version.getSize() / 1024 %>kb</td> <td> <% - if (sType.equals("text/html") || sType.equals("text/plain")) { + if (sType.equals("text/html") || sType.equals("text/plain")) + { %> <%= version.getVersionNumber() %> - <% } else { + <% } + else + { //save the principal for the preview servlet String remoteUser = request.getRemoteUser(); request.getSession().setAttribute("remoteUser", remoteUser); @@ -239,12 +266,15 @@ </a> <% } - if (version.isLive()) { + if (version.isLive()) + { %> <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_IsDefault.gif" alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/> <% - } else { + } + else + { %> <a href="<portlet:actionURL> <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAKELIVE %>"/> @@ -252,15 +282,17 @@ <portlet:param name="language" value="<%= content.getLocale().getLanguage() %>"/> <portlet:param name="version" value="<%= version.getVersionNumber() %>"/> </portlet:actionURL>" - > - <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_MakeDefault.gif" - alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/> + > + <img + src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_MakeDefault.gif" + alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/> </a> <%}%> </td> <td> <% - if (version.getCreationDate() != null) { + if (version.getCreationDate() != null) + { Format formatter; formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); createDate = formatter.format(version.getCreationDate()); @@ -270,7 +302,8 @@ </td> <td> <% - if (version.getLastModified() != null) { + if (version.getLastModified() != null) + { Format formatter; formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); modifiedDate = formatter.format(version.getLastModified()); @@ -291,12 +324,16 @@ <!-- the approval queue, content waiting for managers to signoff on --> <% - if (pendingQueue != null && !pendingQueue.isEmpty()) { + if (pendingQueue != null && !pendingQueue.isEmpty()) + { %> <br/><br/> <!-- show any errors here --> -<%if (exception != null && exception.trim().length() > 0) {%> +<% + if (exception != null && exception.trim().length() > 0) + { +%> <table width="100%"> <th colspan="2"><h3 class="sectionTitle">Error:</h3></th> <tr colspan="2" align="center"> @@ -320,19 +357,26 @@ <td class="portlet-table-text"><b>${n:i18n("CMS_SIZE")}</b></td> <td class="portlet-table-text"><b>${n:i18n("CMS_CREATED")}</b></td> <td class="portlet-table-text"><b>${n:i18n("CMS_CREATED_BY")}</b></td> - <%if (manageWorkflowAccessible.booleanValue()) {%> + <% + if (manageWorkflowAccessible.booleanValue()) + { + %> <td class="portlet-table-text"><b>${n:i18n("CMS_ACTION")}</b></td> <%}%> </tr> <%int i = 0;%> <% - for (Iterator itr = pendingQueue.iterator(); itr.hasNext();) { + for (Iterator itr = pendingQueue.iterator(); itr.hasNext();) + { %> <% - org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content) itr.next(); - if (i % 2 == 0) { + org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content)itr.next(); + if (i % 2 == 0) + { rowClass = "portlet-section-body"; - } else { + } + else + { rowClass = "portlet-section-alternate"; } i++; @@ -351,7 +395,10 @@ <!-- User who requested approval --> <td><%= cour.getUserName() %> </td> - <%if (manageWorkflowAccessible.booleanValue()) {%> + <% + if (manageWorkflowAccessible.booleanValue()) + { + %> <td> <a href="<portlet:actionURL> <portlet:param name="op" value="<%=CMSAdminConstants.OP_APPROVE%>"/> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/edit.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2007-10-28 01:09:21 UTC (rev 8785) @@ -1,12 +1,9 @@ +<%@ page import="org.jboss.portal.cms.model.Content" %> <%@ page import="org.jboss.portal.cms.model.File" %> <%@ page import="org.jboss.portal.cms.model.Folder" %> -<%@ page import="org.jboss.portal.cms.model.Content" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> -<%@ page import="java.text.Format" %> -<%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.List" %> <%@ page import="java.util.StringTokenizer" %> -<%@ page import="javax.portlet.PortletURL" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> @@ -40,9 +37,9 @@ </a> <% - } - else - { +} +else +{ %> <% @@ -60,82 +57,82 @@ %> <table width="100%" border="0" cellspacing="2" cellpadding="2"> -<tr> - <td class="portlet-section-header">${n:i18n("CMS_NAME")}</td> -</tr> + <tr> + <td class="portlet-section-header">${n:i18n("CMS_NAME")}</td> + </tr> -<% - if (folders.size() > 0) - { - for (int i = 0; i < folders.size(); i++) + <% + if (folders.size() > 0) { - Folder folder = (Folder)folders.get(i); - url.setParameter("path", folder.getBasePath()); -%> -<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';"> - <td><img - src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif" - alt="${n:i18n("CMS_FOLDER")}" - border="0">&nbsp;<a href="<%= url %>"><%= - folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %> - </a> - </td> -</tr> -<% + for (int i = 0; i < folders.size(); i++) + { + Folder folder = (Folder)folders.get(i); + url.setParameter("path", folder.getBasePath()); + %> + <tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';"> + <td><img + src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif" + alt="${n:i18n("CMS_FOLDER")}" + border="0">&nbsp;<a href="<%= url %>"><%= + folder.getBasePath().substring(folder.getBasePath().lastIndexOf("/") + 1, folder.getBasePath().length()) %> + </a> + </td> + </tr> + <% + } } - } - if (files.size() > 0) - { - for (int j = 0; j < files.size(); j++) + if (files.size() > 0) { - File file = (File)files.get(j); + for (int j = 0; j < files.size(); j++) + { + File file = (File)files.get(j); - PortletURL metaURL = renderResponse.createActionURL(); - metaURL.setParameter("content.action.select", "select"); - metaURL.setParameter("content.uri", file.getBasePath()); - metaURL.setParameter("path", sCurrPath); + PortletURL metaURL = renderResponse.createActionURL(); + metaURL.setParameter("content.action.select", "select"); + metaURL.setParameter("content.uri", file.getBasePath()); + metaURL.setParameter("path", sCurrPath); - if ((uri!=null) && (uri.equals(file.getBasePath()))) - { - out.println("<tr class=\"portlet-section-selected\">"); + if ((uri != null) && (uri.equals(file.getBasePath()))) + { + out.println("<tr class=\"portlet-section-selected\">"); + } + else + { + out.println("<tr onmouseover=\"this.className='portlet-section-alternate';\" onmouseout=\"this.className='portlet-section-body';\">"); + } + %> + <tr> + <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif" + alt="${n:i18n("CMS_FILE")}" + border="0">&nbsp;<a href="<%= metaURL %>"><%= + file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %> + </a> + </td> + </tr> + <% } - else - { - out.println("<tr onmouseover=\"this.className='portlet-section-alternate';\" onmouseout=\"this.className='portlet-section-body';\">"); - } -%> -<tr> - <td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif" - alt="${n:i18n("CMS_FILE")}" - border="0">&nbsp;<a href="<%= metaURL %>"><%= - file.getBasePath().substring(file.getBasePath().lastIndexOf("/") + 1, file.getBasePath().length()) %> - </a> - </td> -</tr> -<% } - } -%> + %> </table> <% -if (uri != null) -{ - Content content = (Content)renderRequest.getAttribute("content"); + if (uri != null) + { + Content content = (Content)renderRequest.getAttribute("content"); %> - <p class="portlet-font"> - Selected file: <%= uri %><br /> +<p class="portlet-font"> + Selected file: <%= uri %><br/> + <% + if (content.getTitle() != null) + { + out.println("File title: " + content.getTitle() + "<br />"); + } + if (content.getDescription() != null) + { + out.println("File description: " + content.getDescription() + "<br />"); + } + %> +</p> <% - if (content.getTitle() != null) - { - out.println("File title: " + content.getTitle() + "<br />"); - } - if (content.getDescription() != null) - { - out.println("File description: " + content.getDescription() + "<br />"); - } -%> - </p> -<% -} -} + } + } %> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portal-lib.tld ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -69,7 +69,7 @@ <title>CMS Administration</title> </portlet-info> </portlet> - + <!-- portlet> <description>CMS Content Editor</description> <portlet-name>CMSContentEditorPortlet</portlet-name> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml 2007-10-28 01:09:21 UTC (rev 8785) @@ -22,7 +22,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> <web-app> <!-- TODO: secure with portal permissions --> <servlet> Property changes on: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java 2007-10-27 23:01:46 UTC (rev 8784) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java 2007-10-28 01:09:21 UTC (rev 8785) @@ -41,7 +41,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ + * @version $Revision$ */ public class PortletB extends GenericPortlet { Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/basic/event/PortletB.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id