Author: chris.laprun(a)jboss.com Date: 2007-10-27 21:14:48 -0400 (Sat, 27 Oct 2007) New Revision: 8786 Modified: branches/JBoss_Portal_Branch_2_6/core/build.bat branches/JBoss_Portal_Branch_2_6/core/build.sh branches/JBoss_Portal_Branch_2_6/core/build.xml branches/JBoss_Portal_Branch_2_6/core/src/etc/jboss-aop/base-aop.xml branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/CoreConstants.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ControlInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ResourceAcquisitionInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/AccessDeniedException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/Controller.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerRequestDispatcher.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/NoSuchResourceException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/SecurityException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/OtherResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactoryDelegate.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactoryService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactoryDelegate.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ErrorResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/RedirectionResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SecurityErrorResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ThrowableResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/UnavailableResourceResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AbstractResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AjaxResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/CommandForward.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HTTPResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HandlerResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseForward.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/InvokePortletCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletActionResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/DashboardBridge.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/SecurityBridge.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcaster.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/SimpleServiceJNDIBinder.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/PortalRuntimeContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/PortalEventContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/navstate/NavigationalStateContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/session/PortalSessionImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/user/UserEventBridgeTriggerInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceCustomization.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceDefinition.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/JBossInstanceContainerContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceCustomization.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentRoleSecurityBinding.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectIdUserType.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/LocalPortletInvoker.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumerGroup.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletState.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletStateEntry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletStatePersistenceManager.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentRegistration.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/RegistrationStatusUserType.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/StateManagementPolicyImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ElementMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/LinkElementMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/NamedMetaElementMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ScriptElementMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/CustomizationManager.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/Content.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/ContentType.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/portlet/ContentPortlet.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/Instance.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/PortletInstanceCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceRenderCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/PortletInstanceActionResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/UpdatePortletInstanceResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/PreferencesMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Context.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Page.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Portal.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectId.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Window.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/ContextCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PageCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalObjectCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/WindowCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/ImportPageToDashboardCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/MoveWindowCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/PortalObjectPathMapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/PortletWindowActionResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdatePageResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewContextCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPortalCommand.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/WindowRendition.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlConstants.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/DefaultPageControlPolicy.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlPolicy.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlPolicy.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContentMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/PortalContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/WindowContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/AbstractModule.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/MailModule.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/ModuleException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateChange.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateKey.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateObjectChange.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/AjaxInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/MarkupHeaderInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/AbstractContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/BuildException.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/ChildrenStrategy.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/PageRendition.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/PortletHelper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/catalog/CatalogPortlet.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/role/RolePortlet.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortletConstants.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/util/ProxyValidator.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/OutELTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PageTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/Utils.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ActionContextImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ValueMapAssert.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectIdTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPathTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossAPIFactory.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionRequest.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortlet.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortletPreferences.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderRequest.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderResponse.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/session/PortletSessionListener.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/util/Parameters.java branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/jboss-app_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/jboss-portlet_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-layouts_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-renderSet_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-strategies_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-themes_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portlet-instances_2_0.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/setup.txt branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/identity-config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/login-config.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-app_2_6.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/portal-aop.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/persistent-jboss-beans.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/transient-jboss-beans.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/registration-persistence-manager-beans.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/nodesk/Modes.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/nodesk/WindowStates.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/phalanx/Modes.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/phalanx/WindowStates.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/templates/user/emailTemplate.tpl branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/createRole.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRoleMembers.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude02.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/setup/portal-ds.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/setup/setup.sql branches/JBoss_Portal_Branch_2_6/core/src/resources/test/cache/domain.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/cache/local.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/cache/replicated.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/datarole.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/datarolecreated.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/dataroledeleted.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/dataroleedited.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/portlet-instances.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/test/hibernate.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/test/log4j.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/test/theme.xml Log: Updated svn properties Property changes on: branches/JBoss_Portal_Branch_2_6/core/build.bat ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/build.sh ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -316,7 +316,8 @@ <fileset dir="${build.lib}" includes="portal-core-lib.jar"/> <fileset dir="${build.lib}" includes="jboss-portlet-api-lib.jar"/> <fileset dir="${jboss.portal-format.root}/lib" includes="portal-format-lib.jar"/> - <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-portal-lib.jar"/> + <fileset dir="${jboss.portal/modules/common.lib}" + includes="portal-common-lib.jar,portal-common-portal-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/> <fileset dir="${jboss.portal/modules/portlet.lib}"> <include name="portal-portlet-lib.jar"/> Property changes on: branches/JBoss_Portal_Branch_2_6/core/build.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/etc/jboss-aop/base-aop.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/CoreConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/CoreConstants.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/CoreConstants.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -29,24 +29,18 @@ public final class CoreConstants { - /** - * Servlet constants. - */ + /** Servlet constants. */ public static final class Servlet { - /** - * Servlet session constants. - */ + /** Servlet session constants. */ public static final class Session { /** . */ public static final String USER_FINALIZER = "jboss.portal.user_finalizer"; } - /** - * Servlet request constants. - */ + /** Servlet request constants. */ public static final class Request { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/CoreConstants.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ControlInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ControlInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ControlInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,19 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.controller; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.PortalCommand; import org.jboss.portal.core.model.portal.control.portal.PortalControlContext; import org.jboss.portal.core.model.portal.control.portal.PortalControlPolicy; -import org.jboss.portal.core.model.portal.control.portal.DefaultPortalControlPolicy; -import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.common.invocation.InvocationException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ControlInterceptor extends ControllerInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ControlInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.controller; -import org.jboss.portal.core.controller.ControllerInterceptor; +import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; -import org.jboss.portal.common.invocation.InvocationException; /** * Apply navigational state changes. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class NavigationalStateInterceptor extends ControllerInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/NavigationalStateInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,21 +22,19 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.controller; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import org.apache.log4j.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.api.PortalURL; +import org.jboss.portal.core.aspects.controller.node.Navigation; import org.jboss.portal.core.controller.Controller; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerInterceptor; +import org.jboss.portal.core.controller.ControllerRequestDispatcher; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.ControllerRequestDispatcher; import org.jboss.portal.core.controller.command.SignOutCommand; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand; @@ -45,22 +43,20 @@ 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.PortalObjectPath; import org.jboss.portal.core.model.portal.PortalObjectPermission; -import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.command.PageCommand; import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand; import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; import org.jboss.portal.core.model.portal.command.view.ViewContextCommand; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; import org.jboss.portal.core.model.portal.command.view.ViewPortalCommand; -import org.jboss.portal.core.model.portal.command.PageCommand; import org.jboss.portal.core.theme.PageRendition; -import org.jboss.portal.core.aspects.controller.node.Navigation; -import org.jboss.portal.core.impl.api.node.PortalNodeImpl; import org.jboss.portal.identity.User; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.security.PortalSecurityException; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; -import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.server.config.ServerConfig; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; @@ -70,10 +66,14 @@ import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PageCustomizerInterceptor extends ControllerInterceptor { @@ -95,10 +95,10 @@ /** . */ private String tabsPath; - + /** . */ private String loginNamespace; - + /** . */ private ServerConfig config; @@ -107,7 +107,7 @@ /** . */ private PortalObjectContainer portalObjectContainer; - + public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory() { return portalAuthorizationManagerFactory; @@ -122,7 +122,7 @@ { return portalObjectContainer; } - + public void setPortalObjectContainer(PortalObjectContainer portalObjectContainer) { this.portalObjectContainer = portalObjectContainer; @@ -194,18 +194,18 @@ Controller controller = controllerCtx.getController(); User user = controllerCtx.getUser(); rd.setAttribute("org.jboss.portal.header.USER", user); - + if (user == null) { PortalURL portalURL = null; - + String configNamespace = config.getProperty("core.login.namespace"); if (loginNamespace == null) { loginNamespace = configNamespace; } - - if (loginNamespace != null && ! loginNamespace.toLowerCase().trim().equals("default")) + + if (loginNamespace != null && !loginNamespace.toLowerCase().trim().equals("default")) { ViewContextCommand vcc = new ViewContextCommand(new PortalObjectId(loginNamespace, new PortalObjectPath())); portalURL = new PortalURLImpl(vcc, controllerCtx, Boolean.TRUE, null); @@ -309,7 +309,7 @@ rd.include(); return rd.getMarkup(); } - + // return null; } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,18 +25,19 @@ import org.jboss.logging.Logger; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.controller.*; +import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.controller.ControllerInterceptor; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.SecurityException; import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; +import org.jboss.portal.security.PortalSecurityException; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; -import org.jboss.portal.security.PortalSecurityException; /** - * This aspect enforces security policy for all commands. - * <p/> - * <p>Portal resources should only be accessible to individuals that are entitled to do so. This interceptor makes sure - * that the requested resource is available to the requesting subject, by utilizing the configured JACC Policy.</p> + * This aspect enforces security policy for all commands. <p/> <p>Portal resources should only be accessible to + * individuals that are entitled to do so. This interceptor makes sure that the requested resource is available to the + * requesting subject, by utilizing the configured JACC Policy.</p> * * @author <a href="mailto:mholzner@novell.com>Martin Holzner</a> * @author julien(a)jboss.org Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ResourceAcquisitionInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ResourceAcquisitionInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ResourceAcquisitionInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.controller; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.NoSuchResourceException; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; -import org.jboss.portal.common.invocation.InvocationException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ResourceAcquisitionInterceptor extends ControllerInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/ResourceAcquisitionInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,30 +25,30 @@ import org.apache.log4j.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.node.PortalNode; +import org.jboss.portal.api.node.event.PageRenderEvent; import org.jboss.portal.api.node.event.PortalNodeEvent; import org.jboss.portal.api.node.event.WindowActionEvent; import org.jboss.portal.api.node.event.WindowEvent; import org.jboss.portal.api.node.event.WindowNavigationEvent; import org.jboss.portal.api.node.event.WindowRenderEvent; -import org.jboss.portal.api.node.event.PageRenderEvent; -import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.util.LazyMap; import org.jboss.portal.core.controller.CommandRedirectionException; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.event.PortalEventListenerRegistry; +import org.jboss.portal.core.impl.api.node.PortalNodeEventContextImpl; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; +import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.command.WindowCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.model.portal.command.WindowCommand; import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; 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.navstate.WindowNavigationalState; -import org.jboss.portal.core.event.PortalEventListenerRegistry; -import org.jboss.portal.core.impl.api.node.PortalNodeImpl; -import org.jboss.portal.core.impl.api.node.PortalNodeEventContextImpl; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletParametersStateString; @@ -124,7 +124,6 @@ } /** - * * @param event * @return */ @@ -302,7 +301,6 @@ } /** - * * @param map * @return */ Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.controller.node; +import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.core.impl.api.node.PortalNodeImpl; -import org.jboss.portal.api.PortalRuntimeContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 3201 $ + * @version $Revision$ */ public class Navigation { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,14 +26,14 @@ import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; -import org.jboss.portal.core.model.portal.command.WindowCommand; +import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.impl.api.node.PortalNodeImpl; -import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl; +import org.jboss.portal.core.model.portal.command.WindowCommand; +import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; -import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,23 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.portlet; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.core.portlet.info.AjaxInfo; +import org.jboss.portal.core.portlet.info.CorePortletInfo; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.container.PortletContainerInvoker; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.portlet.container.PortletContainerInvoker; -import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.portlet.info.CorePortletInfo; -import org.jboss.portal.core.portlet.info.AjaxInfo; /** * Look at the portlet ajax meta data. - * + * <p/> * Improve later when we will have the structure to build real portlet runtime meta information. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AjaxInterceptor extends PortletInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/AjaxInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,11 +24,11 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.transaction.Transactions; +import org.jboss.portal.core.portlet.info.CorePortletInfo; +import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.container.PortletContainerInvoker; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.container.PortletContainerInvoker; -import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.core.portlet.info.CorePortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.server; +import org.jboss.portal.common.i18n.LocaleFormat; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.common.i18n.LocaleFormat; import org.jboss.portal.common.util.ConversionException; +import org.jboss.portal.identity.User; import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerRequest; -import org.jboss.portal.identity.User; import java.util.ArrayList; import java.util.List; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,8 +23,8 @@ package org.jboss.portal.core.aspects.server; import org.jboss.logging.Logger; -import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.common.invocation.AttributeResolver; +import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.CoreConstants; import org.jboss.portal.identity.CachedUserImpl; import org.jboss.portal.identity.NoSuchUserException; @@ -44,8 +44,8 @@ import java.io.Serializable; import java.security.Principal; import java.util.Date; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * The interceptor is responsible for managing the user identity lifecycle based on the principal name returned by the @@ -132,7 +132,6 @@ User user = null; Map profile = null; - // Fetch user if we can if (userPrincipal != null) { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/AccessDeniedException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CommandRedirectionException extends ControllerException { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/Controller.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,29 +22,28 @@ ******************************************************************************/ package org.jboss.portal.core.controller; -import org.jboss.portal.theme.PageService; +import org.jboss.portal.common.invocation.InterceptorStackFactory; import org.jboss.portal.core.controller.command.mapper.CommandFactory; import org.jboss.portal.core.controller.command.mapper.URLFactory; import org.jboss.portal.core.controller.command.response.ErrorResponse; +import org.jboss.portal.core.controller.handler.AjaxResponse; +import org.jboss.portal.core.controller.handler.CommandForward; +import org.jboss.portal.core.controller.handler.HTTPResponse; import org.jboss.portal.core.controller.handler.HandlerResponse; import org.jboss.portal.core.controller.handler.ResponseForward; -import org.jboss.portal.core.controller.handler.HTTPResponse; -import org.jboss.portal.core.controller.handler.CommandForward; import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.AjaxResponse; import org.jboss.portal.core.controller.handler.ResponseHandlerException; -import org.jboss.portal.core.model.portal.control.page.PageControlPolicy; +import org.jboss.portal.core.model.CustomizationManager; +import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.content.ContentRendererRegistry; -import org.jboss.portal.core.model.instance.InstanceContainer; -import org.jboss.portal.core.model.CustomizationManager; -import org.jboss.portal.common.invocation.InterceptorStackFactory; -import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import org.jboss.portal.core.model.portal.control.page.PageControlPolicy; import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; import org.jboss.portal.server.RequestController; -import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerException; -import org.jboss.portal.web.spi.ServletContainerContext; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.theme.PageService; import javax.servlet.ServletException; import java.io.IOException; @@ -52,7 +51,7 @@ /** * @author <a href="mailto:mholzner@novell.com">Martin Holzner</a> * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class Controller extends AbstractJBossService implements RequestController { @@ -222,8 +221,9 @@ * Handle a command which means it executes the command and reacts upon the response created by the command. * * @param controllerContext the controller context - * @param command the command + * @param command the command * @throws org.jboss.portal.server.ServerException + * */ protected void processCommand(ControllerContext controllerContext, ControllerCommand command) throws ServerException { @@ -311,9 +311,7 @@ } } - /** - * All http responses in the stack should be handled here. - */ + /** All http responses in the stack should be handled here. */ protected void sendResponse(ControllerContext ctx, HTTPResponse resp) { try @@ -330,9 +328,7 @@ } } - /** - * All http responses in the stack should be handled here. - */ + /** All http responses in the stack should be handled here. */ protected void sendResponse(ControllerContext ctx, AjaxResponse resp) { try Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/Controller.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -147,15 +147,15 @@ { if (e instanceof InvocationException) { - throw(InvocationException)e; + throw (InvocationException)e; } if (e instanceof ControllerException) { - throw(ControllerException)e; + throw (ControllerException)e; } if (e instanceof RuntimeException) { - throw(RuntimeException)e; + throw (RuntimeException)e; } throw new ControllerException(e); } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,21 +25,21 @@ import org.jboss.portal.common.invocation.AbstractInvocationContext; import org.jboss.portal.common.invocation.InterceptorStack; import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.common.servlet.BufferingRequestWrapper; import org.jboss.portal.common.servlet.BufferingResponseWrapper; -import org.jboss.portal.common.servlet.BufferingRequestWrapper; +import org.jboss.portal.core.aspects.server.UserInterceptor; +import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; +import org.jboss.portal.identity.User; import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.ServerURL; -import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; -import org.jboss.portal.identity.User; -import org.jboss.portal.core.aspects.server.UserInterceptor; -import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; import org.jboss.portal.web.ServletContainer; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletContext; -import javax.servlet.RequestDispatcher; import java.util.Map; /** @@ -161,9 +161,9 @@ /** * Render the command as an URL or return null if it is not possible. * - * @param cmd the command to render + * @param cmd the command to render * @param urlContext the url context - * @param urlFormat the url format + * @param urlFormat the url format * @return the URL as a string or null */ public String renderURL(ControllerCommand cmd, URLContext urlContext, URLFormat urlFormat) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerRequestDispatcher.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerRequestDispatcher.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerRequestDispatcher.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.controller; +import org.jboss.portal.common.servlet.BufferingRequestWrapper; import org.jboss.portal.common.servlet.BufferingResponseWrapper; -import org.jboss.portal.common.servlet.BufferingRequestWrapper; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; @@ -31,7 +31,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ControllerRequestDispatcher { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerRequestDispatcher.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ * Base class for responses from the controller after the execution of a controller command. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ControllerResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/NoSuchResourceException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/SecurityException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.core.controller.ajax; -import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; 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.MoveWindowCommand; @@ -34,7 +34,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AjaxCommandFactory extends AbstractCommandFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,24 +24,22 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.controller.ControllerInterceptor; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; import org.jboss.portal.core.theme.PageRendition; -import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; -import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; -import org.jboss.portal.server.ServerURL; import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.server.ServerInvocationContext; +import org.jboss.portal.server.ServerURL; import org.jboss.portal.server.request.URLFormat; +import org.jboss.portal.theme.impl.render.dynamic.DynaConstants; import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AjaxInterceptor extends ControllerInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,65 +22,65 @@ ******************************************************************************/ package org.jboss.portal.core.controller.ajax; -import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.HandlerResponse; -import org.jboss.portal.core.controller.handler.AjaxResponse; +import org.apache.log4j.Logger; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.handler.AjaxResponse; +import org.jboss.portal.core.controller.handler.CommandForward; +import org.jboss.portal.core.controller.handler.HandlerResponse; +import org.jboss.portal.core.controller.handler.ResponseHandler; import org.jboss.portal.core.controller.handler.ResponseHandlerException; -import org.jboss.portal.core.controller.handler.CommandForward; +import org.jboss.portal.core.model.portal.Page; +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.command.action.InvokePortletWindowRenderCommand; +import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; +import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand; +import org.jboss.portal.core.model.portal.command.response.MarkupResponse; import org.jboss.portal.core.model.portal.command.response.PortletWindowActionResponse; +import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; import org.jboss.portal.core.model.portal.command.response.UpdateWindowResponse; -import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; -import org.jboss.portal.core.model.portal.command.response.MarkupResponse; -import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; -import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; -import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.Page; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.core.model.portal.navstate.PortalObjectNavigationalStateContext; import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.navstate.NavigationalStateChange; +import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.core.navstate.NavigationalStateObjectChange; -import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.core.theme.WindowContextFactory; +import org.jboss.portal.portlet.StateString; import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; -import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.theme.LayoutService; +import org.jboss.portal.theme.PageService; +import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageLocationResponse; import org.jboss.portal.theme.impl.render.dynamic.response.UpdatePageStateResponse; -import org.jboss.portal.theme.LayoutService; -import org.jboss.portal.theme.PortalLayout; -import org.jboss.portal.theme.PageService; +import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.page.Region; +import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.render.RendererContext; import org.jboss.portal.theme.render.ThemeContext; -import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.theme.page.WindowContext; -import org.jboss.portal.theme.page.Region; -import org.apache.log4j.Logger; +import org.jboss.portal.web.ServletContextDispatcher; import java.io.StringWriter; -import java.util.Set; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.ArrayList; +import java.util.Set; /** * todo: - * + * <p/> * 1/ interpret more responses types * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AjaxResponseHandler implements ResponseHandler { @@ -154,7 +154,7 @@ StateString contentState = pwr.getContentState(); WindowState windowState = pwr.getWindowState(); Mode mode = pwr.getMode(); - ControllerCommand renderCmd = new InvokePortletWindowRenderCommand( + ControllerCommand renderCmd = new InvokePortletWindowRenderCommand( pwr.getWindowId(), mode, windowState, @@ -194,7 +194,7 @@ boolean fullRefresh = false; // - for (Iterator i = ctx.getChanges();i.hasNext();) + for (Iterator i = ctx.getChanges(); i.hasNext();) { NavigationalStateChange change = (NavigationalStateChange)i.next(); @@ -254,7 +254,7 @@ if (!fullRefresh) { ArrayList refreshedWindows = new ArrayList(); - for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator();i.hasNext();) + for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator(); i.hasNext();) { PortalObject child = (PortalObject)i.next(); PortalObjectId childId = child.getId(); @@ -273,7 +273,7 @@ // Call to the theme framework PageResult res = new PageResult(page.getName(), page.getProperties()); - + // ServerInvocation invocation = controllerContext.getServerInvocation(); @@ -281,7 +281,7 @@ WindowContextFactory wcf = new WindowContextFactory(controllerContext); // - for (Iterator i = refreshedWindows.iterator();i.hasNext() && !fullRefresh;) + for (Iterator i = refreshedWindows.iterator(); i.hasNext() && !fullRefresh;) { try { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/ajax/AjaxResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,25 +22,25 @@ ******************************************************************************/ package org.jboss.portal.core.controller.classic; -import org.jboss.portal.server.request.URLContext; -import org.jboss.portal.core.controller.command.info.CommandInfo; -import org.jboss.portal.core.controller.command.info.ActionCommandInfo; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.handler.ResponseHandlerException; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.portlet.PortletResponseHandler; +import org.jboss.portal.core.controller.command.info.ActionCommandInfo; +import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.controller.handler.AbstractResponseHandler; +import org.jboss.portal.core.controller.handler.CommandForward; import org.jboss.portal.core.controller.handler.HTTPResponse; import org.jboss.portal.core.controller.handler.HandlerResponse; import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.CommandForward; +import org.jboss.portal.core.controller.handler.ResponseHandlerException; +import org.jboss.portal.core.controller.portlet.PortletResponseHandler; +import org.jboss.portal.core.model.instance.PortletInstanceResponseHandler; import org.jboss.portal.core.model.portal.PortalObjectResponseHandler; -import org.jboss.portal.core.model.instance.PortletInstanceResponseHandler; +import org.jboss.portal.server.request.URLContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ClassicResponseHandler extends AbstractResponseHandler { @@ -73,7 +73,7 @@ ControllerCommand command, ControllerResponse commandResponse) throws ResponseHandlerException { - for (int i = 0;i < handlers.length;i++) + for (int i = 0; i < handlers.length; i++) { ResponseHandler handler = handlers[i]; HandlerResponse handlerResponse = handler.processCommandResponse(controllerContext, command, commandResponse); @@ -89,19 +89,19 @@ // Unhardcode this private ResponseHandler[] handlers = new ResponseHandler[] - { - new PortletInstanceResponseHandler(), - new PortalObjectResponseHandler(), - new PortletResponseHandler(), - new OtherResponseHandler() - }; + { + new PortletInstanceResponseHandler(), + new PortalObjectResponseHandler(), + new PortletResponseHandler(), + new OtherResponseHandler() + }; /** * Return true if the execution of the next command requires a redirect. * - * @param currentCmd the current command which has been executed + * @param currentCmd the current command which has been executed * @param currentURLCtx the request URL context - * @param forward the forward + * @param forward the forward * @return */ public boolean requiresRedirect( Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/ClassicResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/OtherResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/OtherResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/OtherResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,39 +22,39 @@ ******************************************************************************/ package org.jboss.portal.core.controller.classic; -import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.HandlerResponse; -import org.jboss.portal.core.controller.handler.ResponseHandlerException; -import org.jboss.portal.core.controller.handler.HTTPResponse; +import org.apache.log4j.Logger; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.command.response.ErrorResponse; import org.jboss.portal.core.controller.command.response.RedirectionResponse; +import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; import org.jboss.portal.core.controller.command.response.SignOutResponse; import org.jboss.portal.core.controller.command.response.StreamContentResponse; -import org.jboss.portal.core.controller.command.response.ErrorResponse; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; -import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; -import org.jboss.portal.core.theme.PageRendition; +import org.jboss.portal.core.controller.handler.HTTPResponse; +import org.jboss.portal.core.controller.handler.HandlerResponse; +import org.jboss.portal.core.controller.handler.ResponseHandler; +import org.jboss.portal.core.controller.handler.ResponseHandlerException; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; +import org.jboss.portal.core.theme.PageRendition; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.ServerURL; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.common.util.MarkupInfo; -import org.apache.log4j.Logger; import javax.servlet.ServletException; import java.io.IOException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class OtherResponseHandler implements ResponseHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/classic/OtherResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -33,7 +33,7 @@ * A global signout. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SignOutCommand extends ControllerCommand { @@ -43,7 +43,7 @@ /** . */ private String location; - + public SignOutCommand() { this(null); @@ -58,7 +58,7 @@ { return info; } - + public String getLocation() { return location; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ActionCommandInfo extends CommandInfo { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ViewCommandInfo extends CommandInfo { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -39,10 +39,10 @@ * Create a command. * * @param controllerContext the controller context - * @param invocation the server invocation - * @param host the host - * @param contextPath the context path - * @param requestPath the request path @return the command or null if no command is recognized + * @param invocation the server invocation + * @param host the host + * @param contextPath the context path + * @param requestPath the request path @return the command or null if no command is recognized */ ControllerCommand doMapping( ControllerContext controllerContext, Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactoryDelegate.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactoryService.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -44,12 +44,12 @@ public URLFactory getNextFactory() { - return nextFactory; + return nextFactory; } public void setNextFactory(URLFactory nextFactory) { - this.nextFactory = nextFactory; + this.nextFactory = nextFactory; } public ServerURL doMapping(ControllerContext controllerContext, ServerInvocation invocation, ControllerCommand cmd) @@ -62,7 +62,7 @@ // if (delegates != null) { - for (int i = 0;i < delegates.size();i++) + for (int i = 0; i < delegates.size(); i++) { URLFactory delegate = (URLFactory)delegates.get(i); ServerURL url = delegate.doMapping(controllerContext, invocation, cmd); @@ -76,7 +76,7 @@ // if (nextFactory != null) { - return nextFactory.doMapping(controllerContext, invocation, cmd); + return nextFactory.doMapping(controllerContext, invocation, cmd); } // Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.controller.command.mapper; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; - import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.command.SignOutCommand; import org.jboss.portal.server.ServerInvocation; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -39,7 +39,7 @@ { public ControllerCommand doMapping(ControllerContext controllerContext, ServerInvocation invocation, String host, - String contextPath, String requestPath) + String contextPath, String requestPath) { String location = null; ParameterMap parameterMap = controllerContext.getServerInvocation().getServerContext().getQueryParameterMap(); @@ -49,7 +49,7 @@ { if (parameterMap.get("location") != null) { - location = URLDecoder.decode(((String[]) parameterMap.get("location"))[0], "UTF-8"); + location = URLDecoder.decode(((String[])parameterMap.get("location"))[0], "UTF-8"); } } catch (UnsupportedEncodingException e) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutURLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutURLFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.controller.command.mapper; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.command.SignOutCommand; @@ -32,6 +29,9 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerURL; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -50,8 +50,8 @@ } if (cmd instanceof SignOutCommand) { - SignOutCommand signOutCommand = (SignOutCommand) cmd; - + SignOutCommand signOutCommand = (SignOutCommand)cmd; + // AbstractServerURL asu = new AbstractServerURL(); asu.setPortalRequestPath(path); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutURLFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SimpleCommandFactory extends AbstractCommandFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,7 +30,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SimpleURLFactory extends URLFactoryDelegate { @@ -68,7 +68,7 @@ throw new IllegalArgumentException("No null cmd accepted"); } String className = cmd.getClass().getName(); - for (int i = 0;i < classNames.length;i++) + for (int i = 0; i < classNames.length; i++) { if (className.equals(classNames[i])) { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -37,8 +37,9 @@ * Create an url for the command. * * @param controllerContext - * @param invocation the invocation - * @param cmd the command to encode @return the server url or null if this mapper cannot peform this operation + * @param invocation the invocation + * @param cmd the command to encode @return the server url or null if this mapper cannot peform this + * operation */ ServerURL doMapping( ControllerContext controllerContext, Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactoryDelegate.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ErrorResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ErrorResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ErrorResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ErrorResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ErrorResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/RedirectionResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/RedirectionResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/RedirectionResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class RedirectionResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/RedirectionResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SecurityErrorResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SecurityErrorResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SecurityErrorResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SecurityErrorResponse extends ErrorResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SecurityErrorResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SignOutResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class StreamContentResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ThrowableResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ThrowableResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ThrowableResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ThrowableResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/ThrowableResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/UnavailableResourceResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/UnavailableResourceResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/UnavailableResourceResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,11 +25,11 @@ import org.jboss.portal.core.controller.ControllerResponse; /** - * A resource is not available either because the resource cannot be located or because it is located - * but it is not serviceable. + * A resource is not available either because the resource cannot be located or because it is located but it is not + * serviceable. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class UnavailableResourceResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/command/response/UnavailableResourceResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AbstractResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AbstractResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AbstractResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,11 +23,10 @@ package org.jboss.portal.core.controller.handler; import org.jboss.portal.jems.as.system.AbstractJBossService; -import org.jboss.portal.core.controller.handler.ResponseHandler; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class AbstractResponseHandler extends AbstractJBossService implements ResponseHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AbstractResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AjaxResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AjaxResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AjaxResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,10 +22,9 @@ ******************************************************************************/ package org.jboss.portal.core.controller.handler; -import org.jboss.portal.core.controller.handler.HandlerResponse; +import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.theme.impl.render.dynamic.DynaResponse; import org.jboss.portal.theme.impl.render.dynamic.JSONMarshaller; -import org.jboss.portal.server.ServerInvocationContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; @@ -33,9 +32,9 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ -public class AjaxResponse extends HandlerResponse +public class AjaxResponse extends HandlerResponse { /** . */ Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/AjaxResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/CommandForward.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/CommandForward.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/CommandForward.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.controller.handler; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.server.request.URLContext; -import org.jboss.portal.core.controller.ControllerCommand; /** * Forward to a new command. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CommandForward extends HandlerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/CommandForward.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HTTPResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HTTPResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HTTPResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.controller.handler; +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.common.io.IOTools; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletException; import java.io.IOException; import java.io.InputStream; @@ -35,7 +35,7 @@ * Response that sends a response to the http layer. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class HTTPResponse extends HandlerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HTTPResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HandlerResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HandlerResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HandlerResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ * The response from a a response handler. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class HandlerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/HandlerResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseForward.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseForward.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseForward.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ResponseForward extends HandlerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseForward.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,23 +24,22 @@ import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.handler.ResponseHandlerException; import org.jboss.portal.core.controller.ControllerResponse; /** - * The response handler interface defines the contract for translating the result of the execution - * of a command into a response adapated to the client side caller. + * The response handler interface defines the contract for translating the result of the execution of a command into a + * response adapated to the client side caller. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ResponseHandler { /** * Process the command response and provides an handler response. * - * @param controllerContext the controller context - * @param controllerCommand the controller command + * @param controllerContext the controller context + * @param controllerCommand the controller command * @param controllerResponse the controller response * @return the handler response * @throws ResponseHandlerException Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ResponseHandlerException extends Exception { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerException.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.controller.handler; -import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.HandlerResponse; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ResponseHandlerSelector implements ResponseHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/handler/ResponseHandlerSelector.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,27 +22,27 @@ ******************************************************************************/ package org.jboss.portal.core.controller.portlet; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.FixMe; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.command.response.SignOutResponse; +import org.jboss.portal.core.controller.command.response.ErrorResponse; import org.jboss.portal.core.controller.command.response.RedirectionResponse; import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; +import org.jboss.portal.core.controller.command.response.SignOutResponse; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; -import org.jboss.portal.core.controller.command.response.ErrorResponse; +import org.jboss.portal.core.model.instance.command.response.PortletInstanceActionResponse; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.response.PortletWindowActionResponse; -import org.jboss.portal.core.model.instance.command.response.PortletInstanceActionResponse; +import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.NoSuchPortletException; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.invocation.response.RenderResponse; import org.jboss.portal.portlet.spi.ActionContext; -import org.jboss.portal.portlet.invocation.response.RenderResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.common.FixMe; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ControllerResponseFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerResponseFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,10 +23,10 @@ package org.jboss.portal.core.controller.portlet; import org.jboss.portal.common.util.Tools; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.identity.User; import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.core.controller.ControllerContext; import java.util.List; import java.util.Locale; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/InvokePortletCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/InvokePortletCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/InvokePortletCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface InvokePortletCommandFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/InvokePortletCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletActionResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletActionResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletActionResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,17 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.controller.portlet; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; +import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.portlet.StateString; /** * Controller response provided by a portlet. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class PortletActionResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletActionResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,28 +22,28 @@ ******************************************************************************/ package org.jboss.portal.core.controller.portlet; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.model.portal.Portal; +import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; +import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; import org.jboss.portal.portlet.spi.PortalContext; import org.jboss.portal.portlet.spi.RequestContext; import org.jboss.portal.portlet.spi.SecurityContext; import org.jboss.portal.portlet.spi.UserContext; import org.jboss.portal.portlet.spi.WindowContext; -import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; -import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.model.portal.Portal; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.common.util.CollectionBuilder; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import org.jboss.portal.server.PortalConstants; +import java.util.Collections; +import java.util.Map; import java.util.Set; -import java.util.Map; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletContextFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,29 +22,29 @@ ******************************************************************************/ package org.jboss.portal.core.controller.portlet; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.invocation.EmptyAttributeResolver; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.model.portal.Portal; +import org.jboss.portal.core.model.portal.Window; +import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand; +import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; +import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.RenderURL; +import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.impl.spi.AbstractActionContext; import org.jboss.portal.portlet.impl.spi.AbstractRenderContext; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.RenderInvocation; import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.spi.RenderContext; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand; -import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.Portal; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.common.invocation.EmptyAttributeResolver; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; -import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; @@ -53,7 +53,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletInvocationFactory { @@ -84,7 +84,7 @@ { PortletContextFactory cf = new PortletContextFactory(controllerContext, portal, window); InternalInvokePortletCommandFactory cpc = new InternalInvokePortletCommandFactory(window, controllerContext); - return createAction(controllerContext, mode, windowState, navigationalState, interactionState, form, cf, cpc); + return createAction(controllerContext, mode, windowState, navigationalState, interactionState, form, cf, cpc); } public static ActionInvocation createAction( @@ -166,6 +166,7 @@ { private InvokePortletCommandFactory cmdFactory; private ControllerContext controllerContext; + public ControllerActionContext(InvokePortletCommandFactory cmdFactory, ControllerContext controllerContext, Mode mode, WindowState windowState, StateString navigationalState, MarkupInfo markupInfo, StateString interactionState, PortletParameters form) { super(mode, windowState, navigationalState, markupInfo, interactionState, form); @@ -181,14 +182,17 @@ addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, EmptyAttributeResolver.getInstance()); addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttributeResolver()); } + public HttpServletRequest getClientRequest() throws IllegalStateException { return controllerContext.getServerInvocation().getServerContext().getClientRequest(); } + public HttpServletResponse getClientResponse() throws IllegalStateException { return controllerContext.getServerInvocation().getServerContext().getClientResponse(); } + public String renderURL(PortletURL portletURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative) { return PortletInvocationFactory.renderURL(controllerContext, cmdFactory, portletURL, wantSecure, wantAuthenticated, relative); @@ -199,6 +203,7 @@ { private InvokePortletCommandFactory cmdFactory; private ControllerContext controllerContext; + public ControllerRenderContext(InvokePortletCommandFactory cmdFactory, ControllerContext controllerContext, Mode mode, WindowState windowState, StateString navigationalState, MarkupInfo markupInfo) { super(mode, windowState, navigationalState, markupInfo); @@ -214,14 +219,17 @@ addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, new MapAttributeResolver()); addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttributeResolver()); } + public HttpServletRequest getClientRequest() throws IllegalStateException { return controllerContext.getServerInvocation().getServerContext().getClientRequest(); } + public HttpServletResponse getClientResponse() throws IllegalStateException { return controllerContext.getServerInvocation().getServerContext().getClientResponse(); } + public String renderURL(PortletURL portletURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative) { return PortletInvocationFactory.renderURL(controllerContext, cmdFactory, portletURL, wantSecure, wantAuthenticated, relative); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,21 +22,21 @@ ******************************************************************************/ package org.jboss.portal.core.controller.portlet; +import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.handler.CommandForward; +import org.jboss.portal.core.controller.handler.HandlerResponse; import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.HandlerResponse; import org.jboss.portal.core.controller.handler.ResponseHandlerException; -import org.jboss.portal.core.controller.handler.CommandForward; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; import org.jboss.portal.core.model.instance.command.response.PortletInstanceActionResponse; -import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; +import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.core.model.portal.command.response.PortletWindowActionResponse; -import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletResponseHandler implements ResponseHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,11 +23,11 @@ package org.jboss.portal.core.deployment; import org.jboss.portal.core.metadata.ServiceMetaData; +import org.jboss.portal.core.metadata.portlet.AjaxMetaData; +import org.jboss.portal.core.metadata.portlet.ElementMetaData; import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData; import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; -import org.jboss.portal.core.metadata.portlet.ElementMetaData; -import org.jboss.portal.core.metadata.portlet.AjaxMetaData; import org.jboss.portal.core.metadata.portlet.PortletIconMetaData; import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.xb.binding.UnmarshallingContext; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,18 +24,18 @@ import org.jboss.deployment.DeploymentException; import org.jboss.logging.Logger; +import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.xml.NullEntityResolver; import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.core.model.portal.metadata.PortalObjectMetaData; -import org.jboss.portal.core.model.portal.metadata.BuildContext; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.ContentProvider; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; 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.PortalObjectPath; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.content.spi.ContentProvider; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +import org.jboss.portal.core.model.portal.metadata.BuildContext; +import org.jboss.portal.core.model.portal.metadata.PortalObjectMetaData; import org.jboss.portal.server.deployment.PortalWebApp; import org.jboss.portal.server.deployment.jboss.Deployment; import org.w3c.dom.Document; @@ -194,6 +194,7 @@ { return factory.portalObjectContainer; } + public ContentHandler getContentHandler(ContentType contentType) { ContentProvider contentProvider = factory.contentProviderRegistry.getContentProvider(contentType); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,8 +24,8 @@ import org.jboss.deployment.DeploymentException; import org.jboss.portal.common.transaction.TransactionManagerProvider; +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.server.deployment.PortalWebApp; import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory; import org.jboss.portal.server.deployment.jboss.Deployment; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,19 +24,19 @@ import org.jboss.deployment.DeploymentException; import org.jboss.mx.util.MBeanProxyExt; +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.value.StringValue; import org.jboss.portal.common.value.Value; import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; -import org.jboss.portal.core.model.instance.metadata.PreferencesMetaData; +import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.core.metadata.ServiceMetaData; import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData; import org.jboss.portal.core.model.instance.DuplicateInstanceException; import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; +import org.jboss.portal.core.model.instance.metadata.PreferencesMetaData; import org.jboss.portal.portlet.InvalidPortletIdException; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.PortletInvokerException; @@ -398,7 +398,7 @@ private void configureInstance(Instance instance, InstanceMetaData metaData) throws PortletInvokerException, SecurityConfigurationException { List changes = new ArrayList(); - + // Reset all preferences that are not overridden PreferencesMetaData preferencesMetaData = metaData.getPreferences(); PropertyMap propertyMap = instance.getProperties(); @@ -413,7 +413,7 @@ } } } - + // Configure preferences only if needed if (preferencesMetaData != null && preferencesMetaData.size() > 0) { @@ -448,7 +448,7 @@ // Resolve the portlet ref metaData.setPortletRef(resolvePortletRef(metaData.getPortletRef())); - + // Create the instance Instance instance = factory.getInstanceContainer().createDefinition(metaData); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/DashboardBridge.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/DashboardBridge.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/DashboardBridge.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.identity; -import org.jboss.portal.jems.as.system.AbstractJBossService; -import org.jboss.portal.identity.event.IdentityEventListener; +import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.identity.event.IdentityEvent; import org.jboss.portal.identity.event.IdentityEventEmitter; +import org.jboss.portal.identity.event.IdentityEventListener; import org.jboss.portal.identity.event.UserDestroyedEvent; -import org.jboss.portal.core.model.CustomizationManager; +import org.jboss.portal.jems.as.system.AbstractJBossService; /** * Use identity destroy events to destroy corresponding dashboards. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class DashboardBridge extends AbstractJBossService implements IdentityEventListener { @@ -82,7 +82,7 @@ // log.debug("User (userName=" + destroyedEvent.getUserName() + ",id=" + destroyedEvent.getUserId() + - " ) is destroyed, will destroy its dashboard"); + " ) is destroyed, will destroy its dashboard"); // customizationManager.destroyDashboard(destroyedEvent.getUserName()); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/DashboardBridge.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/SecurityBridge.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/SecurityBridge.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/SecurityBridge.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.identity; -import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.identity.event.IdentityEvent; +import org.jboss.portal.identity.event.IdentityEventEmitter; import org.jboss.portal.identity.event.IdentityEventListener; -import org.jboss.portal.identity.event.IdentityEventEmitter; -import org.jboss.portal.identity.event.IdentityEvent; import org.jboss.portal.identity.event.UserDestroyedEvent; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.security.auth.login.DynamicLoginConfigMBean; /** * Use identity destroy events to destroy corresponding dashboards. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SecurityBridge extends AbstractJBossService implements IdentityEventListener { @@ -82,7 +82,7 @@ // log.debug("User (userName=" + destroyedEvent.getUserName() + ",id=" + destroyedEvent.getUserId() + - " ) is destroyed, will invalidate security manager cache instead "); + " ) is destroyed, will invalidate security manager cache instead "); // try Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/SecurityBridge.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -27,24 +27,24 @@ /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public class UserActivity { - + public static final int NAVIGATION = 0; public static final int SIGN_OUT = 1; - + private String id; private long timestamp; - + private final int type; private UserActivity() { - this.type = NAVIGATION; + this.type = NAVIGATION; } public UserActivity(String id, long timestamp, int type) @@ -113,5 +113,5 @@ result = id.hashCode(); return result; } - + } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcaster.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcaster.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcaster.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,12 +26,12 @@ /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public class UserActivityNotificationBroadcaster extends HAServiceMBeanSupport implements UserActivityNotificationBroadcasterMBean { /** * Nothing special at the moment... */ - + } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcaster.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,12 +25,12 @@ import org.jboss.ha.jmx.HAServiceMBean; import javax.management.Notification; +import javax.management.NotificationFilter; import javax.management.NotificationListener; -import javax.management.NotificationFilter; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public interface UserActivityNotificationBroadcasterMBean extends HAServiceMBean { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivityNotificationBroadcasterMBean.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public interface UsersActivityStatsService { @@ -36,6 +36,6 @@ public Set getActiveUsersNames(long period); public Set getUsersActivities(long period); - + public void registerActivity(final UserActivity userActivity); } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,6 @@ package org.jboss.portal.core.identity; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import javax.management.Notification; -import javax.management.NotificationListener; -import javax.management.ObjectName; - -import org.jboss.logging.Logger; -import org.jboss.portal.jems.as.system.AbstractJBossService; - import edu.emory.mathcs.backport.java.util.Queue; import edu.emory.mathcs.backport.java.util.concurrent.Callable; import edu.emory.mathcs.backport.java.util.concurrent.Executor; @@ -42,11 +30,21 @@ import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService; import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; +import org.jboss.logging.Logger; +import org.jboss.portal.jems.as.system.AbstractJBossService; +import javax.management.Notification; +import javax.management.NotificationListener; +import javax.management.ObjectName; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + /** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public class UsersActivityStatsServiceImpl extends AbstractJBossService implements UsersActivityStatsService, NotificationListener { @@ -99,13 +97,13 @@ addNotificationListener(this, null, null); } - + } protected void stopService() throws Exception { super.stopService(); - + // /TODO: stop all the threads } @@ -188,7 +186,6 @@ } - } public void handleNotification(Notification notification, Object object) @@ -303,15 +300,19 @@ UserActivity activity = (UserActivity)activityQueue.poll(); if (activity != null && ((currentTime - activity.getTimestamp()) < activityTimeout)) { - if (activity.getType() != UserActivity.SIGN_OUT) - stillActive.add(activity); - else - stillActive.remove(activity); + if (activity.getType() != UserActivity.SIGN_OUT) + { + stillActive.add(activity); + } + else + { + stillActive.remove(activity); + } } } activityResults = Collections.unmodifiableSet(stillActive); - + } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -21,32 +21,33 @@ */ package org.jboss.portal.core.identity.service; -import org.jboss.portal.jems.as.system.AbstractJBossService; -import org.jboss.portal.jems.as.system.JBossServiceModelMBean; -import org.jboss.portal.jems.as.JNDI; -import org.jboss.portal.identity.IdentityException; +import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; +import org.jboss.kernel.spi.dependency.KernelControllerContext; import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityContextImpl; +import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.identity.ServiceJNDIBinder; import org.jboss.portal.identity.boot.IdentityServiceLoader; -import org.jboss.portal.identity.event.IdentityEventBroadcaster; import org.jboss.portal.identity.event.IdentityEvent; +import org.jboss.portal.identity.event.IdentityEventBroadcaster; import org.jboss.portal.identity.metadata.service.IdentityServicesMetaData; import org.jboss.portal.identity.service.IdentityConfigurationService; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; -import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; +import org.jboss.portal.jems.as.JNDI; +import org.jboss.portal.jems.as.system.AbstractJBossService; +import org.jboss.portal.jems.as.system.JBossServiceModelMBean; import javax.management.ObjectName; /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ -public class IdentityServiceControllerImpl extends AbstractJBossService implements IdentityServiceController { - +public class IdentityServiceControllerImpl extends AbstractJBossService implements IdentityServiceController +{ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(IdentityServiceControllerImpl.class); private String jndiName; @@ -63,9 +64,7 @@ private IdentityEventBroadcaster identityEventBroadcaster; - /** - * . - */ + /** . */ protected Kernel kernel; @@ -93,10 +92,9 @@ identityContext = bootstrapIdentityContext(); - // IdentityEventBroadcaster IdentityEventBroadcaster broadcaster = identityEventBroadcaster; - if(broadcaster == null) + if (broadcaster == null) { broadcaster = new IdentityEventBroadcaster() { @@ -116,7 +114,6 @@ { throw new IdentityException("Unable to install IdentityEventBroadcaster", throwable); } - //process the list of modules, instantiate them, configure them, tide them try @@ -128,7 +125,8 @@ //TODO:set proper jndiName and serviceName and JNDI binder configuration.start(); - IdentityServiceLoader serviceLoader = new IdentityServiceLoader(identityContext, kernel, registerMBeans) { + IdentityServiceLoader serviceLoader = new IdentityServiceLoader(identityContext, kernel, registerMBeans) + { protected void registerMBean(String serviceName, Object serviceObject) throws Exception { @@ -181,7 +179,7 @@ } catch (Throwable throwable) { - throw new IdentityException("Unable to install IdentityContext",throwable); + throw new IdentityException("Unable to install IdentityContext", throwable); } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/SimpleServiceJNDIBinder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/SimpleServiceJNDIBinder.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/SimpleServiceJNDIBinder.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,9 +30,9 @@ /** * Really dummy JNDI binder - * + * * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ + * @version $Revision$ */ public class SimpleServiceJNDIBinder implements ServiceJNDIBinder { @@ -52,14 +52,14 @@ public void unbind(String jndiName) { if (jndiName != null) + { + try { - try - { - NonSerializableFactory.unbind(jndiName); - } - catch (NameNotFoundException ignore) - { - } + NonSerializableFactory.unbind(jndiName); } + catch (NameNotFoundException ignore) + { + } + } } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/SimpleServiceJNDIBinder.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/PortalRuntimeContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/PortalRuntimeContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/PortalRuntimeContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,18 +25,18 @@ import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.navstate.NavigationalStateContext; import org.jboss.portal.api.session.PortalSession; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.impl.api.session.PortalSessionImpl; import org.jboss.portal.core.impl.api.navstate.NavigationalStateContextImpl; import org.jboss.portal.core.impl.api.node.PortalNodeURLFactory; +import org.jboss.portal.core.impl.api.session.PortalSessionImpl; import org.jboss.portal.identity.User; import javax.servlet.http.HttpSession; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalRuntimeContextImpl implements PortalRuntimeContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/PortalRuntimeContextImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/PortalEventContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/PortalEventContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/PortalEventContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.impl.api.event; +import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.event.PortalEventContext; -import org.jboss.portal.api.PortalRuntimeContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalEventContextImpl implements PortalEventContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/PortalEventContextImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -29,11 +29,10 @@ import org.jboss.portal.api.event.PortalEvent; import org.jboss.portal.api.event.PortalEventContext; import org.jboss.portal.api.event.PortalEventListener; -import org.jboss.portal.api.user.event.UserAuthenticationEvent; import org.jboss.portal.api.session.event.PortalSessionEvent; +import org.jboss.portal.api.user.event.UserAuthenticationEvent; import org.jboss.portal.core.event.PortalEventListenerRegistry; import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl; -import org.jboss.portal.core.impl.api.event.PortalEventContextImpl; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; @@ -47,7 +46,7 @@ * Bridge servlet event to portal events. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ServletEventBridge implements HttpSessionListener, ServletContextListener, HttpSessionAttributeListener { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/event/ServletEventBridge.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/navstate/NavigationalStateContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/navstate/NavigationalStateContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/navstate/NavigationalStateContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.impl.api.navstate; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.api.navstate.NavigationalStateContext; -import org.jboss.portal.core.navstate.NavigationalStateKey; -import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; -import org.jboss.portal.core.impl.api.node.PortalNodeImpl; import org.jboss.portal.api.node.PortalNode; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.AttributeResolver; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; +import org.jboss.portal.core.navstate.NavigationalStateKey; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class NavigationalStateContextImpl implements NavigationalStateContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/navstate/NavigationalStateContextImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,14 +23,14 @@ package org.jboss.portal.core.impl.api.node; import org.jboss.portal.api.node.PortalNodeURL; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.portlet.PortletParametersStateString; import org.jboss.portal.server.request.URLContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AbstractPortalNodeURL implements PortalNodeURL { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/AbstractPortalNodeURL.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.impl.api.node; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PageURL extends AbstractPortalNodeURL { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PageURL.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -31,7 +31,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalNodeEventContextImpl implements PortalNodeEventContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeEventContextImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,33 +22,33 @@ ******************************************************************************/ package org.jboss.portal.core.impl.api.node; +import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; -import org.jboss.portal.api.PortalRuntimeContext; -import org.jboss.portal.common.path.RelativePathParser; import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.i18n.SimpleResourceBundleFactory; +import org.jboss.portal.common.path.RelativePathParser; +import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPermission; -import org.jboss.portal.core.impl.api.PortalRuntimeContextImpl; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; -import java.util.Map; +import java.util.List; import java.util.Locale; -import java.util.ResourceBundle; +import java.util.Map; import java.util.MissingResourceException; -import java.util.Comparator; -import java.util.List; -import java.util.ArrayList; +import java.util.ResourceBundle; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalNodeImpl implements PortalNode { @@ -252,7 +252,7 @@ private float getWeight() { - switch(object.getType()) + switch (object.getType()) { case PortalObject.TYPE_CONTEXT: return 0; @@ -340,9 +340,7 @@ return map; } - /** - * Compute and returns a modifiable map made of the children nodes. - */ + /** Compute and returns a modifiable map made of the children nodes. */ protected final Map buildChildMap(PortalNodeImpl objectNode) { PortalObject object = objectNode.object; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeURLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeURLFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,11 +25,10 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.impl.api.node.PortalNodeImpl; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5136 $ + * @version $Revision$ */ public class PortalNodeURLFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeURLFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.impl.api.node; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class WindowURL extends AbstractPortalNodeURL { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/WindowURL.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/session/PortalSessionImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/session/PortalSessionImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/session/PortalSessionImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalSessionImpl implements PortalSession { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/session/PortalSessionImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/user/UserEventBridgeTriggerInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/user/UserEventBridgeTriggerInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/user/UserEventBridgeTriggerInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.core.impl.api.user; +import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.server.ServerInterceptor; import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.common.invocation.InvocationException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; @@ -34,7 +34,7 @@ * Trigger user events in the event bridge. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class UserEventBridgeTriggerInterceptor extends ServerInterceptor { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/user/UserEventBridgeTriggerInterceptor.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model; -import java.util.Iterator; - import org.jboss.logging.Logger; import org.jboss.portal.core.impl.model.content.portlet.PortletContent; import org.jboss.portal.core.model.CustomizationManager; @@ -47,9 +45,11 @@ import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import java.util.Iterator; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CustomizationManagerService extends AbstractJBossService implements CustomizationManager { @@ -166,7 +166,7 @@ // String instanceId = ((PortletContent)content).getInstanceRef(); - if (instanceId == null) + if (instanceId == null) { return null; } @@ -289,7 +289,7 @@ // Copy the template portal dashboardPortal = (Portal)templatePortal.copy(dashboardContext, userId, false); copy(templatePortal, dashboardContext.getChild(userId)); - + } } catch (DuplicatePortalObjectException e) @@ -332,9 +332,7 @@ } - /** - * Destroys the user dashboard if any - */ + /** Destroys the user dashboard if any */ public void destroyDashboard(String userId) { try Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/CustomizationManagerService.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -29,7 +29,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class AbstractContent implements Content { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.content; +import org.jboss.portal.common.util.CopyOnWriteRegistry; import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.ContentProvider; import org.jboss.portal.core.model.portal.content.ContentRenderer; -import org.jboss.portal.common.util.CopyOnWriteRegistry; import java.util.Collection; @@ -33,7 +33,7 @@ * A simple registry to track the instance that provides content facilities. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ContentProviderRegistryService implements InternalContentProviderRegistry { @@ -61,7 +61,7 @@ public void start() { - synchronized(ContentProviderRegistryService.class) + synchronized (ContentProviderRegistryService.class) { if (instance != null) { @@ -73,7 +73,7 @@ public void stop() { - synchronized(ContentProviderRegistryService.class) + synchronized (ContentProviderRegistryService.class) { instance = null; } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.content; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.jboss.logging.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -70,9 +62,17 @@ import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class InternalContentProvider implements ContentRenderer { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,7 +30,7 @@ * A simple registry to track the instance that provides content facilities. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface InternalContentProviderRegistry extends ContentProviderRegistry, ContentRendererRegistry { @@ -41,7 +41,7 @@ void registerContentProvider(InternalContentProvider registration); /** - * + * */ void unregisterContentProvider(ContentType contentType); } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.content.generic; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.impl.model.content.AbstractContent; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.impl.model.content.AbstractContent; -import org.jboss.portal.common.i18n.LocalizedString; import java.util.Locale; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class GenericContent extends AbstractContent { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,19 +22,19 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.content.generic; -import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.common.util.CopyOnWriteRegistry; +import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry; import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry; -import org.jboss.portal.common.util.CopyOnWriteRegistry; +import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ -public class GenericContentProviderRegistry +public class GenericContentProviderRegistry { /** . */ @@ -56,7 +56,7 @@ /** . */ private CopyOnWriteRegistry registrations = new CopyOnWriteRegistry(); - + /** . */ private PortalAuthorizationManagerFactory pamf; @@ -89,15 +89,15 @@ { this.registry = registry; } - + public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory() { return pamf; } - + public void setPortalAuthorizationManagerFactory(PortalAuthorizationManagerFactory portalAuthorizationManagerFactory) { - this.pamf = portalAuthorizationManagerFactory; + this.pamf = portalAuthorizationManagerFactory; } public void register( @@ -111,7 +111,7 @@ provider.setContentPortletInfo(contentPortlet); provider.setRegistry(registry); provider.setPortalAuthorizationManagerFactory(pamf); - + // Keep track registrations.register(contentType, provider); @@ -137,7 +137,7 @@ public void start() throws Exception { - synchronized(GenericContentProviderRegistry.class) + synchronized (GenericContentProviderRegistry.class) { if (instance != null) { @@ -149,7 +149,7 @@ public void stop() throws Exception { - synchronized(GenericContentProviderRegistry.class) + synchronized (GenericContentProviderRegistry.class) { instance = null; } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,34 +22,34 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.content.generic; +import org.jboss.portal.Mode; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.invocation.AttributeResolver; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.impl.model.content.InternalContentProvider; import org.jboss.portal.core.model.content.Content; +import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.ContentProvider; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.portal.content.WindowRendition; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.response.MarkupResponse; +import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.impl.model.content.InternalContentProvider; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.PortletParametersStateString; -import org.jboss.portal.Mode; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.common.invocation.AttributeResolver; import java.util.Iterator; import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InternalGenericContentProvider extends InternalContentProvider implements ContentHandler { @@ -191,7 +191,7 @@ PortletParametersStateString state = new PortletParametersStateString(); // - for (Iterator i = content.getParameterNames();i.hasNext();) + for (Iterator i = content.getParameterNames(); i.hasNext();) { String paramName = (String)i.next(); String paramValue = content.getParameter(paramName); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -45,7 +45,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InternalPortletContentProvider extends InternalContentProvider implements ContentHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.content.portlet; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.impl.model.content.AbstractContent; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.impl.model.content.AbstractContent; -import org.jboss.portal.common.i18n.LocalizedString; import java.util.Locale; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletContent extends AbstractContent { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,32 +24,29 @@ import org.apache.log4j.Logger; import org.jboss.portal.core.model.instance.Instance; -import org.jboss.portal.core.model.instance.InstanceCustomization; import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.core.model.instance.InstanceCustomization; import org.jboss.portal.core.model.instance.InstanceDefinition; -import org.jboss.portal.core.model.instance.InstancePermission; +import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.state.DestroyCloneFailure; import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; -import org.jboss.portal.Mode; import java.util.Arrays; -import java.util.Set; -import java.util.List; import java.util.Collections; import java.util.Iterator; +import java.util.List; +import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class AbstractInstance implements Instance { @@ -317,11 +314,11 @@ List failures = portletInvoker.destroyClones(toDestroy); if (failures.size() > 0) { - for (Iterator i = failures.iterator();i.hasNext();) + for (Iterator i = failures.iterator(); i.hasNext();) { DestroyCloneFailure failure = (DestroyCloneFailure)i.next(); log.error("Was not able to destroy " + failure.getPortletId() + " for customization " + - customizationId + ", reason is : " + failure.getMessage()); + customizationId + ", reason is : " + failure.getMessage()); } } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstance.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceCustomization.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceCustomization.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceCustomization.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.instance; +import org.apache.log4j.Logger; import org.jboss.portal.core.model.instance.InstanceCustomization; +import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.PortletContext; -import org.apache.log4j.Logger; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class AbstractInstanceCustomization extends AbstractInstance implements InstanceCustomization { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceCustomization.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceDefinition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceDefinition.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceDefinition.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.instance; +import org.apache.log4j.Logger; import org.jboss.portal.core.model.instance.InstanceDefinition; +import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.PortletContext; -import org.apache.log4j.Logger; import java.util.Collection; import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6736 $ + * @version $Revision$ */ public abstract class AbstractInstanceDefinition extends AbstractInstance implements InstanceDefinition { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/AbstractInstanceDefinition.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,45 +22,45 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.instance; -import org.jboss.portal.common.invocation.InvocationHandler; 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.core.model.instance.DuplicateInstanceException; +import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.instance.InstanceDefinition; import org.jboss.portal.core.model.instance.InstancePermission; import org.jboss.portal.core.model.instance.NoSuchInstanceException; -import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; +import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.DestroyCloneFailure; import org.jboss.portal.security.PortalPermission; +import org.jboss.portal.security.PortalPermissionCollection; import org.jboss.portal.security.PortalSecurityException; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; -import org.jboss.portal.security.PortalPermissionCollection; import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistry; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; -import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.provider.AuthorizationDomain; 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 org.jboss.portal.jems.as.system.AbstractJBossService; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import java.util.Collections; /** * Instance Container that is persistent @@ -265,7 +265,7 @@ instanceMD.setPortletRef(portletId); return internalCreateDefinition(instanceMD, clone); } - + private InstanceDefinition internalCreateDefinition(InstanceMetaData instanceMD, boolean clone) throws DuplicateInstanceException, PortletInvokerException { if (instanceMD == null) @@ -403,7 +403,7 @@ PortalAuthorizationManager mgr = portalAuthorizationManagerFactory.getManager(); // - for (Iterator i = list.iterator();i.hasNext();) + for (Iterator i = list.iterator(); i.hasNext();) { Instance instance = (Instance)i.next(); InstancePermission perm = new InstancePermission(instance.getId(), InstancePermission.VIEW_ACTION); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContainerImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,8 +23,8 @@ package org.jboss.portal.core.impl.model.instance; import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.instance.InstanceCustomization; import org.jboss.portal.core.model.instance.InstanceDefinition; -import org.jboss.portal.core.model.instance.InstanceCustomization; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.spi.InstanceContext; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/JBossInstanceContainerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/JBossInstanceContainerContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/JBossInstanceContainerContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface JBossInstanceContainerContext extends InstanceContainerContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/JBossInstanceContainerContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,36 +22,36 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.instance.persistent; -import org.hibernate.SessionFactory; -import org.hibernate.Session; +import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap; +import org.apache.log4j.Logger; import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.exception.ConstraintViolationException; -import org.jboss.portal.jems.hibernate.ObjectContextualizer; -import org.jboss.portal.core.model.instance.DuplicateInstanceException; -import org.jboss.portal.core.model.instance.InstancePermission; -import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.core.impl.model.instance.AbstractInstance; -import org.jboss.portal.core.impl.model.instance.AbstractInstanceDefinition; import org.jboss.portal.core.impl.model.instance.AbstractInstanceCustomization; +import org.jboss.portal.core.impl.model.instance.AbstractInstanceDefinition; import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl; import org.jboss.portal.core.impl.model.instance.JBossInstanceContainerContext; -import org.jboss.portal.common.util.Tools; +import org.jboss.portal.core.model.instance.DuplicateInstanceException; +import org.jboss.portal.core.model.instance.InstancePermission; +import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; +import org.jboss.portal.jems.hibernate.ObjectContextualizer; import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.PortalSecurityException; -import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; -import org.apache.log4j.Logger; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; import javax.naming.InitialContext; -import java.util.Iterator; import java.util.Collection; +import java.util.Iterator; import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PersistentInstanceContainerContext implements JBossInstanceContainerContext { @@ -300,7 +300,6 @@ instance.setPortletRef(portletContext.getId()); instance.setState(portletContext.getState()); - // updateInstance(instance); } @@ -310,7 +309,7 @@ PersistentInstanceDefinition _def = (PersistentInstanceDefinition)def; // - for (Iterator i = _def.getRelatedSecurityBindings().values().iterator();i.hasNext();) + for (Iterator i = _def.getRelatedSecurityBindings().values().iterator(); i.hasNext();) { PersistentRoleSecurityBinding isc = (PersistentRoleSecurityBinding)i.next(); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceContainerContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceCustomization.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,21 +23,21 @@ package org.jboss.portal.core.impl.model.instance.persistent; import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.impl.model.instance.AbstractInstanceDefinition; import org.jboss.portal.core.impl.model.instance.InstanceContainerContext; -import org.jboss.portal.core.impl.model.instance.AbstractInstanceDefinition; import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; import org.jboss.portal.jems.hibernate.ContextObject; import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedStringMetaData; import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData; import org.jboss.portal.security.RoleSecurityBinding; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.Locale; import java.util.Map; -import java.util.Collection; import java.util.Set; -import java.util.HashSet; -import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -112,7 +112,7 @@ } return map; } - + public LocalizedString getDisplayName() { return new LocalizedString(displayNames, Locale.ENGLISH); @@ -186,7 +186,7 @@ { return instanceId; } - + // AbstractInstanceDefinition implementation ************************************************************************ public Collection getCustomizations() Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentRoleSecurityBinding.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.ContentProvider; +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +import org.jboss.portal.core.model.portal.Context; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.PortalObjectPath; -import org.jboss.portal.core.model.portal.Context; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; -import org.jboss.portal.core.model.content.spi.ContentProvider; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.security.PortalPermission; import org.jboss.portal.security.PortalPermissionCollection; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,11 +22,10 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; -import org.jboss.portal.core.model.portal.PortalContainer; +import org.jboss.portal.core.model.portal.Context; import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.Context; import java.util.HashMap; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,15 +30,12 @@ * An implementation of the <code>Context</code> interface for dashboards. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class DashboardContext implements Context { - - - public Collection getChildren() { throw new UnsupportedOperationException(); @@ -49,8 +46,6 @@ throw new UnsupportedOperationException(); } - - // // public Portal getPortal(String name) throws IllegalArgumentException // { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/DashboardContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; +import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.content.ContentType; import java.util.HashMap; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -27,9 +27,9 @@ import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObject; +import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import java.util.HashMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectIdUserType.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectIdUserType.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectIdUserType.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; -import org.jboss.portal.jems.hibernate.StringWrapperUserType; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.jems.hibernate.StringWrapperUserType; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ + * @version $Revision$ */ public class PortalObjectIdUserType extends StringWrapperUserType { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectIdUserType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.impl.model.portal; -import org.jboss.portal.core.model.portal.PortalObjectId; +import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; import java.util.Iterator; import java.util.Map; -import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -76,7 +75,7 @@ protected ObjectNode getObjectNode(PortalObjectId id) { ObjectNode node = (ObjectNode)roots.get(id.getNamespace()); - for (Iterator i = id.getPath().names();node != null && i.hasNext();) + for (Iterator i = id.getPath().names(); node != null && i.hasNext();) { String name = (String)i.next(); node = (ObjectNode)node.getChildren().get(name); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,13 +24,13 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.content.Content; import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +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.jems.hibernate.ContextObject; import java.util.HashMap; @@ -163,9 +163,7 @@ getContentState().destroy(); } - /** - * Encapsulate content behavior for a window. - */ + /** Encapsulate content behavior for a window. */ private class ContentStateImpl implements ContentState { @@ -226,23 +224,28 @@ { Iterator i = getDeclaredProperties().keySet().iterator(); String next; + { findNext(); } + public boolean hasNext() { return next != null; } + public Object next() { String tmp = next; findNext(); return tmp; } + public void remove() { throw new UnsupportedOperationException(); } + void findNext() { next = null; @@ -270,7 +273,7 @@ public void clearParameters() { - for (Iterator i = getDeclaredProperties().keySet().iterator();i.hasNext();) + for (Iterator i = getDeclaredProperties().keySet().iterator(); i.hasNext();) { String propertyName = (String)i.next(); if (propertyName.startsWith("content.")) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; +import org.jboss.portal.core.metadata.portlet.AjaxMetaData; import org.jboss.portal.core.portlet.info.AjaxInfo; -import org.jboss.portal.core.metadata.portlet.AjaxMetaData; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AjaxInfoImpl implements AjaxInfo { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/AjaxInfoImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; +import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.portlet.container.PortletApplicationContext; +import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory; -import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.metadata.JBossPortletMetaData; -import org.jboss.portal.common.i18n.ResourceBundleManager; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CorePortletInfoFactory implements PortletInfoFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,23 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.transaction.Transactions; +import org.jboss.portal.core.metadata.portlet.AjaxMetaData; +import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; +import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; +import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; +import org.jboss.portal.core.portlet.info.AjaxInfo; import org.jboss.portal.core.portlet.info.CorePortletInfo; -import org.jboss.portal.core.portlet.info.AjaxInfo; import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; import org.jboss.portal.core.portlet.info.PortletInfoInfo; -import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData; -import org.jboss.portal.core.metadata.portlet.AjaxMetaData; -import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; -import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData; import org.jboss.portal.portlet.container.PortletApplicationContext; import org.jboss.portal.portlet.impl.jsr168.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData; -import org.jboss.portal.common.i18n.ResourceBundleManager; -import org.jboss.portal.common.transaction.Transactions; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class CorePortletInfoImpl extends ContainerPortletInfo implements CorePortletInfo { @@ -54,7 +54,7 @@ /** . */ private final PortletInfoInfoImpl portletInfo; - + public CorePortletInfoImpl(PortletApplicationContext portletApplicationContext, PortletMetaData portletMD, org.jboss.portal.portlet.metadata.JBossPortletMetaData jbossPortletMD, ResourceBundleManager bundleMgr) { super(portletApplicationContext, portletMD, jbossPortletMD, bundleMgr); @@ -63,13 +63,13 @@ AjaxMetaData ajaxMD = ((JBossPortletMetaData)jbossPortletMD).getAjax(); HeaderContentMetaData headerContentMD = ((JBossPortletMetaData)jbossPortletMD).getHeaderContent(); PortletInfoMetaData portletInfoMD = ((JBossPortletMetaData)jbossPortletMD).getPortletInfo(); - + // this.txType = jbossPortletMD.getTxType(); this.ajax = ajaxMD != null ? new AjaxInfoImpl(ajaxMD) : null; this.markupHeader = headerContentMD != null ? new MarkupHeaderInfoImpl(headerContentMD) : null; this.portletInfo = portletInfoMD != null ? new PortletInfoInfoImpl(portletApplicationContext, portletInfoMD) : null; - } + } public Transactions.Type getTxType() { @@ -85,7 +85,7 @@ { return markupHeader; } - + public PortletInfoInfo getPortletInfo() { return portletInfo; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/CorePortletInfoImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; +import org.jboss.portal.core.metadata.portlet.ElementMetaData; +import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; import org.jboss.portal.core.portlet.info.MarkupHeaderInfo; -import org.jboss.portal.core.metadata.portlet.HeaderContentMetaData; -import org.jboss.portal.core.metadata.portlet.ElementMetaData; +import java.util.ArrayList; import java.util.Collection; -import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class MarkupHeaderInfoImpl implements MarkupHeaderInfo { @@ -44,7 +44,7 @@ public MarkupHeaderInfoImpl(HeaderContentMetaData headerContentMD) { ArrayList markupElements = new ArrayList(headerContentMD.getElements().size()); - for (Iterator i = headerContentMD.getElements().iterator();i.hasNext();) + for (Iterator i = headerContentMD.getElements().iterator(); i.hasNext();) { ElementMetaData elementMD = (ElementMetaData)i.next(); markupElements.add(elementMD.getElement()); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/MarkupHeaderInfoImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.info; -import java.util.Map; - import org.jboss.portal.core.metadata.portlet.PortletIconMetaData; import org.jboss.portal.core.portlet.info.PortletIconInfo; import org.jboss.portal.portlet.container.PortletApplicationContext; +import java.util.Map; + /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @version $Revision$ @@ -36,7 +36,7 @@ { /** . */ private Map icons; - + /** . */ private PortletApplicationContext portletApplicationContext; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletIconInfoImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -35,7 +35,7 @@ { /** . */ private PortletInfoMetaData portletInfoMetaData; - + /** . */ private PortletApplicationContext portletApplicationContext; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/LocalPortletInvoker.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/LocalPortletInvoker.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/LocalPortletInvoker.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,21 +22,21 @@ ******************************************************************************/ package org.jboss.portal.core.impl.portlet.state; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.state.PropertyChange; 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 java.util.List; import java.util.Set; -import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class LocalPortletInvoker implements PortletInvoker { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/LocalPortletInvoker.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -37,7 +37,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PersistentConsumer implements Consumer { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumerGroup.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumerGroup.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumerGroup.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -36,7 +36,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PersistentConsumerGroup implements ConsumerGroup, ContextObject { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentConsumerGroup.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletState.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletState.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletState.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,8 +25,8 @@ import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.AbstractPropertyMap; import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.state.producer.PortletState; import org.jboss.portal.portlet.state.producer.PortletStateContext; -import org.jboss.portal.portlet.state.producer.PortletState; import java.util.Calendar; import java.util.Date; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletState.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletStateEntry.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentPortletStatePersistenceManager.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentRegistration.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentRegistration.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentRegistration.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,20 +24,19 @@ import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.util.TypedMap; -import org.jboss.portal.common.util.MapAccessor; import org.jboss.portal.registration.Consumer; import org.jboss.portal.registration.Registration; import org.jboss.portal.registration.RegistrationStatus; import javax.xml.namespace.QName; import java.util.Collections; -import java.util.Map; import java.util.HashSet; +import java.util.Map; import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PersistentRegistration implements Registration { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentRegistration.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/RegistrationStatusUserType.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/RegistrationStatusUserType.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/RegistrationStatusUserType.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -34,7 +34,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class RegistrationStatusUserType implements UserType { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/RegistrationStatusUserType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/StateManagementPolicyImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/StateManagementPolicyImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/StateManagementPolicyImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -31,7 +31,7 @@ * local portal or for wsrp invocations in the context of a registration. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class StateManagementPolicyImpl implements StateManagementPolicy { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/StateManagementPolicyImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class AjaxMetaData { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/AjaxMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ElementMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ElementMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ElementMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class ElementMetaData { @@ -66,7 +66,7 @@ /** * Create a meta header element. <p>This element will create a meta tag.</p> * - * @param name name attribute of the meta element + * @param name name attribute of the meta element * @param content content attribute of the meta element * @return a new meta header element */ Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ElementMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -34,7 +34,7 @@ /** . */ private AjaxMetaData ajax; - + /** . */ private PortletInfoMetaData portletInfo; @@ -47,7 +47,7 @@ { this.headerContent = headerContent; } - + public AjaxMetaData getAjax() { return ajax; @@ -57,7 +57,7 @@ { this.ajax = ajax; } - + public PortletInfoMetaData getPortletInfo() { return portletInfo; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/LinkElementMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/LinkElementMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/LinkElementMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.metadata.portlet; +import org.jboss.portal.common.markup.MarkupAttribute; import org.jboss.portal.common.markup.MarkupElement; -import org.jboss.portal.common.markup.MarkupAttribute; import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class LinkElementMetaData extends ElementMetaData { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/LinkElementMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/NamedMetaElementMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/NamedMetaElementMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/NamedMetaElementMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.metadata.portlet; +import org.jboss.portal.common.markup.MarkupAttribute; import org.jboss.portal.common.markup.MarkupElement; -import org.jboss.portal.common.markup.MarkupAttribute; import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class NamedMetaElementMetaData extends ElementMetaData { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/NamedMetaElementMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -35,13 +35,13 @@ /** . */ public static final String SMALL = "small"; - + /** . */ public static final String LARGE = "large"; /** . */ private Map icons; - + public PortletIconMetaData() { icons = new HashMap(); @@ -56,7 +56,7 @@ { return (String)icons.get(size); } - + public Map getIcons() { return Collections.unmodifiableMap(icons); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletIconMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/PortletInfoMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ScriptElementMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ScriptElementMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ScriptElementMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.metadata.portlet; +import org.jboss.portal.common.markup.MarkupAttribute; import org.jboss.portal.common.markup.MarkupElement; -import org.jboss.portal.common.markup.MarkupAttribute; import java.util.ArrayList; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ScriptElementMetaData extends ElementMetaData { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/metadata/portlet/ScriptElementMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/CustomizationManager.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/CustomizationManager.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/CustomizationManager.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,16 +23,16 @@ package org.jboss.portal.core.model; import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.portal.Portal; +import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.identity.User; /** * Integration logic between portal objects, instances and users. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface CustomizationManager { @@ -46,11 +46,11 @@ Instance getInstance(Window window) throws IllegalArgumentException; /** - * Returns a contextualized portlet instance for the specified user id. If the window is in the context - * of a dashboard then the portlet instance is further customized for that specific window. + * Returns a contextualized portlet instance for the specified user id. If the window is in the context of a + * dashboard then the portlet instance is further customized for that specific window. * * @param window the window of the portlet instance - * @param user the user that can be null + * @param user the user that can be null * @return the target instance or null if it cannot be found * @throws IllegalArgumentException if the window is null */ Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/CustomizationManager.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/Content.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/Content.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/Content.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,7 +30,7 @@ * Defines the base interface for content. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface Content { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/Content.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/ContentType.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/ContentType.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/ContentType.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,10 +25,10 @@ import java.io.Serializable; /** - * Type safe string for notion of content type. + * Type safe string for notion of content type. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public final class ContentType implements Serializable { @@ -75,7 +75,7 @@ public String toString() { - return value; + return value; } /** Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/ContentType.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.model.content.spi; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.common.i18n.LocalizedString; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentProvider { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentProviderRegistry { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,25 +23,22 @@ package org.jboss.portal.core.model.content.spi.handler; import org.jboss.portal.core.model.content.Content; -import org.jboss.portal.core.model.content.spi.handler.ContentState; /** - * The content handler act as a factory for <code>Content</code> objects from their state. The interface - * receives also callbacks of the content lifecycle in order to be able to manage additional resources - * related to the content. - * + * The content handler act as a factory for <code>Content</code> objects from their state. The interface receives also + * callbacks of the content lifecycle in order to be able to manage additional resources related to the content. + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentHandler { /** - * Factory method that creates an instance of content object. This method is called - * whenever the frameworks needs a runtime representation of the content state which - * can be used at runtime by content clients. + * Factory method that creates an instance of content object. This method is called whenever the frameworks needs a + * runtime representation of the content state which can be used at runtime by content clients. * * @param contextId the context id in which the state is used - * @param state the state + * @param state the state * @return the content interface implementation */ Content newContent(String contextId, ContentState state); @@ -50,7 +47,7 @@ * Life cycle method to signal state creation. * * @param contextId the context id in which the state is created - * @param state the state + * @param state the state */ void contentCreated(String contextId, ContentState state); @@ -58,7 +55,7 @@ * Life cycle method to signal state destruction. * * @param contextId the context id in which the state is destroyed - * @param state the state + * @param state the state */ void contentDestroyed(String contextId, ContentState state); } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ * Represents the state of the content which consist in an URI and a set of properties. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentState { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/portlet/ContentPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/portlet/ContentPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/portlet/ContentPortlet.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,14 +28,12 @@ * Define the portlet integration for content interactions. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentPortlet { - /** - * The edit content mode. - */ + /** The edit content mode. */ Mode EDIT_CONTENT_MODE = Mode.create("edit_content"); /** Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/content/spi/portlet/ContentPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/Instance.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/Instance.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/Instance.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -38,7 +38,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public interface Instance +public interface Instance { /** The attribute name under which the instance id can be accessed. */ String INSTANCE_ID_ATTRIBUTE = "instanceid"; @@ -52,11 +52,11 @@ /** * Return the display name - * + * * @return the display name */ LocalizedString getDisplayName(); - + /** * Return the runtime metadata for this portlet. * Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/Instance.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -32,7 +32,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InstanceCommandFactory extends AbstractCommandFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance; -import java.util.Collection; - import org.jboss.portal.core.model.instance.metadata.InstanceMetaData; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.security.spi.provider.AuthorizationDomain; +import java.util.Collection; + /** * A container for instances of component. * Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface InstanceCustomization extends Instance { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface InstanceDefinition extends Instance { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -85,7 +85,7 @@ public static final String PERMISSION_TYPE = "instance"; /** The action names. */ - private static final String[] ACTION_NAMES = {VIEW_ACTION,CREATE_ACTION,DESTROY_ACTION,CUSTOMIZE_ACTION}; + private static final String[] ACTION_NAMES = {VIEW_ACTION, CREATE_ACTION, DESTROY_ACTION, CUSTOMIZE_ACTION}; public InstancePermission(PortalPermissionCollection collection) { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,6 +23,7 @@ package org.jboss.portal.core.model.instance; import org.jboss.logging.Logger; +import org.jboss.portal.Mode; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -30,7 +31,6 @@ import org.jboss.portal.security.PortalSecurityException; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; -import org.jboss.portal.Mode; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,22 +22,22 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance; -import org.jboss.portal.core.controller.command.mapper.URLFactoryDelegate; 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.model.instance.command.PortletInstanceCommand; +import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; -import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand; import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand; -import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; +import org.jboss.portal.portlet.impl.PortletRequestEncoder; +import org.jboss.portal.server.AbstractServerURL; +import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerURL; -import org.jboss.portal.server.ServerInvocation; -import org.jboss.portal.server.AbstractServerURL; -import org.jboss.portal.portlet.impl.PortletRequestEncoder; import org.jboss.util.NotImplementedException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InstanceURLFactory extends URLFactoryDelegate { @@ -47,7 +47,7 @@ /** . */ private String instanceId; - + public String getPath() { return path; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.portlet.InvokePortletCommandFactory; -import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; -import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand; import org.jboss.portal.portlet.ActionURL; import org.jboss.portal.portlet.RenderURL; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InvokePortletInstanceCommandFactory implements InvokePortletCommandFactory { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InvokePortletInstanceCommandFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,28 +22,28 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance; -import org.jboss.portal.core.controller.handler.ResponseHandler; -import org.jboss.portal.core.controller.handler.HandlerResponse; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.controller.handler.HTTPResponse; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.handler.HTTPResponse; +import org.jboss.portal.core.controller.handler.HandlerResponse; +import org.jboss.portal.core.controller.handler.ResponseHandler; import org.jboss.portal.core.controller.handler.ResponseHandlerException; +import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand; import org.jboss.portal.core.model.instance.command.response.UpdatePortletInstanceResponse; -import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand; +import org.jboss.portal.core.theme.PageRendition; +import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.core.theme.PageRendition; import javax.servlet.ServletException; import java.io.IOException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletInstanceResponseHandler implements ResponseHandler { @@ -54,7 +54,7 @@ try { UpdatePortletInstanceResponse upir = (UpdatePortletInstanceResponse)controllerResponse; - RenderPortletInstanceCommand render= new RenderPortletInstanceCommand(upir.getInstanceId(), upir.getNavigationalState()); + RenderPortletInstanceCommand render = new RenderPortletInstanceCommand(upir.getInstanceId(), upir.getNavigationalState()); final PageRendition rendition = (PageRendition)controllerContext.execute(render); final ServerInvocation invocation = controllerContext.getServerInvocation(); return new HTTPResponse() Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/PortletInstanceResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/PortletInstanceCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/PortletInstanceCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/PortletInstanceCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,7 +30,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class PortletInstanceCommand extends ControllerCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/PortletInstanceCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,26 +22,26 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance.command.action; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.controller.portlet.ControllerResponseFactory; +import org.jboss.portal.core.controller.portlet.InvokePortletCommandFactory; import org.jboss.portal.core.controller.portlet.PortletContextFactory; -import org.jboss.portal.core.controller.portlet.InvokePortletCommandFactory; import org.jboss.portal.core.controller.portlet.PortletInvocationFactory; -import org.jboss.portal.core.controller.portlet.ControllerResponseFactory; -import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.model.instance.InvokePortletInstanceCommandFactory; import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.PortletParameters; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletParameters; -import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InvokePortletInstanceActionCommand extends PortletInstanceCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceActionCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceRenderCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceRenderCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceRenderCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,13 +25,13 @@ import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; import org.jboss.portal.core.model.instance.command.response.UpdatePortletInstanceResponse; -import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; import org.jboss.portal.portlet.StateString; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class InvokePortletInstanceRenderCommand extends PortletInstanceCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/action/InvokePortletInstanceRenderCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,39 +22,39 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance.command.render; -import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; -import org.jboss.portal.core.model.instance.InvokePortletInstanceCommandFactory; -import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.controller.portlet.InvokePortletCommandFactory; import org.jboss.portal.core.controller.portlet.PortletContextFactory; -import org.jboss.portal.core.controller.portlet.InvokePortletCommandFactory; import org.jboss.portal.core.controller.portlet.PortletInvocationFactory; +import org.jboss.portal.core.model.instance.InvokePortletInstanceCommandFactory; +import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; import org.jboss.portal.core.theme.PageRendition; +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.invocation.RenderInvocation; +import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; +import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PageService; -import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.page.WindowContext; -import org.jboss.portal.common.NotYetImplemented; +import java.util.Collections; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class RenderPortletInstanceCommand extends PortletInstanceCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/PortletInstanceActionResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/PortletInstanceActionResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/PortletInstanceActionResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance.command.response; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.core.controller.portlet.PortletActionResponse; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletInstanceActionResponse extends PortletActionResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/PortletInstanceActionResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/UpdatePortletInstanceResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/UpdatePortletInstanceResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/UpdatePortletInstanceResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance.command.response; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.core.controller.ControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class UpdatePortletInstanceResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/command/response/UpdatePortletInstanceResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.model.instance.metadata; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - import org.apache.log4j.Logger; import org.jboss.portal.common.i18n.LocaleFormat; import org.jboss.portal.common.util.ConversionException; @@ -38,6 +32,12 @@ import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; import org.w3c.dom.Element; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + /** * Represent metadata of an instance. * @@ -135,7 +135,7 @@ preferencesMD.addPreference(preferenceMD); } } - + // Configure localized display-name LocalizedStringMetaData localizedStringMD = new LocalizedStringMetaData(); while (displayNamesIt.hasNext()) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/InstanceMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/metadata/PreferencesMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Context.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Context.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Context.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface Context extends PortalContainer { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Context.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,9 +24,9 @@ import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; import org.jboss.portal.core.controller.command.mapper.CommandFactory; +import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; import org.jboss.portal.server.ServerInvocation; /** Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Page.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Page.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Page.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -40,8 +40,7 @@ Portal getPortal(); /** - * Return a page window or null if the portal object does not exist or - * does not have the appropriate type. + * Return a page window or null if the portal object does not exist or does not have the appropriate type. * * @param name the window name * @return the specified page window @@ -52,12 +51,12 @@ /** * Create a new window. * - * @param name window name + * @param name window name * @param contentType the window content type - * @param contentURI the window content URI + * @param contentURI the window content URI * @return the created window * @throws DuplicatePortalObjectException if a portal object with the specified name already exist - * @throws IllegalArgumentException if the name is null + * @throws IllegalArgumentException if the name is null */ Window createWindow(String name, ContentType contentType, String contentURI) throws DuplicatePortalObjectException, IllegalArgumentException; } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Page.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -44,7 +44,7 @@ * @param name the name of the child page to create * @return the create page * @throws DuplicatePortalObjectException if an object with the specified name already exist - * @throws IllegalArgumentException if the name argument is null + * @throws IllegalArgumentException if the name argument is null */ Page createPage(String name) throws DuplicatePortalObjectException, IllegalArgumentException; } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Portal.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -31,8 +31,7 @@ public interface PortalContainer extends PortalObject { /** - * Return an existing portal or null if such a child does not exist or does not have - * the right type. + * Return an existing portal or null if such a child does not exist or does not have the right type. * * @param name the portal name * @return the specified portal @@ -46,7 +45,7 @@ * @param name the portal name * @return the newly created portal * @throws DuplicatePortalObjectException if a child with the specified name already exists - * @throws IllegalArgumentException if the name argument is null + * @throws IllegalArgumentException if the name argument is null */ Portal createPortal(String name) throws DuplicatePortalObjectException, IllegalArgumentException; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -27,15 +27,15 @@ import org.jboss.portal.common.util.ParameterMap; 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.command.action.ImportPageToDashboardCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand; +import org.jboss.portal.core.model.portal.command.mapping.PortalObjectPathMapper; +import org.jboss.portal.core.model.portal.command.view.ViewContextCommand; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; -import org.jboss.portal.core.model.portal.command.view.ViewContextCommand; import org.jboss.portal.core.model.portal.command.view.ViewPortalCommand; -import org.jboss.portal.core.model.portal.command.mapping.PortalObjectPathMapper; import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; -import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.impl.PortletRequestDecoder; import org.jboss.portal.server.ServerInvocation; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectId.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectId.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectId.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,7 +30,7 @@ * <ul> <li>The empty string maps to the empty namespace and the empty path</li> </ul> * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectId implements Comparable, Serializable { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectId.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -35,7 +35,7 @@ * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectPath implements Comparable, Serializable { @@ -366,7 +366,7 @@ { break; } - if (next > 0 && value.charAt(next-1) != '\\') + if (next > 0 && value.charAt(next - 1) != '\\') { length++; } @@ -385,7 +385,7 @@ { break; } - if (next > 0 && value.charAt(next-1) != '\\') + if (next > 0 && value.charAt(next - 1) != '\\') { String name = value.substring(previous, next); name = decodeName(name); @@ -463,7 +463,7 @@ int length = 1; for (int next = value.indexOf('.'); next != -1; next = value.indexOf('.', next + 1)) { - if (next > 0 && value.charAt(next-1) != '\\') + if (next > 0 && value.charAt(next - 1) != '\\') { length++; } @@ -475,7 +475,7 @@ int previous = 0; for (int next = value.indexOf('.'); next != -1; next = value.indexOf('.', next + 1)) { - if (next > 0 && value.charAt(next-1) != '\\') + if (next > 0 && value.charAt(next - 1) != '\\') { String name = value.substring(previous, next); name = decodeName(name); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPath.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -270,8 +270,8 @@ // if ((this.mask & DASHBOARD_MASK) == DASHBOARD_MASK && - caller != null && - thisPath.getLength() < thatPath.getLength()) + caller != null && + thisPath.getLength() < thatPath.getLength()) { Set tmp = caller.getPrincipals(UserPrincipal.class); if (tmp.size() > 0) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,31 +22,31 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal; -import org.jboss.portal.core.controller.handler.AbstractResponseHandler; -import org.jboss.portal.core.controller.handler.HandlerResponse; -import org.jboss.portal.core.controller.handler.HTTPResponse; +import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.core.controller.ControllerCommand; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.command.response.ThrowableResponse; +import org.jboss.portal.core.controller.handler.AbstractResponseHandler; +import org.jboss.portal.core.controller.handler.HTTPResponse; +import org.jboss.portal.core.controller.handler.HandlerResponse; +import org.jboss.portal.core.controller.handler.ResponseForward; import org.jboss.portal.core.controller.handler.ResponseHandlerException; -import org.jboss.portal.core.controller.handler.ResponseForward; +import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; import org.jboss.portal.core.model.portal.command.response.UpdateWindowResponse; -import org.jboss.portal.core.model.portal.command.render.RenderPageCommand; import org.jboss.portal.core.theme.PageRendition; +import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.ServerInvocationContext; -import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.common.util.MarkupInfo; import javax.servlet.ServletException; import java.io.IOException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectResponseHandler extends AbstractResponseHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,15 +26,15 @@ import org.jboss.portal.WindowState; 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.model.portal.command.PortalObjectCommand; +import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowActionCommand; +import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand; -import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; -import org.jboss.portal.core.model.portal.command.PortalObjectCommand; +import org.jboss.portal.core.model.portal.command.mapping.PortalObjectPathMapper; import org.jboss.portal.core.model.portal.command.view.ViewPageCommand; import org.jboss.portal.core.model.portal.command.view.ViewPortalCommand; -import org.jboss.portal.core.model.portal.command.mapping.PortalObjectPathMapper; -import org.jboss.portal.core.model.portal.command.action.ImportPageToDashboardCommand; -import org.jboss.portal.core.controller.command.mapper.URLFactoryDelegate; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.impl.PortletRequestEncoder; import org.jboss.portal.server.AbstractServerURL; @@ -181,7 +181,7 @@ // mapper.appendPath(buffer, id); - + // AbstractServerURL asu = new AbstractServerURL(); asu.setPortalRequestPath(buffer.toString()); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Window.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Window.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Window.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -51,25 +51,25 @@ ContentType getContentType(); /** - * Returns the window content or null if no content can be provided. Content could not be provided - * if no content handler has been found in the content handler registry. + * Returns the window content or null if no content can be provided. Content could not be provided if no content + * handler has been found in the content handler registry. * * @return the window content */ Content getContent(); - + /** - * Returns the inital window state (the window state to use when no navigational - * state exists, for example on a new page request) for this particular window - * + * Returns the inital window state (the window state to use when no navigational state exists, for example on a new + * page request) for this particular window + * * @return a windowState */ WindowState getInitialWindowState(); - + /** - * Returns the inital mode to use (the mode to use when no navigational - * state exists, for example on a new page request) for this particular window - * + * Returns the inital mode to use (the mode to use when no navigational state exists, for example on a new page + * request) for this particular window + * * @return a portlet mode */ Mode getInitialMode(); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/Window.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/ContextCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/ContextCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/ContextCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command; +import org.jboss.portal.core.controller.NoSuchResourceException; +import org.jboss.portal.core.model.portal.Context; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Context; -import org.jboss.portal.core.controller.NoSuchResourceException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class ContextCommand extends PortalObjectCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/ContextCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PageCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PageCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,12 +23,12 @@ package org.jboss.portal.core.model.portal.command; import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Portal; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class PageCommand extends PortalCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PageCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,7 +28,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class PortalCommand extends PortalObjectCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalObjectCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalObjectCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalObjectCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command; +import org.jboss.portal.core.controller.AccessDeniedException; import org.jboss.portal.core.controller.ControllerCommand; +import org.jboss.portal.core.controller.NoSuchResourceException; import org.jboss.portal.core.controller.SecurityException; -import org.jboss.portal.core.controller.NoSuchResourceException; -import org.jboss.portal.core.controller.AccessDeniedException; import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPermission; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; /** Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/PortalObjectCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/WindowCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/WindowCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/WindowCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,8 +24,8 @@ import org.jboss.portal.core.controller.SecurityException; import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; /** Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/WindowCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/ImportPageToDashboardCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/ImportPageToDashboardCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/ImportPageToDashboardCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,26 +22,26 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.action; -import org.jboss.portal.core.controller.command.info.CommandInfo; -import org.jboss.portal.core.controller.command.info.ActionCommandInfo; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.NoSuchResourceException; -import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.controller.command.info.ActionCommandInfo; +import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.model.CustomizationManager; +import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; +import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.Portal; -import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.command.PageCommand; import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; -import org.jboss.portal.core.model.portal.command.PageCommand; -import org.jboss.portal.core.model.CustomizationManager; import org.jboss.portal.identity.User; import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ImportPageToDashboardCommand extends PageCommand { @@ -97,7 +97,7 @@ dashboardPage = target.copy(dashboardPortal, name, false); // Copy children windows only - for (Iterator i = target.getChildren().iterator();i.hasNext();) + for (Iterator i = target.getChildren().iterator(); i.hasNext();) { PortalObject child = (PortalObject)i.next(); if (child.getType() == PortalObject.TYPE_WINDOW) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/ImportPageToDashboardCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,27 +25,27 @@ import org.jboss.logging.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.identity.User; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.NoSuchResourceException; import org.jboss.portal.core.controller.command.info.ActionCommandInfo; import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.controller.portlet.ControllerResponseFactory; import org.jboss.portal.core.controller.portlet.PortletInvocationFactory; -import org.jboss.portal.core.controller.portlet.ControllerResponseFactory; +import org.jboss.portal.core.model.content.Content; +import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.instance.Instance; -import org.jboss.portal.core.model.content.Content; +import org.jboss.portal.identity.User; +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.PortletParameters; -import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.spi.ActionContext; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.spi.ActionContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6912 $ + * @version $Revision$ */ public class InvokePortletWindowActionCommand extends InvokeWindowCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowActionCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,12 +26,11 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.InvocationContext; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.core.controller.command.info.CommandInfo; -import org.jboss.portal.core.controller.command.info.ActionCommandInfo; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.model.portal.command.response.UpdateWindowResponse; -import org.jboss.portal.core.model.portal.command.action.InvokeWindowCommand; +import org.jboss.portal.core.controller.command.info.ActionCommandInfo; +import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.command.response.UpdateWindowResponse; import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.portlet.StateString; @@ -40,7 +39,7 @@ * Simply update the navigational state of the window. No invocation to the underlying is done. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6912 $ + * @version $Revision$ */ public class InvokePortletWindowRenderCommand extends InvokeWindowCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokePortletWindowRenderCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -29,7 +29,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6007 $ + * @version $Revision$ */ public abstract class InvokeWindowCommand extends WindowCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/InvokeWindowCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/MoveWindowCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/MoveWindowCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/MoveWindowCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,24 +22,24 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.action; +import org.jboss.portal.common.util.ListMap; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.command.info.ActionCommandInfo; import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.WindowCommand; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.ThemeTools; -import org.jboss.portal.common.util.ListMap; +import java.util.Comparator; import java.util.Iterator; -import java.util.Comparator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class MoveWindowCommand extends WindowCommand { @@ -96,7 +96,7 @@ } // - for (Iterator i = blah.keySet().iterator();i.hasNext();) + for (Iterator i = blah.keySet().iterator(); i.hasNext();) { String key = (String)i.next(); @@ -108,7 +108,7 @@ if (!processFrom && !processTo) { int order = 0; - for (Iterator j = blah.iterator(key);j.hasNext();) + for (Iterator j = blah.iterator(key); j.hasNext();) { Window window = (Window)j.next(); window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, Integer.toString(order++)); @@ -119,14 +119,14 @@ if (processFrom) { int order = 0; - for (Iterator j = blah.iterator(key);j.hasNext();) + for (Iterator j = blah.iterator(key); j.hasNext();) { Window window = (Window)j.next(); // if (window == target) { - order --; + order--; } else { @@ -137,7 +137,7 @@ if (processTo) { int order = 0; - for (Iterator j = blah.iterator(key);j.hasNext();) + for (Iterator j = blah.iterator(key); j.hasNext();) { Window window = (Window)j.next(); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/action/MoveWindowCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,23 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.mapping; +import org.jboss.portal.common.text.FastURLEncoder; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.model.CustomizationManager; +import org.jboss.portal.core.model.portal.Portal; 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.Portal; -import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.CustomizationManager; -import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.identity.User; import org.jboss.portal.server.servlet.PathMapping; +import org.jboss.portal.server.servlet.PathMappingResult; import org.jboss.portal.server.servlet.PathParser; -import org.jboss.portal.server.servlet.PathMappingResult; -import org.jboss.portal.identity.User; -import org.jboss.portal.common.text.FastURLEncoder; import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class DashboardPortalObjectPathMapper implements PortalObjectPathMapper { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DashboardPortalObjectPathMapper.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,20 +22,20 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.mapping; +import org.jboss.portal.common.text.FastURLEncoder; +import org.jboss.portal.core.controller.ControllerContext; +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.server.servlet.PathMapping; import org.jboss.portal.server.servlet.PathMappingResult; import org.jboss.portal.server.servlet.PathParser; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.common.text.FastURLEncoder; import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class DefaultPortalObjectPathMapper implements PortalObjectPathMapper { @@ -84,6 +84,7 @@ { return container.getContext(namespace != null ? namespace : ""); } + public Object getChild(Object parent, String name) { PortalObject po = (PortalObject)parent; @@ -122,7 +123,7 @@ public void appendPath(StringBuffer buffer, PortalObjectId id) { - for (Iterator i = id.getPath().names();i.hasNext();) + for (Iterator i = id.getPath().names(); i.hasNext();) { String name = (String)i.next(); name = FastURLEncoder.getInstance().encode(name); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/DefaultPortalObjectPathMapper.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/PortalObjectPathMapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/PortalObjectPathMapper.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/PortalObjectPathMapper.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,12 +23,12 @@ package org.jboss.portal.core.model.portal.command.mapping; import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.PortalObject; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalObjectPathMapper { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/mapping/PortalObjectPathMapper.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,29 +25,29 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerException; -import org.jboss.portal.core.controller.SecurityException; import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.NoSuchResourceException; +import org.jboss.portal.core.controller.SecurityException; import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.controller.command.info.ViewCommandInfo; import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.command.PageCommand; +import org.jboss.portal.core.model.portal.command.response.MarkupResponse; import org.jboss.portal.core.model.portal.content.WindowRendition; -import org.jboss.portal.core.model.portal.command.response.MarkupResponse; -import org.jboss.portal.core.model.portal.command.PageCommand; +import org.jboss.portal.core.theme.PageRendition; +import org.jboss.portal.core.theme.WindowContextFactory; import org.jboss.portal.identity.User; import org.jboss.portal.identity.UserProfileModule; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; import org.jboss.portal.theme.LayoutService; -import org.jboss.portal.core.theme.PageRendition; -import org.jboss.portal.core.theme.WindowContextFactory; +import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.theme.PageService; import org.jboss.portal.theme.ThemeService; import org.jboss.portal.theme.page.PageResult; @@ -62,7 +62,7 @@ * Render a full page. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6942 $ + * @version $Revision$ */ public final class RenderPageCommand extends PageCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.render; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.controller.command.info.ViewCommandInfo; import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.control.page.PageControlContext; import org.jboss.portal.core.model.portal.command.WindowCommand; import org.jboss.portal.core.model.portal.content.ContentRenderer; import org.jboss.portal.core.model.portal.content.ContentRendererRegistry; +import org.jboss.portal.core.model.portal.content.WindowRendition; +import org.jboss.portal.core.model.portal.control.page.PageControlContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -59,10 +59,7 @@ return info; } - /** - * Hack the command system. - * - */ + /** Hack the command system. */ public WindowRendition render(ControllerContext ctx) throws ControllerException { ctx.execute(this); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class MarkupResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/MarkupResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/PortletWindowActionResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/PortletWindowActionResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/PortletWindowActionResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.response; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.core.controller.portlet.PortletActionResponse; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; /** * A portlet response related to a portal object window. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletWindowActionResponse extends PortletActionResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/PortletWindowActionResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdatePageResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdatePageResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdatePageResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.response; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.controller.ControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class UpdatePageResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdatePageResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,12 +22,12 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.response; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.controller.ControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class UpdateWindowResponse extends ControllerResponse { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/response/UpdateWindowResponse.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewContextCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewContextCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewContextCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,20 +22,20 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.view; +import org.jboss.portal.core.controller.ControllerException; +import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.controller.command.info.ViewCommandInfo; +import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.Portal; +import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.command.ContextCommand; import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; -import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Portal; -import org.jboss.portal.core.model.portal.Page; -import org.jboss.portal.core.controller.command.info.CommandInfo; -import org.jboss.portal.core.controller.command.info.ViewCommandInfo; -import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.identity.User; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ViewContextCommand extends ContextCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewContextCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.view; +import org.jboss.portal.core.controller.ControllerException; +import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.command.info.CommandInfo; +import org.jboss.portal.core.controller.command.info.ViewCommandInfo; +import org.jboss.portal.core.model.portal.Page; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.command.PageCommand; import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; -import org.jboss.portal.core.model.portal.command.PageCommand; -import org.jboss.portal.core.controller.command.info.CommandInfo; -import org.jboss.portal.core.controller.command.info.ViewCommandInfo; -import org.jboss.portal.core.controller.ControllerException; -import org.jboss.portal.core.controller.ControllerResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ViewPageCommand extends PageCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPortalCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPortalCommand.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPortalCommand.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -27,14 +27,14 @@ import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.controller.command.info.ViewCommandInfo; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.command.PortalCommand; import org.jboss.portal.core.model.portal.command.response.UpdatePageResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ViewPortalCommand extends PortalCommand { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPortalCommand.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,11 +23,10 @@ package org.jboss.portal.core.model.portal.content; import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand; -import org.jboss.portal.core.model.portal.content.WindowRendition; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentRenderer { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererRegistry.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererRegistry.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,19 +28,15 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface ContentRendererRegistry { - /** - * - * @return - */ + /** @return */ Collection getContentTypes(); /** - * * @param contentType * @return */ Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererRegistry.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/WindowRendition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/WindowRendition.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/WindowRendition.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.content; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; +import java.util.List; import java.util.Map; -import java.util.List; /** * Aggregates window specific data and a controller response. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class WindowRendition { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/WindowRendition.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlConstants.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlConstants.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ * Defines the constant for the control framework. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ControlConstants { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlConstants.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,9 +28,9 @@ * Base class for the control context provided to a control policy. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ -public class ControlContext +public class ControlContext { /** We expose the controller context. */ Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/ControlContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/DefaultPageControlPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/DefaultPageControlPolicy.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/DefaultPageControlPolicy.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,25 +23,25 @@ package org.jboss.portal.core.model.portal.control.page; import org.jboss.logging.Logger; -import org.jboss.portal.server.config.ServerConfig; -import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerRequestDispatcher; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.controller.command.response.ErrorResponse; import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; +import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.portal.command.response.MarkupResponse; import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.core.model.portal.control.ControlConstants; -import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.server.config.ServerConfig; import java.util.Collections; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class DefaultPageControlPolicy implements PageControlPolicy { @@ -95,7 +95,7 @@ ControllerResponse response = rendition.getControllerResponse(); // - String policyKey = null; + String policyKey = null; Throwable cause = null; String message = null; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/DefaultPageControlPolicy.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.control.page; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.model.portal.PortalObjectId; +import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.core.model.portal.control.ControlContext; -import org.jboss.portal.core.model.portal.content.WindowRendition; -import org.jboss.portal.core.controller.ControllerContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PageControlContext extends ControlContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlPolicy.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlPolicy.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ * Policy that controls the behavior of a portal window. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PageControlPolicy { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/page/PageControlPolicy.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,34 +22,34 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.control.portal; -import org.jboss.portal.core.model.portal.control.ControlConstants; -import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; -import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; -import org.jboss.portal.core.controller.command.response.ErrorResponse; -import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.logging.Logger; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerRequestDispatcher; +import org.jboss.portal.core.controller.ControllerResponse; +import org.jboss.portal.core.controller.command.response.ErrorResponse; +import org.jboss.portal.core.controller.command.response.SecurityErrorResponse; +import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse; +import org.jboss.portal.core.model.portal.PortalObject; +import org.jboss.portal.core.model.portal.PortalObjectContainer; +import org.jboss.portal.core.model.portal.control.ControlConstants; import org.jboss.portal.core.theme.PageRendition; +import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PageService; -import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.ThemeConstants; import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.page.WindowContext; import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.page.WindowContext; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import java.util.Collections; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class DefaultPortalControlPolicy implements PortalControlPolicy { @@ -88,7 +88,7 @@ ControllerResponse response = controlContext.getResponse(); // - String policyKey = null; + String policyKey = null; Throwable cause = null; String message = null; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/DefaultPortalControlPolicy.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,21 +22,21 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.control.portal; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.control.ControlContext; -import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.ControllerContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalControlContext extends ControlContext { /** The active portal id. */ private PortalObjectId portalId; - + /** The controller response. */ private ControllerResponse response; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlPolicy.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlPolicy.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlPolicy.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface PortalControlPolicy { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/control/portal/PortalControlPolicy.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.metadata; -import org.jboss.portal.core.model.portal.PortalObjectContainer; import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.handler.ContentHandler; +import org.jboss.portal.core.model.portal.PortalObjectContainer; /** * Defines the callbacks for creating a portal object. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface BuildContext { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/BuildContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContentMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContentMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContentMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ContentMetaData { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContentMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.metadata; +import org.jboss.portal.common.xml.XMLTools; +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectContainer; -import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; -import org.jboss.portal.common.xml.XMLTools; import org.w3c.dom.Element; import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ContextMetaData extends PortalObjectMetaData { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,11 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.metadata; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - import org.jboss.logging.Logger; import org.jboss.portal.WindowState; import org.jboss.portal.common.xml.XMLTools; @@ -35,6 +30,11 @@ import org.jboss.portal.core.model.portal.PortalObject; import org.w3c.dom.Element; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thoams Heute</a> @@ -43,7 +43,7 @@ public class PageMetaData extends PortalObjectMetaData { private static final Logger logger = Logger.getLogger(PageMetaData.class); - + public PageMetaData() { } @@ -82,7 +82,7 @@ e.printStackTrace(); } } - + // Log errors if any checkConstraints(pageMD); @@ -105,7 +105,7 @@ // return pageMD; } - + private static boolean checkConstraints(PageMetaData pageMD) { // Check that no more than 1 window has been defined as maximized @@ -116,7 +116,7 @@ Iterator it = values.iterator(); while (it.hasNext()) { - PortalObjectMetaData poMetaData =(PortalObjectMetaData)it.next(); + PortalObjectMetaData poMetaData = (PortalObjectMetaData)it.next(); if (poMetaData instanceof WindowMetaData) { WindowMetaData windowMetaData = (WindowMetaData)poMetaData; @@ -142,7 +142,7 @@ windowsList.append(windowMD.toString() + "\n"); } logger.error("More than one window is defined as maximized for page '" + pageMD.getName() + "'. The following windows" + - " have been defined as maximized:\n" + windowsList); + " have been defined as maximized:\n" + windowsList); return false; } return true; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,10 +25,10 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.xml.XMLTools; +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalContainer; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObject; -import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.portlet.impl.jsr168.metadata.ModesMetaData; import org.jboss.portal.portlet.impl.jsr168.metadata.WindowStatesMetaData; import org.w3c.dom.Element; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -28,8 +28,8 @@ import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectContainer; +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.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,14 +24,14 @@ import org.jboss.logging.Logger; import org.jboss.portal.WindowState; +import org.jboss.portal.common.xml.XMLTools; import org.jboss.portal.core.impl.model.portal.WindowImpl; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; 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.content.ContentType; -import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; import org.jboss.portal.theme.ThemeConstants; -import org.jboss.portal.common.xml.XMLTools; import org.w3c.dom.Element; /** @@ -40,9 +40,9 @@ */ public class WindowMetaData extends PortalObjectMetaData { - + private static final Logger logger = Logger.getLogger(WindowMetaData.class); - + /** The window region. */ protected String region; @@ -100,12 +100,12 @@ { this.contentType = contentType; } - + public String getInitialWindowState() { return initialWindowState; } - + public void setInitialWindowState(String initialWindowState) { this.initialWindowState = initialWindowState; @@ -115,7 +115,7 @@ { return initialMode; } - + public void setInitialMode(String initialMode) { this.initialMode = initialMode; @@ -142,7 +142,7 @@ { window.setDeclaredProperty(WindowImpl.PORTAL_INITIAL_MODE, "" + initialMode); } - + // return window; } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,24 +24,24 @@ import org.jboss.logging.Logger; import org.jboss.portal.WindowState; +import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.core.navstate.NavigationalStateContext; import org.jboss.portal.core.navstate.NavigationalStateKey; import org.jboss.portal.core.navstate.NavigationalStateObjectChange; -import org.jboss.portal.common.invocation.AttributeResolver; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Set; -import java.util.LinkedHashMap; -import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectNavigationalStateContext implements NavigationalStateContext { - /** .*/ + /** . */ private Logger logger = Logger.getLogger(PortalObjectNavigationalStateContext.class); - + /** . */ private static final String VIEW_ID_KEY = "view_id"; @@ -71,7 +71,7 @@ NavigationalStateObjectChange change = (NavigationalStateObjectChange)changes.get(nsKey); if (change != null) { - switch(change.getType()) + switch (change.getType()) { case NavigationalStateObjectChange.CREATE: case NavigationalStateObjectChange.UPDATE: @@ -110,7 +110,7 @@ changes.remove(wantedKey); // - switch(change.getType()) + switch (change.getType()) { case NavigationalStateObjectChange.CREATE: case NavigationalStateObjectChange.UPDATE: @@ -182,7 +182,7 @@ if (changes != null && changes.size() > 0) { Object maximizedKey = null; - for (Iterator i = changes.values().iterator();i.hasNext();) + for (Iterator i = changes.values().iterator(); i.hasNext();) { NavigationalStateObjectChange change = (NavigationalStateObjectChange)i.next(); if (change.getNewValue() instanceof WindowNavigationalState) @@ -212,17 +212,17 @@ Object object = store.getAttribute(key); if (object instanceof WindowNavigationalState) { - WindowNavigationalState wns = (WindowNavigationalState) object; + WindowNavigationalState wns = (WindowNavigationalState)object; if (!key.equals(maximizedKey) && wns.getWindowState().equals(WindowState.MAXIMIZED)) { WindowNavigationalState wns2 = new WindowNavigationalState(WindowState.NORMAL, wns.getMode(), wns - .getContentState()); + .getContentState()); store.setAttribute(key, wns2); } } } } - + // changes.clear(); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.navstate; +import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.navstate.NavigationalStateKey; @@ -33,7 +33,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public final class WindowNavigationalState implements Serializable { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/PortalContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/PortalContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/PortalContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.portlet; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.portlet.spi.PortalContext; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.server.PortalConstants; import java.util.Map; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/PortalContextImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/WindowContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/WindowContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/WindowContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.portlet; +import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.portlet.spi.WindowContext; -import org.jboss.portal.core.model.portal.Window; -import org.jboss.portal.core.model.portal.PortalObjectPath; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/portlet/WindowContextImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/AbstractModule.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/MailModule.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/modules/ModuleException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateChange.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateChange.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateChange.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ * Base navigational state change. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public abstract class NavigationalStateChange { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateChange.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateContext.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateContext.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface NavigationalStateContext extends AttributeResolver { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateContext.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateKey.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateKey.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateKey.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.core.navstate; +import java.io.Externalizable; import java.io.Serializable; -import java.io.Externalizable; /** * A key for navigational state. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public final class NavigationalStateKey implements Serializable { @@ -44,8 +44,9 @@ * Construct a new navigational state key. * * @param type the type of state - * @param id the id - * @throws IllegalArgumentException if any argument is null or the id argument does not implement either Serializable or Externalizable + * @param id the id + * @throws IllegalArgumentException if any argument is null or the id argument does not implement either Serializable + * or Externalizable */ public NavigationalStateKey(Class type, Object id) { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateKey.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateObjectChange.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateObjectChange.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateObjectChange.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,12 +23,12 @@ package org.jboss.portal.core.navstate; /** - * The change of the navigational state of a single object. If both old and new values are not null, it denotes - * an update. Whenever the old value is null, a creation occured and conversely if the new value is null, a - * destruction occured. + * The change of the navigational state of a single object. If both old and new values are not null, it denotes an + * update. Whenever the old value is null, a creation occured and conversely if the new value is null, a destruction + * occured. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class NavigationalStateObjectChange extends NavigationalStateChange { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/navstate/NavigationalStateObjectChange.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/AjaxInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/AjaxInfo.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/AjaxInfo.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface AjaxInfo { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/AjaxInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,27 +26,18 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface CorePortletInfo { - /** - * - * @return - */ + /** @return */ Transactions.Type getTxType(); - /** - * - * @return - */ + /** @return */ AjaxInfo getAjax(); - /** - * - * @return - */ + /** @return */ MarkupHeaderInfo getMarkupHeader(); - + PortletInfoInfo getPortletInfo(); } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/MarkupHeaderInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/MarkupHeaderInfo.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/MarkupHeaderInfo.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public interface MarkupHeaderInfo { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/MarkupHeaderInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -30,7 +30,7 @@ { /** . */ public static final String SMALL = "small"; - + /** . */ public static final String LARGE = "large"; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletIconInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/portlet/info/PortletInfoInfo.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -66,7 +66,7 @@ * HttpJspPage implementation * * @see javax.servlet.jsp.HttpJspPage#_jspService(javax.servlet.http.HttpServletRequest, - *javax.servlet.http.HttpServletResponse) + * javax.servlet.http.HttpServletResponse) */ abstract public void _jspService(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException; @@ -170,9 +170,7 @@ jspDestroy(); } - /** - * For Jasper which seems to want a log method in the generated JSP. - */ + /** For Jasper which seems to want a log method in the generated JSP. */ protected final void log(String msg) { logger.debug(msg); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -131,15 +131,15 @@ return ""; } } - + private static String convert(String toto) { - if (toto != null) - { - toto = toto.replaceAll("<", "&lt;"); - toto = toto.replaceAll(">", "&gt;"); - } - return toto; + if (toto != null) + { + toto = toto.replaceAll("<", "&lt;"); + toto = toto.replaceAll(">", "&gt;"); + } + return toto; } - + } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/AbstractContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/BuildException.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/ChildrenStrategy.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/PageRendition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/PageRendition.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.core.theme; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.core.controller.ControllerResponse; import org.jboss.portal.theme.PageService; -import org.jboss.portal.theme.render.RendererContext; -import org.jboss.portal.theme.render.RenderException; -import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.theme.PortalLayout; import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.theme.page.PageResult; -import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.theme.render.RenderException; +import org.jboss.portal.theme.render.RendererContext; +import org.jboss.portal.theme.render.ThemeContext; import org.jboss.portal.web.ServletContextDispatcher; -import org.jboss.portal.core.controller.ControllerResponse; import javax.servlet.ServletException; import java.io.IOException; @@ -40,7 +40,7 @@ * Should not be a controller response, but it comes from legacy design. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PageRendition extends ControllerResponse { @@ -80,9 +80,8 @@ dispatcher.getResponse().setContentType(contentType); dispatcher.getResponse().setCharacterEncoding(markupInfo.getCharset()); - // - ThemeContext themeContext = new ThemeContext(theme, pageService.getThemeService()); + ThemeContext themeContext = new ThemeContext(theme, pageService.getThemeService()); // RendererContext rendererContext = layout.getRenderContext(themeContext, markupInfo, dispatcher); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/PageRendition.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,31 +22,31 @@ ******************************************************************************/ package org.jboss.portal.core.theme; -import org.jboss.portal.theme.page.WindowContext; -import org.jboss.portal.theme.page.WindowResult; -import org.jboss.portal.theme.render.renderer.ActionRendererContext; -import org.jboss.portal.theme.ThemeConstants; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.core.controller.ControllerContext; +import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.command.action.InvokePortletWindowRenderCommand; import org.jboss.portal.core.model.portal.command.response.MarkupResponse; -import org.jboss.portal.core.model.portal.PortalObjectPath; -import org.jboss.portal.core.model.portal.Window; import org.jboss.portal.core.model.portal.content.WindowRendition; -import org.jboss.portal.core.controller.ControllerContext; -import org.jboss.portal.WindowState; -import org.jboss.portal.Mode; import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portal.server.request.URLContext; import org.jboss.portal.server.request.URLFormat; +import org.jboss.portal.theme.ThemeConstants; +import org.jboss.portal.theme.page.WindowContext; +import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.render.renderer.ActionRendererContext; -import java.util.Map; -import java.util.List; import java.util.ArrayList; +import java.util.HashMap; import java.util.Iterator; -import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class WindowContextFactory { @@ -74,13 +74,13 @@ // WindowResult windowResult = new WindowResult( - markup.getTitle(), - markup.getContent(), - actionMap, - context.getProperties(), - markup.getHeaderContent(), - context.getWindowState(), - context.getMode()); + markup.getTitle(), + markup.getContent(), + actionMap, + context.getProperties(), + markup.getHeaderContent(), + context.getWindowState(), + context.getMode()); // return new WindowContext( Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/theme/WindowContextFactory.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,35 +22,35 @@ ******************************************************************************/ package org.jboss.portal.core.ui.content.portlet; -import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.Mode; import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.Mode; +import org.jboss.portal.portlet.info.PortletInfo; -import javax.portlet.GenericPortlet; -import javax.portlet.PortletMode; -import javax.portlet.PortletException; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletMode; +import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletSecurityException; +import javax.portlet.PortletURL; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import javax.portlet.PortletURL; -import javax.portlet.PortletRequestDispatcher; import java.io.IOException; import java.io.PrintWriter; -import java.util.List; -import java.util.Comparator; +import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; -import java.util.ArrayList; +import java.util.List; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortletContentEditorPortlet extends GenericPortlet { @@ -114,7 +114,7 @@ // Remove content editors List available_instances = new ArrayList(); nextInstance: - for (Iterator i = instanceContainer.getDefinitions().iterator();i.hasNext();) + for (Iterator i = instanceContainer.getDefinitions().iterator(); i.hasNext();) { Instance instance = (Instance)i.next(); @@ -124,7 +124,7 @@ // Filter portlets that are editors Portlet portlet = instance.getPortlet(); PortletInfo info = portlet.getInfo(); - for (Iterator j = info.getCapabilities().getAllModes().iterator();j.hasNext();) + for (Iterator j = info.getCapabilities().getAllModes().iterator(); j.hasNext();) { ModeInfo modeInfo = (ModeInfo)j.next(); if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT)) @@ -176,7 +176,6 @@ // writer.close(); } - - - + + } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/PortletHelper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/PortletHelper.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/PortletHelper.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -31,7 +31,7 @@ import java.util.Locale; import java.util.ResourceBundle; -/** @author <a href=&quot;theute(a)jboss.org&quot;&gt;Thomas Heute </a> $Revision: 5448 $ */ +/** @author <a href=&quot;theute(a)jboss.org&quot;&gt;Thomas Heute </a> $Revision$ */ public class PortletHelper { private Logger log = Logger.getLogger(PortalJsp.class); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/PortletHelper.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/catalog/CatalogPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/catalog/CatalogPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/catalog/CatalogPortlet.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -43,7 +43,7 @@ /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 7134 $ + * @version $Revision$ */ public class CatalogPortlet extends JBossPortlet @@ -52,12 +52,12 @@ private static final String RESOURCE_PREFIX = "PAGENAME_"; private PortalAuthorizationManagerFactory portalAuthorizationManagerFactory; - + public void init() throws PortletException { - portalAuthorizationManagerFactory = (PortalAuthorizationManagerFactory) getPortletContext().getAttribute("PortalAuthorizationManagerFactory"); + portalAuthorizationManagerFactory = (PortalAuthorizationManagerFactory)getPortletContext().getAttribute("PortalAuthorizationManagerFactory"); - if(portalAuthorizationManagerFactory == null) + if (portalAuthorizationManagerFactory == null) { throw new PortletException("No portal authorization manager factory"); } @@ -95,7 +95,7 @@ // { resp.setTitle("Pages"); PortalNode parent = current.getParent(); - + HashMap parentsMap = new HashMap(); PortalNode node = parent.getParent(); while (node.getType() != PortalNode.TYPE_PORTAL) @@ -104,7 +104,7 @@ node = node.getParent(); } req.setAttribute("parents", parentsMap); - + try { req.setAttribute("parentNode", localize(req.getLocale(), parent.getName())); @@ -185,7 +185,7 @@ } // } } - + private String localize(Locale locale, String name) { try Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/catalog/CatalogPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/role/RolePortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/role/RolePortlet.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/role/RolePortlet.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,16 +23,16 @@ package org.jboss.portal.core.ui.portlet.role; import org.jboss.logging.Logger; +import org.jboss.portal.core.servlet.jsp.PortalJsp; +import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext; import org.jboss.portal.core.ui.portlet.PortletHelper; import org.jboss.portal.core.ui.portlet.user.UserPortletConstants; -import org.jboss.portal.core.servlet.jsp.PortalJsp; -import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext; import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.identity.Role; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.identity.User; import org.jboss.portal.identity.UserModule; -import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.identity.UserProfileModule; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; @@ -48,13 +48,13 @@ import javax.portlet.WindowStateException; import java.io.IOException; import java.io.PrintWriter; +import java.util.Arrays; +import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Locale; import java.util.ResourceBundle; import java.util.Set; -import java.util.HashSet; -import java.util.Arrays; -import java.util.List; /** * This portlet aims at managing roles of users. @@ -63,7 +63,7 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute </a> * @author Roy Russo : roy at jboss dot org - * @version $Revision: 7343 $ + * @version $Revision$ */ public class RolePortlet extends JBossPortlet @@ -696,8 +696,8 @@ response.setRenderParameter("selectedRoles", selectedRoles); } - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); return; } @@ -712,8 +712,8 @@ roleNames = (String[])roles.toArray(roleNames); response.setRenderParameter("selectedRoles", roleNames); - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); } else if (request.getParameterMap().keySet().contains("removeRoles")) { @@ -733,11 +733,11 @@ response.setRenderParameter("selectedRoles", selectedRoles); } - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); return; } - + List toRemove = Arrays.asList(rolesToRemove); Set roles = new HashSet(); @@ -760,12 +760,12 @@ response.setRenderParameter("selectedRoles", roleNames); } - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); } else { - + String[] selectedRoles = request.getParameterValues("assignedRoles"); try @@ -774,8 +774,8 @@ Set roles = roleModule.findRolesByNames(selectedRoles); membershipModule.assignRoles(user, roles); - response.setRenderParameter("op", OP_SHOWLISTROLEMEMBERS ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWLISTROLEMEMBERS); + response.setRenderParameter("userid", userId); } catch (IllegalArgumentException e) { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/role/RolePortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,48 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.ui.portlet.user; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; -import java.util.Set; -import java.util.List; -import java.util.Arrays; - -import javax.portlet.PortletException; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletSecurityException; -import javax.portlet.PortletURL; -import javax.portlet.WindowState; -import javax.portlet.WindowStateException; - +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; import org.jboss.logging.Logger; import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; +import org.jboss.portal.common.i18n.LocaleFormat; +import org.jboss.portal.common.i18n.LocaleManager; +import org.jboss.portal.common.net.URLTools; import org.jboss.portal.common.p3p.P3PConstants; +import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.net.URLTools; -import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.common.i18n.LocaleFormat; -import org.jboss.portal.common.i18n.LocaleManager; import org.jboss.portal.core.aspects.controller.node.Navigation; import org.jboss.portal.core.modules.MailModule; -import org.jboss.portal.core.ui.portlet.PortletHelper; import org.jboss.portal.core.servlet.jsp.PortalJsp; import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext; +import org.jboss.portal.core.ui.portlet.PortletHelper; import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.identity.Role; @@ -80,9 +55,32 @@ import org.jboss.portlet.JBossRenderRequest; import org.jboss.portlet.JBossRenderResponse; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletSecurityException; +import javax.portlet.PortletURL; +import javax.portlet.WindowState; +import javax.portlet.WindowStateException; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; /** * This portlet aims at managing users @@ -90,7 +88,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:mageshbk@jboss.com">Magesh Kumar Bojan</a> - * @version $Revision: 7379 $ + * @version $Revision$ */ public class UserPortlet extends JBossPortlet @@ -233,7 +231,7 @@ return; } */ - + if (req.getRemoteUser() != null) { if (req.getWindowState() != WindowState.MAXIMIZED) @@ -314,10 +312,10 @@ // //String selectedLocale = (String)user.getProfile().get(User.INFO_USER_LOCALE); String selectedLocale = (String)getProperty(user, User.INFO_USER_LOCALE); - + ArrayList locales = new ArrayList(LocaleManager.getLocales()); Collections.sort(locales, new LocaleComparator()); - + for (Iterator i = locales.iterator(); i.hasNext();) { Locale locale = (Locale)i.next(); @@ -333,7 +331,7 @@ // //String selectedTheme = (String)user.getProfile().get(User.INFO_USER_THEME); - String selectedTheme = (String)getProperty(user,User.INFO_USER_THEME); + String selectedTheme = (String)getProperty(user, User.INFO_USER_THEME); ThemeService themeService = (ThemeService)getPortletContext().getAttribute("ThemeService"); for (Iterator i = themeService.getThemes().iterator(); i.hasNext();) { @@ -395,7 +393,7 @@ ctx.put("username", user.getUserName()); fillContextWithUserProfile(user, ctx); - + req.setAttribute(PortalJsp.CTX_REQUEST, ctx); resp.setTitle(bundle.getString("REGISTER_PERSONALINFO")); PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/viewProfile.jsp"); @@ -410,7 +408,7 @@ } if (req.getParameter("modifiedProfile") != null) { - ctx.next("modifiedProfile"); + ctx.next("modifiedProfile"); } req.setAttribute(PortalJsp.CTX_REQUEST, ctx); PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/menu.jsp"); @@ -460,7 +458,7 @@ { rowCtx.put("cssClass", "portlet-table-alternate"); } - + // Iterator itRoles = membershipModule.getRoles(user).iterator(); while (itRoles.hasNext()) @@ -539,7 +537,7 @@ ctx.put("usernamefilter", req.getParameter("usernamefilter")); ctx.put("offset", req.getParameter("offset")); ctx.put("usersperpage", req.getParameter("usersperpage")); - + try { User user = userModule.findUserById(req.getParameter("userid")); @@ -554,7 +552,6 @@ Role role = null; - DelegateContext allRolesCtx = null; for (Iterator it = roles.iterator(); it.hasNext();) { @@ -639,7 +636,7 @@ // User is not logged in op = req.getParameters().get(getOperationName(), OP_SHOWLOGIN); - if (req.getWindowState() != WindowState.MAXIMIZED && ! OP_SHOWREGISTER_TY.equals(op) && ! OP_ACTIVATEUSER.equals(op)) + if (req.getWindowState() != WindowState.MAXIMIZED && !OP_SHOWREGISTER_TY.equals(op) && !OP_ACTIVATEUSER.equals(op)) { op = OP_SHOWLOGIN; } @@ -690,7 +687,7 @@ ctx.put("username", user.getUserName()); fillContextWithUserProfile(user, ctx); - + req.setAttribute(PortalJsp.CTX_REQUEST, ctx); PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/viewProfile.jsp"); rd.include(req, resp); @@ -715,7 +712,7 @@ try { user = userModule.findUserById(userId); - String hexCompare = Tools.md5AsHexString(user.getUserName() + getProperty(user,User.INFO_USER_REGISTRATION_DATE).toString() + UserPortletConstants.SALT); + String hexCompare = Tools.md5AsHexString(user.getUserName() + getProperty(user, User.INFO_USER_REGISTRATION_DATE).toString() + UserPortletConstants.SALT); if (hash.equals(hexCompare)) { setProperty(user, User.INFO_USER_ENABLED, Boolean.TRUE); @@ -791,187 +788,190 @@ { // TODO: Check that a bot is not creating many accounts - if (req.getParameter("Cancel") == null) + if (req.getParameter("Cancel") == null) { - int nbErrors = 0; + int nbErrors = 0; - String uname = req.getParameter("uname"); - if ((uname == null) || (uname.length() == 0)) - { - nbErrors++; - resp.setRenderParameter("uname_error", "REGISTER_ERROR_INVALIDUSERNAME"); - } - else - { - try + String uname = req.getParameter("uname"); + if ((uname == null) || (uname.length() == 0)) { - User user = userModule.findUserByUserName(uname); - if (user != null) + nbErrors++; + resp.setRenderParameter("uname_error", "REGISTER_ERROR_INVALIDUSERNAME"); + } + else + { + try { - nbErrors++; - resp.setRenderParameter("uname_error", "REGISTER_ERROR_EXISTINGUSERNAME"); + User user = userModule.findUserByUserName(uname); + if (user != null) + { + nbErrors++; + resp.setRenderParameter("uname_error", "REGISTER_ERROR_EXISTINGUSERNAME"); + } } + catch (IllegalArgumentException e) + { + log.error("", e); + } + catch (IdentityException e) + { + // Ok the user does not exist yet + } } - catch (IllegalArgumentException e) + + String pass1 = req.getParameter("pass1"); + if ((pass1 == null) || (pass1.length() == 0)) { - log.error("", e); + nbErrors++; + resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1"); } - catch (IdentityException e) + + String pass2 = req.getParameter("pass2"); + if ((pass2 == null) || (pass2.length() == 0)) { - // Ok the user does not exist yet + nbErrors++; + resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2"); } - } + else if (!pass1.equals(pass2)) + { + nbErrors++; + resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH"); + } - String pass1 = req.getParameter("pass1"); - if ((pass1 == null) || (pass1.length() == 0)) - { - nbErrors++; - resp.setRenderParameter("pass1_error", "REGISTER_ERROR_INVALIDPASSWORD1"); - } + String realEmail = req.getParameter("realemail"); + if (!URLTools.isEmailValid(realEmail)) + { + nbErrors++; + resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL"); + } - String pass2 = req.getParameter("pass2"); - if ((pass2 == null) || (pass2.length() == 0)) - { - nbErrors++; - resp.setRenderParameter("pass2_error", "REGISTER_ERROR_INVALIDPASSWORD2"); - } - else if (!pass1.equals(pass2)) - { - nbErrors++; - resp.setRenderParameter("pass2_error", "REGISTER_ERROR_PASSWORDMISMATCH"); - } + String fakeEmail = req.getParameter("fakeemail"); + String question = req.getParameter("question"); + String answer = req.getParameter("answer"); + User user; + if (nbErrors == 0) + { + try + { - String realEmail = req.getParameter("realemail"); - if (!URLTools.isEmailValid(realEmail)) - { - nbErrors++; - resp.setRenderParameter("realemail_error", "REGISTER_ERROR_INVALIDREALEMAIL"); - } + user = userModule.createUser(uname, pass1); - String fakeEmail = req.getParameter("fakeemail"); - String question = req.getParameter("question"); - String answer = req.getParameter("answer"); - User user; - if (nbErrors == 0) - { - try - { - - user = userModule.createUser(uname, pass1); - - setProperty(user, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, realEmail); - //user.setFakeEmail(fakeEmail); - setProperty(user,User.INFO_USER_EMAIL_FAKE, fakeEmail); + setProperty(user, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL, realEmail); + //user.setFakeEmail(fakeEmail); + setProperty(user, User.INFO_USER_EMAIL_FAKE, fakeEmail); - //TODO: set registration date + //TODO: set registration date - String type = userProfileModule.getProfileInfo().getPropertyInfo(User.INFO_USER_REGISTRATION_DATE).getType(); - if (type.equals("java.util.Date")) - { - putProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date()); - } - else if (type.equals("java.lang.String")) - { - putProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date().toString()); - } - else - { - log.warn(User.INFO_USER_REGISTRATION_DATE + " property is mapped in not supported type: " + type); - } + String type = userProfileModule.getProfileInfo().getPropertyInfo(User.INFO_USER_REGISTRATION_DATE).getType(); + if (type.equals("java.util.Date")) + { + putProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date()); + } + else if (type.equals("java.lang.String")) + { + putProperty(user, User.INFO_USER_REGISTRATION_DATE, new Date().toString()); + } + else + { + log.warn(User.INFO_USER_REGISTRATION_DATE + " property is mapped in not supported type: " + type); + } - String subscriptionMode = getPortletConfig().getInitParameter(UserPortletConstants.SUBSCRIPTIONMODE); - if (subscriptionMode == null) - { - subscriptionMode = UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC; - } + String subscriptionMode = getPortletConfig().getInitParameter(UserPortletConstants.SUBSCRIPTIONMODE); + if (subscriptionMode == null) + { + subscriptionMode = UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC; + } - setProperty(user, User.INFO_USER_LOCALE, req.getLocale().toString()); - - if (UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC.equals(subscriptionMode) || req.isUserInRole("Admin")) - { - setProperty(user, User.INFO_USER_ENABLED, Boolean.TRUE); - } - else if (UserPortletConstants.SUBSCRIPTIONMODE_EMAILVERIFICATION.equals(subscriptionMode)) - { - setProperty(user, User.INFO_USER_ENABLED, Boolean.FALSE); - String emailText = generateValidationEmail(req, resp, user, pass1); - String from = getPortletConfig().getInitParameter(UserPortletConstants.EMAILFROM); - Locale locale = req.getLocale(); - ResourceBundle bundle = getResourceBundle(locale); - String subject = bundle.getString("REGISTER_CONFIRMATIONEMAIL"); - mailModule.send(from, (String)getProperty(user,P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL), subject, emailText); - } + setProperty(user, User.INFO_USER_LOCALE, req.getLocale().toString()); - /* - * Have to define the link to /login Have to redirect after the - * login try { resp.sendRedirect("/portal/login?username=" + uname + - * "&password=" + pass1); } catch (IOException e1) { // TODO - * Auto-generated catch block e1.printStackTrace(); } - */ + if (UserPortletConstants.SUBSCRIPTIONMODE_AUTOMATIC.equals(subscriptionMode) || req.isUserInRole("Admin")) + { + setProperty(user, User.INFO_USER_ENABLED, Boolean.TRUE); + } + else if (UserPortletConstants.SUBSCRIPTIONMODE_EMAILVERIFICATION.equals(subscriptionMode)) + { + setProperty(user, User.INFO_USER_ENABLED, Boolean.FALSE); + String emailText = generateValidationEmail(req, resp, user, pass1); + String from = getPortletConfig().getInitParameter(UserPortletConstants.EMAILFROM); + Locale locale = req.getLocale(); + ResourceBundle bundle = getResourceBundle(locale); + String subject = bundle.getString("REGISTER_CONFIRMATIONEMAIL"); + mailModule.send(from, (String)getProperty(user, P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL), subject, emailText); + } - // Add the user to the default user role - String defaultRole = getPortletConfig().getInitParameter(UserPortletConstants.DEFAULT_ROLE); - if (defaultRole != null) - { - Set roleSet = new HashSet(); - Role role = roleModule.findRoleByName(defaultRole); - if (role != null) + /* + * Have to define the link to /login Have to redirect after the + * login try { resp.sendRedirect("/portal/login?username=" + uname + + * "&password=" + pass1); } catch (IOException e1) { // TODO + * Auto-generated catch block e1.printStackTrace(); } + */ + + // Add the user to the default user role + String defaultRole = getPortletConfig().getInitParameter(UserPortletConstants.DEFAULT_ROLE); + if (defaultRole != null) { - roleSet.add(role); - membershipModule.assignRoles(user, roleSet); + Set roleSet = new HashSet(); + Role role = roleModule.findRoleByName(defaultRole); + if (role != null) + { + roleSet.add(role); + membershipModule.assignRoles(user, roleSet); + } + else + { + log.error("The role you specified as default role does not exist, check your portlet configuration"); + } } else { - log.error("The role you specified as default role does not exist, check your portlet configuration"); + log.info("You didn't specify a default role in the portlet init configuration, please refer to the documentation"); } + //resp.setRenderParameter("op", OP_SHOWREGISTER_TY); + if (req.getParameters().get("lastView", OP_SHOWMENU).equals(OP_SHOWLISTUSERS)) + { + resp.setWindowState(WindowState.MAXIMIZED); + } + else + { + resp.setWindowState(WindowState.NORMAL); + } } - else + catch (IllegalArgumentException e) { - log.info("You didn't specify a default role in the portlet init configuration, please refer to the documentation"); + log.error("Cannot create user " + uname, e); } - //resp.setRenderParameter("op", OP_SHOWREGISTER_TY); - if (req.getParameters().get("lastView",OP_SHOWMENU).equals(OP_SHOWLISTUSERS)) + catch (IdentityException e) { - resp.setWindowState(WindowState.MAXIMIZED); + log.error("Cannot create user " + uname, e); } - else + catch (WindowStateException e) { - resp.setWindowState(WindowState.NORMAL); + log.error("Normal window state not supported..."); } } - catch (IllegalArgumentException e) + else { - log.error("Cannot create user " + uname, e); + portletHelper.setRenderParameter(resp, "USERNAME", uname); + portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail); + portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail); + portletHelper.setRenderParameter(resp, "QUESTION", question); + portletHelper.setRenderParameter(resp, "ANSWER", answer); + portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWREGISTER); } - catch (IdentityException e) + } + else + { + resp.setRenderParameter("op", req.getParameters().get("lastView", OP_SHOWMENU)); + try { - log.error("Cannot create user " + uname, e); + resp.setWindowState(WindowState.NORMAL); } catch (WindowStateException e) { - log.error("Normal window state not supported..."); + // TODO Auto-generated catch block + e.printStackTrace(); } } - else - { - portletHelper.setRenderParameter(resp, "USERNAME", uname); - portletHelper.setRenderParameter(resp, "REALEMAIL", realEmail); - portletHelper.setRenderParameter(resp, "FAKEEMAIL", fakeEmail); - portletHelper.setRenderParameter(resp, "QUESTION", question); - portletHelper.setRenderParameter(resp, "ANSWER", answer); - portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWREGISTER); - } - } - else - { - resp.setRenderParameter("op", req.getParameters().get("lastView",OP_SHOWMENU)); - try { - resp.setWindowState(WindowState.NORMAL); - } catch (WindowStateException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } } private void fillContextWithUserProfile(User user, DelegateContext ctx) @@ -982,20 +982,20 @@ ctx.put("FAKEEMAIL", (String)getProperty(user, User.INFO_USER_EMAIL_FAKE)); ctx.put("THEME", (String)getProperty(user, User.INFO_USER_THEME)); ctx.put("VIEWREALEMAIL", (getProperty(user, User.INFO_USER_VIEW_EMAIL_VIEW_REAL)).equals("true") ? "checked=\"checked\"" : ""); - ctx.put("HOMEPAGE", (String)getProperty(user,User.INFO_USER_HOMEPAGE)); - ctx.put("ICQ", (String)getProperty(user,User.INFO_USER_IM_ICQ)); - ctx.put("AIM", (String)getProperty(user,User.INFO_USER_IM_AIM)); - ctx.put("YIM", (String)getProperty(user,User.INFO_USER_IM_YIM)); - ctx.put("MSNM", (String)getProperty(user,User.INFO_USER_IM_MSNM)); - ctx.put("SKYPE", (String)getProperty(user,User.INFO_USER_IM_SKYPE)); - ctx.put("XMMP", (String)getProperty(user,User.INFO_USER_IM_XMMP)); - ctx.put("SIGNATURE", (String)getProperty(user,User.INFO_USER_SIGNATURE)); - ctx.put("LOCATION", (String)getProperty(user,User.INFO_USER_LOCATION)); - ctx.put("OCCUPATION", (String)getProperty(user,User.INFO_USER_OCCUPATION)); - ctx.put("INTERESTS", (String)getProperty(user,User.INFO_USER_INTERESTS)); - ctx.put("EXTRA", (String)getProperty(user,User.INFO_USER_EXTRA)); - ctx.put("QUESTION", (String)getProperty(user,User.INFO_USER_SECURITY_QUESTION)); - ctx.put("ANSWER", (String)getProperty(user,User.INFO_USER_SECURITY_ANSWER)); + ctx.put("HOMEPAGE", (String)getProperty(user, User.INFO_USER_HOMEPAGE)); + ctx.put("ICQ", (String)getProperty(user, User.INFO_USER_IM_ICQ)); + ctx.put("AIM", (String)getProperty(user, User.INFO_USER_IM_AIM)); + ctx.put("YIM", (String)getProperty(user, User.INFO_USER_IM_YIM)); + ctx.put("MSNM", (String)getProperty(user, User.INFO_USER_IM_MSNM)); + ctx.put("SKYPE", (String)getProperty(user, User.INFO_USER_IM_SKYPE)); + ctx.put("XMMP", (String)getProperty(user, User.INFO_USER_IM_XMMP)); + ctx.put("SIGNATURE", (String)getProperty(user, User.INFO_USER_SIGNATURE)); + ctx.put("LOCATION", (String)getProperty(user, User.INFO_USER_LOCATION)); + ctx.put("OCCUPATION", (String)getProperty(user, User.INFO_USER_OCCUPATION)); + ctx.put("INTERESTS", (String)getProperty(user, User.INFO_USER_INTERESTS)); + ctx.put("EXTRA", (String)getProperty(user, User.INFO_USER_EXTRA)); + ctx.put("QUESTION", (String)getProperty(user, User.INFO_USER_SECURITY_QUESTION)); + ctx.put("ANSWER", (String)getProperty(user, User.INFO_USER_SECURITY_ANSWER)); } /** @@ -1199,7 +1199,7 @@ portletHelper.setRenderParameter(resp, "EXTRA", extra); portletHelper.setRenderParameter(resp, getOperationName(), OP_SHOWPROFILE); } - + } /** @@ -1235,8 +1235,8 @@ response.setRenderParameter("selectedRoles", selectedRoles); } - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); return; } @@ -1251,8 +1251,8 @@ roleNames = (String[])roles.toArray(roleNames); response.setRenderParameter("selectedRoles", roleNames); - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); } else if (request.getParameterMap().keySet().contains("removeRoles")) { @@ -1272,8 +1272,8 @@ response.setRenderParameter("selectedRoles", selectedRoles); } - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); return; } @@ -1299,8 +1299,8 @@ response.setRenderParameter("selectedRoles", roleNames); } - response.setRenderParameter("op", OP_SHOWADDROLESTOUSER ); - response.setRenderParameter("userid", userId); + response.setRenderParameter("op", OP_SHOWADDROLESTOUSER); + response.setRenderParameter("userid", userId); } else { @@ -1347,9 +1347,9 @@ { // gen link using username, encrypted pw, and a salt. String hash = Tools.md5AsHexString(user.getUserName() + getProperty(user, User.INFO_USER_REGISTRATION_DATE).toString() + UserPortletConstants.SALT); - + PortalNode node = req.getPortalNode(); - + //PortalNodeURL link = resp.createActionURL(node); PortalNodeURL link = resp.createRenderURL(node); link.setParameter("op", OP_ACTIVATEUSER); @@ -1364,13 +1364,13 @@ modelRoot.put("username", user.getUserName()); modelRoot.put("password", clearPassword); modelRoot.put("activationLink", link); - + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); String message = null; try { Locale locale = req.getLocale(); - URL config = tcl.getResource("templates/user/emailTemplate_" + locale.getLanguage() + "_" + locale.getCountry()+ ".tpl"); + URL config = tcl.getResource("templates/user/emailTemplate_" + locale.getLanguage() + "_" + locale.getCountry() + ".tpl"); if (config == null) { config = tcl.getResource("templates/user/emailTemplate_" + locale.getLanguage() + ".tpl"); @@ -1570,9 +1570,9 @@ } return compare; } - + } - + /* * private String getTimezoneOffsetString(short timezoneOffset) { * StringBuffer timeZone = new StringBuffer(); for (int i = 0; i < Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortletConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortletConstants.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortletConstants.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.ui.portlet.user; -/** @author <a href=&quot;theute(a)jboss.org&quot;&gt;Thomas Heute</a> $Revision: 5448 $ */ +/** @author <a href=&quot;theute(a)jboss.org&quot;&gt;Thomas Heute</a> $Revision$ */ public class UserPortletConstants { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortletConstants.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/util/ProxyValidator.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -26,10 +26,8 @@ import org.jboss.portal.core.servlet.jsp.PortalJsp; import org.jboss.portal.core.servlet.jsp.taglib.PortalLib; import org.jboss.portal.portlet.impl.jsr168.PortletResourceBundleFactory; -import org.jboss.portal.portlet.impl.jsr168.api.PortletConfigImpl; import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData; -import javax.portlet.PortletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/OutELTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PageTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/Utils.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -132,9 +132,9 @@ assertEquals("screen", link.getMediaAttribute()); assertEquals("test.css", link.getHrefAttribute()); assertEquals("foo", link.getTitleAttribute()); - + } - + public void testPortletInfoMetadata() throws Exception { URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml"); @@ -156,7 +156,7 @@ JBossPortletMetaData portlet = (JBossPortletMetaData)app.getPortlets().get("Portlet4"); assertNotNull(portlet); assertEquals("Portlet4", portlet.getName()); - + PortletInfoMetaData portletInfo = (PortletInfoMetaData)portlet.getPortletInfo(); System.out.println(">>>" + portletInfo.getPortletIcon()); assertEquals("/tmp/toto.png", portletInfo.getPortletIcon().getIconLocation(PortletIconMetaData.SMALL)); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,17 +23,7 @@ package org.jboss.portal.test.core.deployment; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; - -import javax.xml.parsers.DocumentBuilder; - import junit.framework.TestCase; - import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.net.URLTools; @@ -46,11 +36,18 @@ import org.w3c.dom.Element; import org.xml.sax.EntityResolver; +import javax.xml.parsers.DocumentBuilder; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; + public class PortletInstancesMetaDataFactoryTestCase extends TestCase { - public void testLocalizedDisplayNameMetadata() throws Exception { // Get instances from portlet-instances.xml @@ -64,14 +61,12 @@ in = Thread.currentThread().getContextClassLoader().getResourceAsStream("test/deployment/portlet-instances.xml"); // in = IOTools.safeBufferedWrapper(in); - - assertNotNull(in); - + PortletAppDeploymentFactory factory = new PortletAppDeploymentFactory(); - + if (in != null) { DocumentBuilder builder = XMLTools.getDocumentBuilderFactory().newDocumentBuilder(); @@ -104,20 +99,20 @@ } assertEquals(4, instancesMetadata.size()); - - InstanceMetaData instanceMD = (InstanceMetaData) instancesMetadata.get(0); + + InstanceMetaData instanceMD = (InstanceMetaData)instancesMetadata.get(0); assertEquals("UserPortletInstance", instanceMD.getId()); LocalizedString lString = Utils.getLocalizedDescription(instanceMD.getDisplayName()); assertEquals("Mon instance de User portlet", lString.getString(Locale.FRENCH, false)); assertEquals("My User portlet instance", lString.getString(Locale.ENGLISH, false)); assertEquals("My User portlet instance", lString.getDefaultString()); - instanceMD = (InstanceMetaData) instancesMetadata.get(1); + instanceMD = (InstanceMetaData)instancesMetadata.get(1); assertEquals("RolePortletInstance", instanceMD.getId()); - instanceMD = (InstanceMetaData) instancesMetadata.get(2); + instanceMD = (InstanceMetaData)instancesMetadata.get(2); assertEquals("CatalogPortletInstance", instanceMD.getId()); - instanceMD = (InstanceMetaData) instancesMetadata.get(3); + instanceMD = (InstanceMetaData)instancesMetadata.get(3); assertEquals("PortletContentEditorInstance", instanceMD.getId()); - + } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/deployment/PortletInstancesMetaDataFactoryTestCase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.content; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.impl.model.content.AbstractContent; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.impl.model.content.AbstractContent; -import org.jboss.portal.common.i18n.LocalizedString; import java.util.Locale; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SimpleContent extends AbstractContent { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContent.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,13 +22,13 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.content; +import org.jboss.portal.core.model.content.Content; +import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.content.spi.handler.ContentState; -import org.jboss.portal.core.model.content.spi.handler.ContentHandler; -import org.jboss.portal.core.model.content.Content; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SimpleContentHandler implements ContentHandler { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentHandler.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,15 +22,15 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.content; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.ContentProvider; -import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.content.spi.handler.ContentHandler; import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet; -import org.jboss.portal.common.i18n.LocalizedString; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SimpleContentProvider implements ContentProvider { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProvider.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.content; +import org.jboss.portal.common.util.CopyOnWriteRegistry; +import org.jboss.portal.core.model.content.ContentType; +import org.jboss.portal.core.model.content.spi.ContentProvider; import org.jboss.portal.core.model.content.spi.ContentProviderRegistry; -import org.jboss.portal.core.model.content.spi.ContentProvider; -import org.jboss.portal.core.model.content.ContentType; -import org.jboss.portal.common.util.CopyOnWriteRegistry; import java.util.Collection; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class SimpleContentProviderRegistry implements ContentProviderRegistry { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/content/SimpleContentProviderRegistry.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ActionContextImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ActionContextImpl.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ActionContextImpl.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.instance; -import org.jboss.portal.portlet.support.spi.ActionContextSupport; -import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.Mode; import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.support.spi.ActionContextSupport; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ActionContextImpl extends ActionContextSupport { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ActionContextImpl.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -65,8 +65,8 @@ import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.spi.provider.DomainConfigurator; import org.jboss.portal.test.framework.AbstractPortalTestCase; +import org.jboss.portal.test.framework.embedded.HibernateSupport; import org.jboss.portal.test.framework.mc.TestRuntimeContext; -import org.jboss.portal.test.framework.embedded.HibernateSupport; import java.util.Collection; import java.util.Collections; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,31 +22,31 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.instance; -import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.common.value.Value; +import org.jboss.portal.portlet.InvalidPortletIdException; +import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.InvalidPortletIdException; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.state.PropertyChange; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.support.info.PortletInfoSupport; -import org.jboss.portal.common.value.Value; -import java.util.Map; import java.util.HashMap; -import java.util.Set; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6712 $ + * @version $Revision$ */ public class PortletInvokerSupport implements PortletInvoker { @@ -214,7 +214,7 @@ { InternalPortlet internalPortlet = internalGetPortlet(portletContext); PropertyMap props = new SimplePropertyMap(); - for (Iterator i = keys.iterator();i.hasNext();) + for (Iterator i = keys.iterator(); i.hasNext();) { String key = (String)i.next(); Value value = (Value)internalPortlet.state.get(key); @@ -230,7 +230,7 @@ { InternalPortlet internalPortlet = internalGetPortlet(portletContext); PropertyMap props = new SimplePropertyMap(); - for (Iterator i = internalPortlet.state.keySet().iterator();i.hasNext();) + for (Iterator i = internalPortlet.state.keySet().iterator(); i.hasNext();) { String key = (String)i.next(); Value value = (Value)internalPortlet.state.get(key); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletInvokerSupport.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.instance; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.support.info.PortletInfoSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.PortletInvokerException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6116 $ + * @version $Revision$ */ public class PortletSupport { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/PortletSupport.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ValueMapAssert.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ValueMapAssert.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ValueMapAssert.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,15 +23,15 @@ package org.jboss.portal.test.core.model.instance; import junit.framework.Assert; +import org.jboss.portal.common.value.Value; import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.common.value.Value; import java.util.HashSet; import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ValueMapAssert extends Assert { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/ValueMapAssert.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -33,7 +33,7 @@ * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:anil.saldhana@jboss.org">Anil Saldhana</a> - * @version $Revision: 7252 $ + * @version $Revision$ */ public class AbstractPortalObjectContainerTestCase extends PortalBaseTestCase { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/AbstractPortalObjectContainerTestCase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,28 +22,27 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.portal; +import junit.framework.TestSuite; +import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.common.junit.TransactionAssert; import org.jboss.portal.common.util.CollectionBuilder; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; import org.jboss.portal.core.model.portal.Context; -import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.Page; -import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.Portal; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.impl.api.node.PortalNodeImpl; +import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.spi.provider.AuthorizationDomain; import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.security.RoleSecurityBinding; -import org.jboss.portal.api.node.PortalNode; -import junit.framework.TestSuite; -import java.util.Collection; import java.util.Iterator; import java.util.Map; import java.util.TreeMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalNodeTestCase extends AbstractPortalObjectContainerTestCase { @@ -141,7 +140,7 @@ private Map getChildrenMap(PortalNode node) { Map p_1_children = new TreeMap(); - for (Iterator i = node.getChildren().iterator();i.hasNext();) + for (Iterator i = node.getChildren().iterator(); i.hasNext();) { PortalNode child = (PortalNode)i.next(); p_1_children.put(child.getName(), child); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectIdTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectIdTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectIdTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,14 +23,12 @@ package org.jboss.portal.test.core.model.portal; import junit.framework.TestCase; -import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.junit.ExtendedAssert; +import org.jboss.portal.core.model.portal.PortalObjectPath; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectIdTestCase extends TestCase { @@ -132,17 +130,17 @@ { assertCanonicalFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{})), "/"); assertCanonicalFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{"a"})), "/a"); - assertCanonicalFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{"a","b"})), "/a/b"); + assertCanonicalFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{"a", "b"})), "/a/b"); // assertCanonicalFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{})), "ns:/"); assertCanonicalFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{"a"})), "ns:/a"); - assertCanonicalFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{"a","b"})), "ns:/a/b"); + assertCanonicalFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{"a", "b"})), "ns:/a/b"); // assertCanonicalFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{})), ":/"); assertCanonicalFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{"a"})), ":/a"); - assertCanonicalFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{"a","b"})), ":/a/b"); + assertCanonicalFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{"a", "b"})), ":/a/b"); } private void assertCanonicalFormatParse(PortalObjectId id, String string) @@ -160,17 +158,17 @@ { assertLegacyFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{})), ""); assertLegacyFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{"a"})), "a"); - assertLegacyFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{"a","b"})), "a.b"); + assertLegacyFormatEquals(new PortalObjectId("", new PortalObjectPath(new String[]{"a", "b"})), "a.b"); // assertLegacyFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{})), "ns:"); assertLegacyFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{"a"})), "ns:a"); - assertLegacyFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{"a","b"})), "ns:a.b"); + assertLegacyFormatEquals(new PortalObjectId("ns", new PortalObjectPath(new String[]{"a", "b"})), "ns:a.b"); // assertLegacyFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{})), ":"); assertLegacyFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{"a"})), ":a"); - assertLegacyFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{"a","b"})), ":a.b"); + assertLegacyFormatParse(new PortalObjectId("", new PortalObjectPath(new String[]{"a", "b"})), ":a.b"); } private void assertLegacyFormatParse(PortalObjectId id, String string) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectIdTestCase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPathTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPathTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPathTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,13 +23,13 @@ package org.jboss.portal.test.core.model.portal; import junit.framework.TestCase; -import org.jboss.portal.core.model.portal.PortalObjectPath; import org.jboss.portal.common.junit.ExtendedAssert; import org.jboss.portal.common.util.Tools; +import org.jboss.portal.core.model.portal.PortalObjectPath; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class PortalObjectPathTestCase extends TestCase { @@ -128,7 +128,7 @@ } try { - format.toString(new String[]{"a",null,"b"}, 0, 3); + format.toString(new String[]{"a", null, "b"}, 0, 3); fail(); } catch (IllegalArgumentException expected) @@ -140,7 +140,7 @@ { assertEquals(new PortalObjectPath(new String[]{}), PortalObjectPath.parse("/", PortalObjectPath.CANONICAL_FORMAT)); assertEquals(new PortalObjectPath(new String[]{"a"}), PortalObjectPath.parse("/a", PortalObjectPath.CANONICAL_FORMAT)); - assertEquals(new PortalObjectPath(new String[]{"a","b"}), PortalObjectPath.parse("/a/b", PortalObjectPath.CANONICAL_FORMAT)); + assertEquals(new PortalObjectPath(new String[]{"a", "b"}), PortalObjectPath.parse("/a/b", PortalObjectPath.CANONICAL_FORMAT)); String a = "a.b"; String b = "c"; @@ -164,7 +164,7 @@ pop1 = new PortalObjectPath(new String[]{a}); pop2 = PortalObjectPath.parse(new PortalObjectPath(new String[]{a}).toString(PortalObjectPath.CANONICAL_FORMAT), PortalObjectPath.CANONICAL_FORMAT); assertEquals(pop1.toString(PortalObjectPath.CANONICAL_FORMAT), pop2.toString(PortalObjectPath.CANONICAL_FORMAT)); - + // try { @@ -188,14 +188,14 @@ { assertEquals(new PortalObjectPath(new String[]{}), PortalObjectPath.parse("", PortalObjectPath.LEGACY_FORMAT)); assertEquals(new PortalObjectPath(new String[]{"a"}), PortalObjectPath.parse("a", PortalObjectPath.LEGACY_FORMAT)); - assertEquals(new PortalObjectPath(new String[]{"a","b"}), PortalObjectPath.parse("a.b", PortalObjectPath.LEGACY_FORMAT)); - + assertEquals(new PortalObjectPath(new String[]{"a", "b"}), PortalObjectPath.parse("a.b", PortalObjectPath.LEGACY_FORMAT)); + String a = "a.b"; String b = "c"; PortalObjectPath pop1 = new PortalObjectPath(new String[]{a, b}); PortalObjectPath pop2 = PortalObjectPath.parse(new PortalObjectPath(new String[]{a, b}).toString(PortalObjectPath.LEGACY_FORMAT), PortalObjectPath.LEGACY_FORMAT); assertEquals(pop1.toString(PortalObjectPath.LEGACY_FORMAT), pop2.toString(PortalObjectPath.LEGACY_FORMAT)); - + a = ".a.b"; b = "c"; pop1 = new PortalObjectPath(new String[]{a, b}); @@ -213,13 +213,13 @@ { assertTrue(new PortalObjectPath(new String[]{}).equals(new PortalObjectPath(new String[]{}))); assertFalse(new PortalObjectPath(new String[]{}).equals(new PortalObjectPath(new String[]{"a"}))); - assertFalse(new PortalObjectPath(new String[]{}).equals(new PortalObjectPath(new String[]{"a","b"}))); + assertFalse(new PortalObjectPath(new String[]{}).equals(new PortalObjectPath(new String[]{"a", "b"}))); assertFalse(new PortalObjectPath(new String[]{"a"}).equals(new PortalObjectPath(new String[]{}))); assertTrue(new PortalObjectPath(new String[]{"a"}).equals(new PortalObjectPath(new String[]{"a"}))); - assertFalse(new PortalObjectPath(new String[]{"a"}).equals(new PortalObjectPath(new String[]{"a","b"}))); - assertFalse(new PortalObjectPath(new String[]{"a","b"}).equals(new PortalObjectPath(new String[]{}))); - assertFalse(new PortalObjectPath(new String[]{"a","b"}).equals(new PortalObjectPath(new String[]{"a"}))); - assertTrue(new PortalObjectPath(new String[]{"a","b"}).equals(new PortalObjectPath(new String[]{"a","b"}))); + assertFalse(new PortalObjectPath(new String[]{"a"}).equals(new PortalObjectPath(new String[]{"a", "b"}))); + assertFalse(new PortalObjectPath(new String[]{"a", "b"}).equals(new PortalObjectPath(new String[]{}))); + assertFalse(new PortalObjectPath(new String[]{"a", "b"}).equals(new PortalObjectPath(new String[]{"a"}))); + assertTrue(new PortalObjectPath(new String[]{"a", "b"}).equals(new PortalObjectPath(new String[]{"a", "b"}))); } public void testComparable() @@ -227,28 +227,28 @@ assertTrue(new PortalObjectPath(new String[]{"a"}).compareTo(new PortalObjectPath(new String[]{"a"})) == 0); assertTrue(new PortalObjectPath(new String[]{"a"}).compareTo(new PortalObjectPath(new String[]{"b"})) < 0); assertTrue(new PortalObjectPath(new String[]{"b"}).compareTo(new PortalObjectPath(new String[]{"a"})) > 0); - assertTrue(new PortalObjectPath(new String[]{"a"}).compareTo(new PortalObjectPath(new String[]{"a","b"})) > 0); - assertTrue(new PortalObjectPath(new String[]{"a","b"}).compareTo(new PortalObjectPath(new String[]{"a"})) < 0); + assertTrue(new PortalObjectPath(new String[]{"a"}).compareTo(new PortalObjectPath(new String[]{"a", "b"})) > 0); + assertTrue(new PortalObjectPath(new String[]{"a", "b"}).compareTo(new PortalObjectPath(new String[]{"a"})) < 0); } public void testIterator() { ExtendedAssert.assertEquals(new Object[]{}, Tools.toArray(new PortalObjectPath(new String[]{}).names())); ExtendedAssert.assertEquals(new Object[]{"a"}, Tools.toArray(new PortalObjectPath(new String[]{"a"}).names())); - ExtendedAssert.assertEquals(new Object[]{"a","b"}, Tools.toArray(new PortalObjectPath(new String[]{"a","b"}).names())); + ExtendedAssert.assertEquals(new Object[]{"a", "b"}, Tools.toArray(new PortalObjectPath(new String[]{"a", "b"}).names())); } public void testGetChild() { assertEquals(new PortalObjectPath(new String[]{"a"}), new PortalObjectPath(new String[]{}).getChild("a")); - assertEquals(new PortalObjectPath(new String[]{"a","b"}), new PortalObjectPath(new String[]{"a"}).getChild("b")); + assertEquals(new PortalObjectPath(new String[]{"a", "b"}), new PortalObjectPath(new String[]{"a"}).getChild("b")); } public void testGetParent() { assertEquals(null, new PortalObjectPath(new String[]{}).getParent()); assertEquals(new PortalObjectPath(new String[]{}), new PortalObjectPath(new String[]{"a"}).getParent()); - assertEquals(new PortalObjectPath(new String[]{"a"}), new PortalObjectPath(new String[]{"a","b"}).getParent()); - assertEquals(new PortalObjectPath(new String[]{"a","b"}), new PortalObjectPath(new String[]{"a","b","c"}).getParent()); + assertEquals(new PortalObjectPath(new String[]{"a"}), new PortalObjectPath(new String[]{"a", "b"}).getParent()); + assertEquals(new PortalObjectPath(new String[]{"a", "b"}), new PortalObjectPath(new String[]{"a", "b", "c"}).getParent()); } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPathTestCase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.test.core.model.portal; -import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; +import org.jboss.portal.core.model.portal.PortalObjectPermission; import org.jboss.portal.identity.auth.UserPrincipal; import org.jboss.portal.security.PortalPermission; import org.jboss.portal.security.PortalPermissionCollection; @@ -68,7 +68,7 @@ public void testImplies2() { PortalObjectPermission v = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc"})), "view"); - PortalObjectPermission vr = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc","def"})), "viewrecursive"); + PortalObjectPermission vr = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc", "def"})), "viewrecursive"); assertTrue(v.implies(v)); assertFalse(v.implies(vr)); assertFalse(vr.implies(v)); @@ -78,7 +78,7 @@ public void testImplies3() { PortalObjectPermission v = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc"})), "viewrecursive"); - PortalObjectPermission vr = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc","def"})), "view"); + PortalObjectPermission vr = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc", "def"})), "view"); assertTrue(v.implies(v)); assertTrue(v.implies(vr)); assertFalse(vr.implies(v)); @@ -89,9 +89,9 @@ { PortalObjectPermission v = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[0])), "dashboard"); PortalObjectPermission v1 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc"})), "view"); - PortalObjectPermission v2 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc","def"})), "view"); + PortalObjectPermission v2 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc", "def"})), "view"); PortalObjectPermission v3 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"def"})), "view"); - PortalObjectPermission v4 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"def","ghi"})), "view"); + PortalObjectPermission v4 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"def", "ghi"})), "view"); Subject abc = new Subject(); abc.getPrincipals().add(new UserPrincipal("abc")); @@ -130,10 +130,10 @@ public void testDashboard2() throws Exception { PortalObjectPermission v = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc"})), "dashboard"); - PortalObjectPermission v1 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc","def"})), "view"); - PortalObjectPermission v2 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc","def","ghi"})), "view"); + PortalObjectPermission v1 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc", "def"})), "view"); + PortalObjectPermission v2 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"abc", "def", "ghi"})), "view"); PortalObjectPermission v3 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"jkl"})), "view"); - PortalObjectPermission v4 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"jkl","mno"})), "view"); + PortalObjectPermission v4 = new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"jkl", "mno"})), "view"); Subject def = new Subject(); def.getPrincipals().add(new UserPrincipal("def")); @@ -226,7 +226,7 @@ Principal[] principals = new Principal[]{new SimplePrincipal("admin")}; assertTrue(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[0])), "view"), principals)); assertTrue(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"default"})), "view"), principals)); - assertTrue(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"default","default"})), "view"), principals)); + assertTrue(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"default", "default"})), "view"), principals)); } }); } @@ -244,7 +244,7 @@ Principal[] principals = new Principal[]{new SimplePrincipal("admin")}; assertTrue(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[0])), "view"), principals)); assertFalse(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"default"})), "view"), principals)); - assertFalse(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"default","default"})), "view"), principals)); + assertFalse(implies(new PortalObjectPermission(new PortalObjectId("", new PortalObjectPath(new String[]{"default", "default"})), "view"), principals)); } }); } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -31,19 +31,17 @@ import org.apache.log4j.SimpleLayout; import org.jboss.portal.Mode; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.test.framework.junit.JUnitAdapter; -import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.common.value.StringValue; +import org.jboss.portal.core.impl.portlet.state.PersistentPortletState; +import org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager; import org.jboss.portal.core.impl.portlet.state.PersistentRegistration; -import org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager; import org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker; -import org.jboss.portal.core.impl.portlet.state.PersistentPortletState; import org.jboss.portal.portlet.NoSuchPortletException; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; import org.jboss.portal.portlet.impl.spi.AbstractUserContext; -import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; import org.jboss.portal.portlet.info.MetaInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -52,23 +50,25 @@ import org.jboss.portal.portlet.state.AccessMode; import org.jboss.portal.portlet.state.DestroyCloneFailure; import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyContext; import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; -import org.jboss.portal.portlet.state.PropertyContext; import org.jboss.portal.portlet.state.producer.PortletState; import org.jboss.portal.portlet.state.producer.PortletStateContext; -import org.jboss.portal.registration.RegistrationLocal; +import org.jboss.portal.registration.Consumer; import org.jboss.portal.registration.ConsumerGroup; -import org.jboss.portal.registration.Consumer; import org.jboss.portal.registration.Registration; -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 org.jboss.portal.test.framework.TestParametrization; +import org.jboss.portal.registration.RegistrationLocal; +import org.jboss.portal.test.core.model.instance.ActionContextImpl; import org.jboss.portal.test.core.model.instance.PortletInvokerSupport; import org.jboss.portal.test.core.model.instance.PortletSupport; -import org.jboss.portal.test.core.model.instance.ActionContextImpl; import org.jboss.portal.test.core.model.instance.ValueMapAssert; +import org.jboss.portal.test.framework.TestParametrization; +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.mc.TestRuntimeContext; import javax.xml.namespace.QName; import java.net.URL; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -29,21 +29,21 @@ import org.apache.log4j.Logger; import org.apache.log4j.SimpleLayout; import org.jboss.portal.common.junit.TransactionAssert; -import org.jboss.portal.test.framework.junit.JUnitAdapter; -import org.jboss.portal.test.framework.junit.POJOJUnitTest; import org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager; import org.jboss.portal.registration.RegistrationPersistenceManager; -import org.jboss.portal.test.framework.mc.TestRuntimeContext; +import org.jboss.portal.test.framework.TestParametrization; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; -import org.jboss.portal.test.framework.TestParametrization; +import org.jboss.portal.test.framework.junit.JUnitAdapter; +import org.jboss.portal.test.framework.junit.POJOJUnitTest; +import org.jboss.portal.test.framework.mc.TestRuntimeContext; import org.jboss.portal.test.registration.AbstractRegistrationPersistenceManagerTestCase; import java.net.URL; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5776 $ + * @version $Revision$ */ public class RegistrationPersistenceManagerTestCase extends AbstractRegistrationPersistenceManagerTestCase { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/state/RegistrationPersistenceManagerTestCase.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossAPIFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossAPIFactory.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossAPIFactory.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portlet; -import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl; import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl; import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; import org.jboss.portal.portlet.impl.jsr168.api.RenderResponseImpl; +import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.RenderInvocation; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossAPIFactory.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionRequest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionRequest.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionRequest.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,8 +24,8 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.core.aspects.controller.node.Navigation; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.portlet.ControllerUserContext; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.identity.User; import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl; import org.jboss.portal.portlet.invocation.ActionInvocation; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionRequest.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portlet; +import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; -import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.common.net.URLTools; import org.jboss.portal.core.aspects.controller.node.Navigation; import org.jboss.portal.core.controller.portlet.SignOutResponse; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossActionResponse.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortlet.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortlet.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -111,12 +111,11 @@ * <p>This method looks up the method corresponding to the action. It uses the action parameter using the parameter * name defines by the <code>operationName</code> field of this class. If not method is found it uses the method * defined by the return of the method <code>getDefaultOperation()</code> of this class. In order to be found a - * method must use <code>JBossActionRequest</code> and <JBossActionResponse> in the signature.</p> + * method must use <code>JBossActionRequest</code> and <JBossActionResponse> in the signature.</p> <p/> <p>If not + * valid dispatcher is found it throws a PortletException, otherwise it invokes the method by reflection. The invoked + * method may declare exceptions in the throws clause of the method. Whenever an exception is raised during the + * invocation of the method, a decision is taken depending on the nature of the exception :</p> * <p/> - * <p>If not valid dispatcher is found it throws a PortletException, otherwise it invokes the method by reflection. - * The invoked method may declare exceptions in the throws clause of the method. Whenever an exception is raised - * during the invocation of the method, a decision is taken depending on the nature of the exception :</p> - * <p/> * <ul> <li>If the exception is an instanceof <code>PortletException</code>, <code>IOException</code> then this * exception is rethrown as is since this method declares them in its throws clause</li> <li>If the exception is an * instance of <code>RuntimeException</code> or <code>Error>/code>, it is rethrown as is</li> <li>Otherwise a @@ -212,19 +211,19 @@ Throwable t = e.getCause(); if (t instanceof PortletException) { - throw(PortletException)t; + throw (PortletException)t; } else if (t instanceof IOException) { - throw(IOException)t; + throw (IOException)t; } else if (t instanceof RuntimeException) { - throw(RuntimeException)t; + throw (RuntimeException)t; } else if (t instanceof Error) { - throw(Error)t; + throw (Error)t; } else { Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortlet.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossPortletPreferences.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderRequest.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderRequest.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderRequest.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,12 +24,12 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.core.aspects.controller.node.Navigation; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.portlet.ControllerUserContext; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.identity.User; import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; +import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portlet.util.Parameters; import javax.portlet.PortletPreferences; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderRequest.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderResponse.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderResponse.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portlet; +import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; -import org.jboss.portal.api.PortalRuntimeContext; import org.jboss.portal.core.aspects.controller.node.Navigation; import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl; import org.jboss.portal.portlet.impl.jsr168.api.RenderResponseImpl; Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/JBossRenderResponse.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,16 +22,6 @@ ******************************************************************************/ package org.jboss.portlet.content; -import java.util.ArrayList; -import java.util.List; - -import javax.management.Attribute; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - import org.apache.log4j.Logger; import org.jboss.mx.util.MBeanProxy; import org.jboss.mx.util.MBeanServerLocator; @@ -44,13 +34,22 @@ import org.jboss.portal.jems.as.system.JBossServiceModelMBean; import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import javax.management.Attribute; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import java.util.ArrayList; +import java.util.List; + /** - * Provide registration of a content type with a portlet instance. This listener can be used - * in war files to register content driven portlet. + * Provide registration of a content type with a portlet instance. This listener can be used in war files to register + * content driven portlet. * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 1.1 $ + * @version $Revision$ */ public class ContentTypeRegistration implements ServletContextListener { @@ -91,7 +90,7 @@ }; // - log.debug("About to register content type "+ contentType + " with portlet instance " + portletInstanceName); + log.debug("About to register content type " + contentType + " with portlet instance " + portletInstanceName); InternalGenericContentProvider provider = new InternalGenericContentProvider(); provider.setContentType(contentType.toString()); @@ -111,7 +110,7 @@ // ObjectName scObjectName = new ObjectName("jboss.system:service=ServiceController"); - mbeanServer.invoke(scObjectName, "create", new ObjectName[] {objectName} , new String[] {"javax.management.ObjectName"}); + mbeanServer.invoke(scObjectName, "create", new ObjectName[]{objectName}, new String[]{"javax.management.ObjectName"}); // Get proxy on Content Provide Registry ObjectName contentProviderRegistryON = new ObjectName("portal:service=ContentProviderRegistry"); @@ -127,33 +126,33 @@ ObjectName pamfON = new ObjectName("portal:service=PortalAuthorizationManagerFactory"); Object factory = MBeanProxy.get(PortalAuthorizationManagerFactory.class, pamfON, mbeanServer); mbean.setAttribute(new Attribute("PortalAuthorizationManagerFactory", factory)); - + // Set dependencies List dependencies = new ArrayList(); dependencies.add(contentProviderRegistryON); dependencies.add(instanceContainerON); dependencies.add(pamfON); - mbeanServer.invoke(scObjectName, "register", new Object[] {objectName, dependencies} , new String[] {"javax.management.ObjectName", "java.util.Collection"}); + mbeanServer.invoke(scObjectName, "register", new Object[]{objectName, dependencies}, new String[]{"javax.management.ObjectName", "java.util.Collection"}); // Start the mbean - mbeanServer.invoke(scObjectName, "start", new ObjectName[] {objectName} , new String[] {"javax.management.ObjectName"}); + mbeanServer.invoke(scObjectName, "start", new ObjectName[]{objectName}, new String[]{"javax.management.ObjectName"}); log.debug("Registered InternalGenericContentProvider with name:" + name); } - catch(Exception e) + catch (Exception e) { log.warn("Couldn't perform ContentProvider registration", e); return; } - log.debug("Registered content type "+ contentType + " with portlet instance " + portletInstanceName); + log.debug("Registered content type " + contentType + " with portlet instance " + portletInstanceName); } public void contextDestroyed(ServletContextEvent event) { if (contentType != null) { - log.debug("About to unregister content type "+ contentType); - + log.debug("About to unregister content type " + contentType); + // final String portletInstanceName = event.getServletContext().getInitParameter("org.jboss.portal.portlet_instance"); String name = "portal:service=ContentRenderer,type=" + portletInstanceName; @@ -161,19 +160,19 @@ { ObjectName objectName = new ObjectName(name); ObjectName scObjectName = new ObjectName("jboss.system:service=ServiceController"); - + // Stop the mbean MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); - mbeanServer.invoke(scObjectName, "stop", new ObjectName[] {objectName} , new String[] {"javax.management.ObjectName"}); - mbeanServer.invoke(scObjectName, "remove", new Object[] {objectName} , new String[] {"javax.management.ObjectName"}); + mbeanServer.invoke(scObjectName, "stop", new ObjectName[]{objectName}, new String[]{"javax.management.ObjectName"}); + mbeanServer.invoke(scObjectName, "remove", new Object[]{objectName}, new String[]{"javax.management.ObjectName"}); } - catch(Exception e) + catch (Exception e) { log.warn("Couldn't perform ContentProvider registration", e); return; } - log.debug("Content type "+ contentType + " has been unregistered"); + log.debug("Content type " + contentType + " has been unregistered"); } } } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/session/PortletSessionListener.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/util/Parameters.java ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/jboss-app_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/jboss-portlet_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-layouts_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-renderSet_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-strategies_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal-themes_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portal_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/dtd/portlet-instances_2_0.dtd ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -1265,7 +1265,8 @@ proxy-type="attribute">portal:service=EntityResolver</depends> <attribute name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute> <attribute name="PortletAPIFactoryClassName">org.jboss.portlet.JBossAPIFactory</attribute> - <attribute name="PortletInfoFactoryClassName">org.jboss.portal.core.impl.portlet.info.CorePortletInfoFactory</attribute> + <attribute + name="PortletInfoFactoryClassName">org.jboss.portal.core.impl.portlet.info.CorePortletInfoFactory</attribute> <!-- Set to false in clustered mode, otherwise set to true --> <attribute name=&quot;CreateInstances&quot;&gt;@portal.single(a)&lt;/attribute&gt; </mbean> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/config.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -76,7 +76,7 @@ name="displayNames" table="JBP_INSTANCE_DISPLAY_NAMES"> <key column="INSTANCE_PK"/> - <map-key type="locale" column="LOCALE" /> + <map-key type="locale" column="LOCALE"/> <element type="string" column="TEXT"/> </map> <map Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/setup.txt ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -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:@portal.datasource.name@</property> + <property name="connection.datasource">java:@portal.datasource.name@</property> - <!-- other hibernate properties --> - <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; + <!-- other hibernate properties --> + <property name=&quot;show_sql&quot;&gt;@portal.sql.show(a)&lt;/property&gt; <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">conf/hibernate/workflow/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 # --> - <!-- ############################################ --> + <!-- ############################################ --> + <!-- # 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"/> + <!-- 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"/> + <!-- 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/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/identity-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/identity-config.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/identity-config.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,7 +22,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!DOCTYPE identity-configuration PUBLIC +<!DOCTYPE identity-configuration PUBLIC "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" "http://www.jboss.org/portal/dtd/identity-config_2_6.dtd"> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/identity-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -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> <datasources> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -22,7 +22,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> - <!DOCTYPE profile PUBLIC +<!DOCTYPE profile PUBLIC "-//JBoss Portal//DTD JBoss User Profile Configuration 1.0//EN" "http://www.jboss.org/portal/dtd/profile-config_2_6.dtd"> @@ -234,7 +234,7 @@ <value>portal.user.locale</value> </database> <!--<ldap>--> - <!--<value>localityName</value>--> + <!--<value>localityName</value>--> <!--</ldap>--> </mapping> </property> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/profile-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/login-config.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-app_2_6.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/jboss-portlet_2_6.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portal-object_2_6.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/dtd/portlet-instances_2_6.dtd ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/portal-aop.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -59,7 +59,8 @@ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> + <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" + property="connectionManagerReference"/></property> <property name="config"><inject bean="DataSourceConfig"/></property> </bean> @@ -88,7 +89,8 @@ <bean name="StateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"> <property name="persistLocally"><inject bean="TestCaseConfig" property="persistLocally"/></property> </bean> - <bean name="PersistenceManager" class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> + <bean name="PersistenceManager" + class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> <property name="sessionFactoryJNDIName">java:/PortletSessionFactory</property> </bean> <bean name="PortletContainer" class="org.jboss.portal.test.core.model.instance.PortletInvokerSupport"> @@ -102,7 +104,8 @@ <bean name="StackFactory" class="org.jboss.portal.common.invocation.EmptyInterceptorStackFactory"> </bean> - <bean name="ContainerContext" class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"> + <bean name="ContainerContext" + class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext"> <property name="sessionFactoryJNDIName">java:/InstanceSessionFactory</property> <property name="cacheNaturalId"><inject bean="TestCaseConfig" property="cacheNaturalId"/></property> </bean> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -59,7 +59,8 @@ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> + <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" + property="connectionManagerReference"/></property> <property name="config"><inject bean="DataSourceConfig"/></property> </bean> @@ -88,7 +89,8 @@ <bean name="StateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService"> <property name="persistLocally"><inject bean="TestCaseConfig" property="persistLocally"/></property> </bean> - <bean name="PersistenceManager" class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> + <bean name="PersistenceManager" + class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> <property name="sessionFactoryJNDIName">java:/PortletSessionFactory</property> </bean> <bean name="PortletContainer" class="org.jboss.portal.test.core.model.instance.PortletInvokerSupport"> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/transient-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/persistent-jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/persistent-jboss-beans.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/persistent-jboss-beans.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -53,7 +53,8 @@ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> + <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" + property="connectionManagerReference"/></property> <property name="config"><inject bean="DataSourceConfig"/></property> </bean> @@ -70,7 +71,8 @@ <bean name="AuthorizationDomainRegistry" class="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"> </bean> - <bean name="AuthorizationManagerFactory" class="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"> + <bean name="AuthorizationManagerFactory" + class="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"> <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property> </bean> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/persistent-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/transient-jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/transient-jboss-beans.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/transient-jboss-beans.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -53,7 +53,8 @@ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> + <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" + property="connectionManagerReference"/></property> <property name="config"><inject bean="DataSourceConfig"/></property> </bean> @@ -70,7 +71,8 @@ <bean name="AuthorizationDomainRegistry" class="org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl"> </bean> - <bean name="AuthorizationManagerFactory" class="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"> + <bean name="AuthorizationManagerFactory" + class="org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory"> <property name="authorizationDomainRegistry"><inject bean="AuthorizationDomainRegistry"/></property> </bean> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/transient-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -53,7 +53,8 @@ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> + <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" + property="connectionManagerReference"/></property> <property name="config"><inject bean="DataSourceConfig"/></property> </bean> @@ -73,7 +74,8 @@ <bean name="StateManagementPolicy" class="org.jboss.portal.core.impl.portlet.state.StateManagementPolicyImpl"> </bean> - <bean name="PersistenceManager" class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> + <bean name="PersistenceManager" + class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> <property name="sessionFactoryJNDIName">java:/SessionFactory</property> </bean> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/registration-persistence-manager-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/registration-persistence-manager-beans.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/registration-persistence-manager-beans.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -53,7 +53,8 @@ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> - <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property> + <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" + property="connectionManagerReference"/></property> <property name="config"><inject bean="DataSourceConfig"/></property> </bean> @@ -67,7 +68,8 @@ <property name="jNDIName">java:/SessionFactory</property> </bean> - <bean name="PersistenceManager" class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> + <bean name="PersistenceManager" + class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager"> <property name="sessionFactoryJNDIName">java:/SessionFactory</property> </bean> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/registration-persistence-manager-beans.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-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/src/resources/portal-core-war/WEB-INF/classes/nodesk/Modes.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/nodesk/WindowStates.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/phalanx/Modes.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/phalanx/WindowStates.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/templates/user/emailTemplate.tpl ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/templates/user/emailTemplate_fr.tpl ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,4 +1,3 @@ -<%@ page import="org.jboss.portal.api.node.PortalNode" %> <%@ page import="org.jboss.portal.api.node.PortalNodeURL" %> <%@ page import="java.util.HashMap" %> <%@ page import="java.util.Iterator" %> @@ -9,10 +8,10 @@ <% String contextPath = request.getContextPath(); - String parent = (String) request.getAttribute("parentNode"); - HashMap parents = (HashMap) request.getAttribute("parents"); - HashMap parentChildMap = (HashMap) request.getAttribute("pchild"); - HashMap parentSiblingMap = (HashMap) request.getAttribute("psib"); + String parent = (String)request.getAttribute("parentNode"); + HashMap parents = (HashMap)request.getAttribute("parents"); + HashMap parentChildMap = (HashMap)request.getAttribute("pchild"); + HashMap parentSiblingMap = (HashMap)request.getAttribute("psib"); %> <style> @@ -22,12 +21,12 @@ margin-left: 10px; padding: 3px 0 3px 0px; vertical-align: top; - list-style-image: url( <%= contextPath %>/images/catalog/bullet.gif ) + list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ) } .pagenosub { - margin-left: - 20px; - list-style-image: url( <%= contextPath %>/images/catalog/bullet.gif ) + margin-left: -20px; + list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ) } / @@ -36,40 +35,47 @@ </style> <% -String output = new String(); -for (Iterator i = parents.keySet().iterator(); i.hasNext();) -{ - String name = (String) i.next(); - PortalNodeURL nodeURL = (PortalNodeURL) parents.get(name); - output = "<a href=\"" + nodeURL.toString() + "\">" + name + "</a> &gt; " + output; -} -output += parent; + String output = new String(); + for (Iterator i = parents.keySet().iterator(); i.hasNext();) + { + String name = (String)i.next(); + PortalNodeURL nodeURL = (PortalNodeURL)parents.get(name); + output = "<a href=\"" + nodeURL.toString() + "\">" + name + "</a> &gt; " + output; + } + output += parent; %> -<div class="portlet-form-field-label"><%= output %></div> +<div class="portlet-form-field-label"><%= output %> +</div> <ul id="foldinglist"> <li class="pagenosub"> - <div class="portlet-form-field-label"><%= parent %></div> + <div class="portlet-form-field-label"><%= parent %> + </div> </li> <% - for(Iterator i = parentChildMap.keySet().iterator(); i.hasNext();) + for (Iterator i = parentChildMap.keySet().iterator(); i.hasNext();) { - String childName = (String) i.next(); - PortalNodeURL childURL = (PortalNodeURL) parentChildMap.get(childName); + String childName = (String)i.next(); + PortalNodeURL childURL = (PortalNodeURL)parentChildMap.get(childName); %> - <li class="foldinglist"><div class="portlet-form-field-label"><a - href="<%= childURL.toString() %>"><%= childName %></a></div></li> + <li class="foldinglist"> + <div class="portlet-form-field-label"><a + href="<%= childURL.toString() %>"><%= childName %> + </a></div> + </li> <% } - for(Iterator j = parentSiblingMap.keySet().iterator(); j.hasNext();) + for (Iterator j = parentSiblingMap.keySet().iterator(); j.hasNext();) { - String siblingName = (String) j.next(); - PortalNodeURL siblingURL = (PortalNodeURL) parentSiblingMap.get(siblingName); + String siblingName = (String)j.next(); + PortalNodeURL siblingURL = (PortalNodeURL)parentSiblingMap.get(siblingName); %> <li class="pagenosub"> - <div class="portlet-form-field-label"><a href="<%= siblingURL.toString() %>"><%= siblingName %></a></div></li> + <div class="portlet-form-field-label"><a href="<%= siblingURL.toString() %>"><%= siblingName %> + </a></div> + </li> <% } %> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,7 +1,7 @@ +<%@ page import="org.jboss.portal.api.node.PortalNode" %> +<%@ page import="org.jboss.portal.api.node.PortalNodeURL" %> <%@ page import="org.jboss.portlet.JBossRenderResponse" %> <%@ page import="java.util.Iterator" %> -<%@ page import="org.jboss.portal.api.node.PortalNode"%> -<%@ page import="org.jboss.portal.api.node.PortalNodeURL"%> <%@ 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,14 +9,14 @@ <% String contextPath = request.getContextPath(); - PortalNode parent = (PortalNode) request.getAttribute("parentNode"); - JBossRenderResponse jresponse = (JBossRenderResponse) renderResponse; + PortalNode parent = (PortalNode)request.getAttribute("parentNode"); + JBossRenderResponse jresponse = (JBossRenderResponse)renderResponse; %> <style> <!-- #foldheader { - margin-left: - 10px; + margin-left: -10px; padding: 0px 0px 0px 0px; cursor: pointer; cursor: hand; @@ -34,7 +34,7 @@ } #pagenosub { - margin-left: - 10px; + margin-left: -10px; list-style-image: url( <%= contextPath %> /images/catalog/bullet.gif ) } @@ -47,57 +47,61 @@ <% int colCount = 4; PortalNode rootNode = parent.getRoot(); - for(Iterator i = rootNode.getChildren().iterator(); i.hasNext();) + for (Iterator i = rootNode.getChildren().iterator(); i.hasNext();) { - if(colCount % 4 == 0) // create new row every 4 columns + if (colCount % 4 == 0) // create new row every 4 columns { %> <tr> <% } - PortalNode parentSibling = (PortalNode) i.next(); - for(Iterator j = parentSibling.getChildren().iterator(); j.hasNext();) + PortalNode parentSibling = (PortalNode)i.next(); + for (Iterator j = parentSibling.getChildren().iterator(); j.hasNext();) { - PortalNode child = (PortalNode) j.next(); - if(child.getType() == PortalNode.TYPE_PAGE) + PortalNode child = (PortalNode)j.next(); + if (child.getType() == PortalNode.TYPE_PAGE) { colCount++; PortalNodeURL childURL = jresponse.createRenderURL(child); %> <td valign="top" class="portlet-section-body"> - <table width="100%" cellpadding="0" cellspacing="0"> - <tr> - <td colspan="2"> - <a href="<%= childURL %>"><b><%= child.getName() %></b></a> - </td> - </tr> + <table width="100%" cellpadding="0" cellspacing="0"> + <tr> + <td colspan="2"> + <a href="<%= childURL %>"><b><%= child.getName() %> + </b></a> + </td> + </tr> - <% - for(Iterator k = child.getChildren().iterator(); k.hasNext();) - { - PortalNode subChild = (PortalNode) k.next(); - if(subChild.getType() == PortalNode.TYPE_PAGE) + <% + for (Iterator k = child.getChildren().iterator(); k.hasNext();) { - // child page - PortalNodeURL subchildURL = jresponse.createRenderURL(subChild); - %> - <tr> - <td><img src="<%= contextPath %>/images/catalog/T.gif"/></td> - <td><a href="<%= subchildURL %>"><%= subChild.getName() %></a></td> - </tr> - <% + PortalNode subChild = (PortalNode)k.next(); + if (subChild.getType() == PortalNode.TYPE_PAGE) + { + // child page + PortalNodeURL subchildURL = jresponse.createRenderURL(subChild); + %> + <tr> + <td><img src="<%= contextPath %>/images/catalog/T.gif"/></td> + <td><a href="<%= subchildURL %>"><%= subChild.getName() %> + </a></td> + </tr> + <% + } + }// for children + %> + <% } - }// for children - %> + %> + </table> <% - } + + } // for parents + if(colCount % 3 == 0) + { + %> - </table> - <% - } // for parents - if(colCount % 3 == 0) - { - %> </tr> <% } Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -23,7 +23,10 @@ Instance instance = (Instance)i.next(); String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); String displayName = instance.getDisplayName().getString(renderRequest.getLocale(), true); - if (displayName == null) { displayName = instance.getId(); } + if (displayName == null) + { + displayName = instance.getId(); + } %> <portlet:actionURL var="url"> <portlet:param name="content.action.select" value="true"/> @@ -43,7 +46,10 @@ if (selectedInstance != null) { String displayName = selectedInstance.getDisplayName().getString(renderRequest.getLocale(), true); - if (displayName == null) { displayName = selectedInstance.getId(); } + if (displayName == null) + { + displayName = selectedInstance.getId(); + } %> <div class="portlet-font"> <div><span class="portlet-form-field-label">Portlet instance:</span><%= displayName %> @@ -54,6 +60,7 @@ + Portlet portlet = null; try { @@ -71,6 +78,7 @@ + %> <div><span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> @@ -90,6 +98,7 @@ + } } @@ -97,4 +106,5 @@ + %> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,14 +1,19 @@ -<%@page import="java.lang.Throwable"%> -<%@page import="org.jboss.portal.common.util.Exceptions"%> +<%@ page import="org.jboss.portal.common.util.Exceptions" %> -<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %></h2> -<div class="portlet-font">Cause: <%= request.getAttribute("org.jboss.portal.control.CAUSE") %></div> +<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %> +</h2> + +<div class="portlet-font">Cause: <%= request.getAttribute("org.jboss.portal.control.CAUSE") %> +</div> <% - if (request.getAttribute("org.jboss.portal.control.MESSAGE") != null) - { -%> -<div class="portlet-font">Message: <%= request.getAttribute("org.jboss.portal.control.MESSAGE") %></div> + if (request.getAttribute("org.jboss.portal.control.MESSAGE") != null) + { +%> +<div class="portlet-font">Message: <%= request.getAttribute("org.jboss.portal.control.MESSAGE") %> +</div> <% - } -%> -<div class="portlet-font">StackTrace: <%= Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.control.CAUSE")) %></div> \ No newline at end of file + } +%> +<div class="portlet-font"> + StackTrace: <%= Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.control.CAUSE")) %> +</div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,14 +1,19 @@ -<%@page import="java.lang.Throwable"%> -<%@page import="org.jboss.portal.common.util.Exceptions"%> +<%@ page import="org.jboss.portal.common.util.Exceptions" %> -<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %></h2> -<div class="portlet-font">Cause: <%= request.getAttribute("org.jboss.portal.control.CAUSE") %></div> +<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %> +</h2> + +<div class="portlet-font">Cause: <%= request.getAttribute("org.jboss.portal.control.CAUSE") %> +</div> <% - if (request.getAttribute("org.jboss.portal.control.MESSAGE") != null) - { -%> -<div class="portlet-font">Message: <%= request.getAttribute("org.jboss.portal.control.MESSAGE") %></div> + if (request.getAttribute("org.jboss.portal.control.MESSAGE") != null) + { +%> +<div class="portlet-font">Message: <%= request.getAttribute("org.jboss.portal.control.MESSAGE") %> +</div> <% - } -%> -<div class="portlet-font">StackTrace: <%= Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.control.CAUSE")) %></div> \ No newline at end of file + } +%> +<div class="portlet-font"> + StackTrace: <%= Exceptions.toHTML((Throwable)request.getAttribute("org.jboss.portal.control.CAUSE")) %> +</div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,4 @@ <%@ page import="org.jboss.portal.api.PortalURL" %> -<%@ page import="org.jboss.portal.identity.User" %> <% User user = (User)request.getAttribute("org.jboss.portal.header.USER"); Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,20 +1,20 @@ +<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %> +<%@ page import="org.jboss.portal.api.node.PortalNode" %> +<%@ page import="java.util.ArrayList" %> <%@ page import="java.util.Iterator" %> -<%@ page import="org.jboss.portal.api.node.PortalNode" %> <%@ page import="java.util.Locale" %> -<%@ page import="java.util.ArrayList" %> -<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %> <% PortalNode root = (PortalNode)request.getAttribute("org.jboss.portal.api.PORTAL_NODE"); PortalNode portal = root; - PortalNode mainPage = portal; - + PortalNode mainPage = portal; + while (portal.getType() != PortalNode.TYPE_PORTAL) { mainPage = portal; portal = portal.getParent(); } - + PortalRuntimeContext context = (PortalRuntimeContext)request.getAttribute("org.jboss.portal.api.PORTAL_RUNTIME_CONTEXT"); // Get a locale @@ -26,53 +26,60 @@ %> <ul id="tabsHeader"> -<% - ArrayList tmp = new ArrayList(10); - Iterator childrenIt = portal.getChildren().iterator(); - while (childrenIt.hasNext()) - { - PortalNode child = (PortalNode)childrenIt.next(); + <% + ArrayList tmp = new ArrayList(10); + Iterator childrenIt = portal.getChildren().iterator(); + while (childrenIt.hasNext()) + { + PortalNode child = (PortalNode)childrenIt.next(); - // Get the list of child pages - tmp.clear(); - for (Iterator i = child.getChildren().iterator();i.hasNext();) - { - PortalNode childChild = (PortalNode)i.next(); - if (childChild.getType() == PortalNode.TYPE_PAGE) + // Get the list of child pages + tmp.clear(); + for (Iterator i = child.getChildren().iterator(); i.hasNext();) { - tmp.add(childChild); + PortalNode childChild = (PortalNode)i.next(); + if (childChild.getType() == PortalNode.TYPE_PAGE) + { + tmp.add(childChild); + } } - } -%> - <li <% if(child == mainPage) out.println(" id=\"current\""); %> onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"><a href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %><% + %> + <li <% + if (child == mainPage) + { + out.println(" id=\"current\""); + } %> onmouseover="this.className='hoverOn'" + onmouseout="this.className='hoverOff'"><a + href="<%= child.createURL(context) %>"><%= child.getDisplayName(locale) %><% if (tmp.size() == 0) { -%></a> -<% + %></a> + <% } else { -%> - <!--[if IE 7]><!--></a><!--<![endif]--> - <!--[if lte IE 6]>&nbsp;&nbsp;&nbsp;<table><tr><td><![endif]--> - <ul> -<% - for (Iterator j = tmp.iterator(); j.hasNext();) - { - PortalNode childChild = (PortalNode)j.next(); -%> - <li><a href='<%= childChild.createURL(context) %>'><%= childChild.getDisplayName(locale) %></a></li> -<% + %> + <!--[if IE 7]><!--></a><!--<![endif]--> + <!--[if lte IE 6]>&nbsp;&nbsp;&nbsp;<table><tr><td><![endif]--> + <ul> + <% + for (Iterator j = tmp.iterator(); j.hasNext();) + { + PortalNode childChild = (PortalNode)j.next(); + %> + <li><a href='<%= childChild.createURL(context) %>'><%= childChild.getDisplayName(locale) %> + </a></li> + <% + } + %> + </ul> + <!--[if lte IE 6]></td></tr></table></a><![endif]--> + <% } -%> - </ul> - <!--[if lte IE 6]></td></tr></table></a><![endif]--> -<% + %> + </li> + <% } -%> - </li> -<% - } -%> + %> </ul> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/createRole.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -75,15 +75,16 @@ <br/> </form> <p> -<input name="Find" class="portlet-form-button" id="Save" type="submit" - onclick="document.forms['<portlet:namespace/>editListRoleMembers'].submit();" - value="${n:i18n("Search")}"/> -&nbsp; -<input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" - onclick="document.forms['<portlet:namespace/>cancelEditListRoleMembers'].submit();" - value="${n:i18n("Cancel")}"/> + <input name="Find" class="portlet-form-button" id="Save" type="submit" + onclick="document.forms['<portlet:namespace/>editListRoleMembers'].submit();" + value="${n:i18n("Search")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancelEditListRoleMembers'].submit();" + value="${n:i18n("Cancel")}"/> </p> + <form - name="<portlet:namespace/>cancelEditListRoleMembers" - action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" - method="post"/> + name="<portlet:namespace/>cancelEditListRoleMembers" + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" + method="post"/> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -12,13 +12,14 @@ <input type="hidden" name="roleid" value="${n:out("editroleid")}"/> <p> - <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}: </label> + <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}: </label> <input name="roledisplayname" type="text" value="${param["editroledisplayname"]}" size="21" maxlength="25"/> <n:error key="roledisplayname_error"/> </p> </form> <form name="<portlet:namespace/>cancelEditRole" - action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" method="post"> + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" + method="post"> </form> <p> <input name="Save" class="portlet-form-button" id="Save" type="submit" Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRoleMembers.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRoleMembers.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRoleMembers.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,51 +1,54 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> <portlet:defineObjects/> <div align="center"> -<form id="editRoleMembers" action="<portlet:actionURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:actionURL>" method="post"> - <table border="0" class="portlet-font" cellspacing="0" cellpadding="5"> - <tr> - <td colspan="2" class="portlet-section-alternate" align="left"> - <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/role.gif" align="absmiddle"/>&nbsp; - ${n:i18n("MENU_EDITROLEMEMBERS")}</td> - </tr> - <tr> - <td class="portlet-section-body">${n:i18n("ROLE_SELECTONETOMODIFY")}:</td> - <td class="portlet-section-body"> - <select name="roleid" class="portlet-form-input-field"> - <n:iterate ctx="role"> - <option value="${n:out("role.id")}" ${n:out("role.selected")}>${n:out("role.displayname")}</option> - </n:iterate> - </select> <n:error key="roledelete_error"/> - </td> - </tr> - <tr> - <td class="portlet-section-body">${n:i18n("LIST_USERNAMECONTAINS")}:</td> - <td class="portlet-section-body" align="left"> - <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15" class="portlet-form-input-field"/> - </td> - </tr> - <tr> - <td class="portlet-section-body">${n:i18n("LIST_USERSPERPAGE")}:</td> - <td class="portlet-section-body" align="left"> - <select name="usersperpage" class="portlet-form-input-field"> - <option value="10">10</option> - <option value="20">20</option> - <option value="30">30</option> - <option value="50">50</option> - <option value="75">75</option> - <option value="100">100</option> - </select> - </td> - </tr> - <tr> - <td colspan="2" align="center" class="portlet-section-body"> - <input type="submit" value="${n:i18n("ROLE_EDIT_MEMBERS")}" class="portlet-form-button"> - </td> - </tr> - </table> -</form> + <form id="editRoleMembers" + action="<portlet:actionURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:actionURL>" + method="post"> + <table border="0" class="portlet-font" cellspacing="0" cellpadding="5"> + <tr> + <td colspan="2" class="portlet-section-alternate" align="left"> + <img border="0" src="<%= renderRequest.getContextPath() %>/images/role/role.gif" align="absmiddle"/>&nbsp; + ${n:i18n("MENU_EDITROLEMEMBERS")}</td> + </tr> + <tr> + <td class="portlet-section-body">${n:i18n("ROLE_SELECTONETOMODIFY")}:</td> + <td class="portlet-section-body"> + <select name="roleid" class="portlet-form-input-field"> + <n:iterate ctx="role"> + <option value="${n:out("role.id")}" ${n:out("role.selected")}>${n:out("role.displayname")}</option> + </n:iterate> + </select> <n:error key="roledelete_error"/> + </td> + </tr> + <tr> + <td class="portlet-section-body">${n:i18n("LIST_USERNAMECONTAINS")}:</td> + <td class="portlet-section-body" align="left"> + <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15" + class="portlet-form-input-field"/> + </td> + </tr> + <tr> + <td class="portlet-section-body">${n:i18n("LIST_USERSPERPAGE")}:</td> + <td class="portlet-section-body" align="left"> + <select name="usersperpage" class="portlet-form-input-field"> + <option value="10">10</option> + <option value="20">20</option> + <option value="30">30</option> + <option value="50">50</option> + <option value="75">75</option> + <option value="100">100</option> + </select> + </td> + </tr> + <tr> + <td colspan="2" align="center" class="portlet-section-body"> + <input type="submit" value="${n:i18n("ROLE_EDIT_MEMBERS")}" class="portlet-form-button"> + </td> + </tr> + </table> + </form> </div> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRoleMembers.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -24,7 +24,7 @@ <input type="hidden" name="usersperpage" value="${n:out("usersperpage")}"/> <n:iterate ctx="userRoles"> - <input type="hidden" name="assignedRoles" value="${n:out("userRoles.name")}"/> + <input type="hidden" name="assignedRoles" value="${n:out("userRoles.name")}"/> </n:iterate> <tr> @@ -52,8 +52,10 @@ </form> - <tr><td><br/></td></tr> <tr> + <td><br/></td> + </tr> + <tr> <td colspan="3"> <input name="Save" class="portlet-form-button" id="Assign" type="submit" onclick="document.forms['<portlet:namespace/>editRoles'].submit();" Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -29,7 +29,8 @@ <portlet:param name="op" value="removeRole"/> <portlet:param name="roleid" value="${n:out('role.id')}"/> </portlet:actionURL>" - onClick="javascript:return confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">Delete</a></td> + onClick="javascript:return confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">Delete</a> + </td> </tr> </n:iterate> </table> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> <n:if ctx="IfCond">Some text</n:if> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIf01.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> BeginInclude:<n:include page="testInclude02.jsp"/>:EndInclude \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude01.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude02.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> Foo:<n:include page="testInclude01.jsp"/>:Bar \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testInclude03.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> <n:iterate ctx="row">Some text</n:iterate> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate01.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> <n:iterate ctx="row">A<n:iterate ctx="col">B</n:iterate>C</n:iterate> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate02.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> <n:iterate ctx="row">A<n:iterate ctx="col">B<n:iterate ctx="foo">C</n:iterate></n:iterate>D</n:iterate> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testIterate03.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,5 +1,5 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> ${n:out("foo")}:<n:include page="testTaglib02.jsp"/>:${n:out("bar")} Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib01.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,9 +1,9 @@ <%@ 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" %> -<%@ page isELIgnored ="false" %> +<%@ page isELIgnored="false" %> ${n:out("foo")}: <n:iterate ctx="row1"> -${n:out("row1.value1")}: + ${n:out("row1.value1")}: </n:iterate> ${n:out("bar")} Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/test/testTaglib02.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -8,7 +8,8 @@ <hr/> <table cellpadding="0" cellspacing="8" border="0" class="pn-normal"> -<form name="<portlet:namespace/>save" action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post"> +<form name="<portlet:namespace/>save" + action="<portlet:actionURL><portlet:param name="op" value="storeProfile"/></portlet:actionURL>" method="post"> <input type="hidden" name="userid" value="${n:out("userid")}"/> <tr> <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editProfile.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -57,6 +57,7 @@ </div> <br/> + <form id="<portlet:namespace/>searchUsers" action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" @@ -74,12 +75,13 @@ <br/> </form> <input name="Save" class="portlet-form-button" id="Save" type="submit" - onclick="document.forms['<portlet:namespace/>searchUsers'].submit();" - value="${n:i18n("Search")}"/> - &nbsp; - <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" - onclick="document.forms['<portlet:namespace/>cancel'].submit();" - value="${n:i18n("Cancel")}"/> + onclick="document.forms['<portlet:namespace/>searchUsers'].submit();" + value="${n:i18n("Search")}"/> +&nbsp; +<input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancel'].submit();" + value="${n:i18n("Cancel")}"/> + <form name="<portlet:namespace/>cancel" action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>" Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,4 +1,3 @@ -<%@ page import="org.jboss.portal.core.CoreConstants" %> <%@ 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" %> @@ -6,15 +5,15 @@ <portlet:defineObjects/> <div class="box" align="center"> - <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> - <tr> - <td colspan="1"> + <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> + <tr> + <td colspan="1"> <span class="portlet-text"> ${n:i18n("REGISTER_NOT_LOGGED_IN")} <br/><br/> <a id="register" href="<portlet:renderURL windowState="maximized"><portlet:param name="op" value="showRegister"/></portlet:renderURL>">${n:i18n("REGISTER_REGISTER")}</a></span> - </td> - </tr> - </table> + </td> + </tr> + </table> </div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -7,67 +7,67 @@ <p><span class="requiredfield">*</span>&nbsp;${n:i18n("REQUIRED")}</p> <hr/> <table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal"> - <form name="<portlet:namespace/>register" - action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post"> - <tr> - <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> - </tr> - <tr> + <form name="<portlet:namespace/>register" + action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post"> + <tr> + <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> + </tr> + <tr> - <td class="portlet-form-label" nowrap>${n:i18n("USERNAME")}<span class="requiredfield">*</span></td> - <td colspan="2"><input type="text" name="uname" value="${param["USERNAME"]}" - size="30" maxlength="25"> - <n:error key="uname_error"/> - </td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span> - </td> - <td><input type="text" name="realemail" value=&quot;user(a)portal.com&quot; size="30" maxlength="60"> - <n:error key="realemail_error"/> - </td> + <td class="portlet-form-label" nowrap>${n:i18n("USERNAME")}<span class="requiredfield">*</span></td> + <td colspan="2"><input type="text" name="uname" value="${param["USERNAME"]}" + size="30" maxlength="25"> + <n:error key="uname_error"/> + </td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_REALEMAIL")}<span class="requiredfield">*</span> + </td> + <td><input type="text" name="realemail" value=&quot;user(a)portal.com&quot; size="30" maxlength="60"> + <n:error key="realemail_error"/> + </td> - <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>Allow - other users to view my real e-mail address - </td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_FAKEEMAIL")}</td> - <td colspan="2"><input type="text" name="fakeemail" value="" size="30" maxlength="60"></td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("PASSWORD")}<span class="requiredfield">*</span></td> + <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>Allow + other users to view my real e-mail address + </td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_FAKEEMAIL")}</td> + <td colspan="2"><input type="text" name="fakeemail" value="" size="30" maxlength="60"></td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("PASSWORD")}<span class="requiredfield">*</span></td> - <td colspan="2"><input type="password" name="pass1" size="30" maxlength="20"> - <n:error key="pass1_error"/> - </td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_PASSWORDAGAIN")}<span - class="requiredfield">*</span></td> - <td colspan="2"><input type="password" name="pass2" size="30" maxlength="20"> - <n:error key="pass2_error"/> - </td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td> + <td colspan="2"><input type="password" name="pass1" size="30" maxlength="20"> + <n:error key="pass1_error"/> + </td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_PASSWORDAGAIN")}<span + class="requiredfield">*</span></td> + <td colspan="2"><input type="password" name="pass2" size="30" maxlength="20"> + <n:error key="pass2_error"/> + </td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td> - <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100"> - </td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td> - <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100"> - </td> - </tr> - <tr> - <td colspan="3" class="bottombuttonbar"> - <input name="Save" class="portlet-form-button" id="register" type="submit" - value="${n:i18n("REGISTER_NEWUSER")}"/> - &nbsp; - <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" - value="${n:i18n("Cancel")}"/> - </td> - </tr> - </form> + <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100"> + </td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td> + <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100"> + </td> + </tr> + <tr> + <td colspan="3" class="bottombuttonbar"> + <input name="Save" class="portlet-form-button" id="register" type="submit" + value="${n:i18n("REGISTER_NEWUSER")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + value="${n:i18n("Cancel")}"/> + </td> + </tr> + </form> </table> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,4 +1,3 @@ -<%@ page import="org.jboss.portal.core.CoreConstants" %> <%@ 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" %> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -1,19 +1,18 @@ -<%@ page import="org.jboss.portal.core.CoreConstants" %> -<%@ 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" %> -<%@ page isELIgnored="false" %> -<portlet:defineObjects/> - - -<div class="box" align="center"> - <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> - <tr> - <td align="center">${n:i18n("REGISTER_TY")}</td> - </tr> - </table> +<%@ 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" %> +<%@ page isELIgnored="false" %> +<portlet:defineObjects/> + + +<div class="box" align="center"> + <table border="0" class="portlet-font" cellspacing="0" cellpadding="2"> + <tr> + <td align="center">${n:i18n("REGISTER_TY")}</td> + </tr> + </table> </div> <br/> <br/> <span class="portlet-font"><a - href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span> + href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -5,30 +5,30 @@ <table cellpadding="0" cellspacing="8" border="0" class="pn-normal"> -<tr> - <td class="portlet-form-label">${n:i18n("LIST_USERNAME")}</td> - <td>${n:out("username")}</td> -</tr> -<tr> - <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td> - <td>${n:out("GIVENNAME")}</td> -</tr> -<tr> - <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td> - <td>${n:out("FAMILYNAME")}</td> -</tr> -<tr> - <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td> - <td>${n:out("FAKEEMAIL")}</td> -</tr> -<tr> - <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td> - <td>${n:out("HOMEPAGE")}</td> -</tr> -<tr> - <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td> - <td>${n:out("LOCATION")}</td> -</tr> + <tr> + <td class="portlet-form-label">${n:i18n("LIST_USERNAME")}</td> + <td>${n:out("username")}</td> + </tr> + <tr> + <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td> + <td>${n:out("GIVENNAME")}</td> + </tr> + <tr> + <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td> + <td>${n:out("FAMILYNAME")}</td> + </tr> + <tr> + <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td> + <td>${n:out("FAKEEMAIL")}</td> + </tr> + <tr> + <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td> + <td>${n:out("HOMEPAGE")}</td> + </tr> + <tr> + <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td> + <td>${n:out("LOCATION")}</td> + </tr> </table> <form Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/context.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,12 +25,12 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!-- - | Uncomment to enable JOSSO server based SSO authentication. - | Redirects the user to the propper login page. Configured as the login url the web.xml for this application. +| Uncomment to enable JOSSO server based SSO authentication. +| Redirects the user to the propper login page. Configured as the login url the web.xml for this application. --> <% - /* response.sendRedirect(request.getContextPath() + "/josso_login/"); */ + /* response.sendRedirect(request.getContextPath() + "/josso_login/"); */ %> <html> @@ -39,6 +39,7 @@ body { background-color: #FFFFFF; } + td { color: #000000; font-family: verdana, arial, sans-serif; @@ -50,61 +51,63 @@ <body OnLoad="document.loginform.j_username.focus();"> -<table width="100%" height="600" cellpadding="0" cellspacing="1" > +<table width="100%" height="600" cellpadding="0" cellspacing="1"> <tr> <td valign="middle" align="center"> <form method="POST" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm"> <% String prefix = request.getContextPath(); %> - <table cellspacing="0" cellpadding="0"> - <tr> - <td ><img src="<%= prefix %>/images/login_top_left.png" /></td> - <td style="background-image:url('<%= prefix %>/images/login_top.png')"></td> - <td><img src="<%= prefix %>/images/login_top_right.png" /></td> - </tr> - <tr> - <td style="background-image:url('<%= prefix %>/images/login_left.png')"></td> - <!-- REAL CONTENT CELL : begin --> - <td style="background-color:#b4b4b4" align="center"> - <b>JBoss Portal Login</b><br/><br/> - <p style="color:red"><%= request.getAttribute("org.jboss.portal.loginError") %></p> - <table> - <tr> - <td align="right" width="50"> - Username:&nbsp; - </td> - <td align="left"> - <input type="text" name="j_username" value=""/> - </td> - </tr> - <tr> - <td align="right" width="50"> - Password:&nbsp; - </td> - <td align="left"> - <input type="password" name="j_password" value=""/> - </td> - </tr> - <tr> - <td colspan="2" align="right"> - <input type="submit" name="login" value="Login"/> - </td> - </tr> - </table> + <table cellspacing="0" cellpadding="0"> + <tr> + <td><img src="<%= prefix %>/images/login_top_left.png"/></td> + <td style="background-image:url('<%= prefix %>/images/login_top.png')"></td> + <td><img src="<%= prefix %>/images/login_top_right.png"/></td> + </tr> + <tr> + <td style="background-image:url('<%= prefix %>/images/login_left.png')"></td> + <!-- REAL CONTENT CELL : begin --> + <td style="background-color:#b4b4b4" align="center"> + <b>JBoss Portal Login</b><br/><br/> - </td> - <!-- REAL CONTENT CELL : end --> - <td style="background-image:url('<%= prefix %>/images/login_right.png')"></td> - </tr> - <tr> - <td><img src="<%= prefix %>/images/login_bottom_left.png" /></td> - <td style="background-image:url('<%= prefix %>/images/login_bottom.png')"></td> - <td><img src="<%= prefix %>/images/login_bottom_right.png" /></td> - </tr> - </table> + <p style="color:red"><%= request.getAttribute("org.jboss.portal.loginError") %> + </p> + <table> + <tr> + <td align="right" width="50"> + Username:&nbsp; + </td> + <td align="left"> + <input type="text" name="j_username" value=""/> + </td> + </tr> + <tr> + <td align="right" width="50"> + Password:&nbsp; + </td> + <td align="left"> + <input type="password" name="j_password" value=""/> + </td> + </tr> + <tr> + <td colspan="2" align="right"> + <input type="submit" name="login" value="Login"/> + </td> + </tr> + </table> + </td> + <!-- REAL CONTENT CELL : end --> + <td style="background-image:url('<%= prefix %>/images/login_right.png')"></td> + </tr> + <tr> + <td><img src="<%= prefix %>/images/login_bottom_left.png"/></td> + <td style="background-image:url('<%= prefix %>/images/login_bottom.png')"></td> + <td><img src="<%= prefix %>/images/login_bottom_right.png"/></td> + </tr> + </table> + </form> </td> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2007-10-28 01:14:48 UTC (rev 8786) @@ -25,12 +25,12 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!-- - | Uncomment to enable JOSSO server based SSO authentication. - | Redirects the user to the propper login page. Configured as the login url the web.xml for this application. +| Uncomment to enable JOSSO server based SSO authentication. +| Redirects the user to the propper login page. Configured as the login url the web.xml for this application. --> <% - /* response.sendRedirect(request.getContextPath() + "/josso_login/"); */ + /* response.sendRedirect(request.getContextPath() + "/josso_login/"); */ %> @@ -40,6 +40,7 @@ body { background-color: #FFFFFF; } + td { color: #000000; font-family: verdana, arial, sans-serif; @@ -51,58 +52,58 @@ <body OnLoad="document.loginform.j_username.focus();"> -<table width="100%" height="600" cellpadding="0" cellspacing="1" > +<table width="100%" height="600" cellpadding="0" cellspacing="1"> <tr> <td valign="middle" align="center"> <form method="POST" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm"> <% String prefix = request.getContextPath(); %> - <table cellspacing="0" cellpadding="0"> - <tr> - <td ><img src="<%= prefix %>/images/login_top_left.png" /></td> - <td style="background-image:url('<%= prefix %>/images/login_top.png')"></td> - <td><img src="<%= prefix %>/images/login_top_right.png" /></td> - </tr> - <tr> - <td style="background-image:url('<%= prefix %>/images/login_left.png')"></td> - <!-- REAL CONTENT CELL : begin --> - <td style="background-color:#b4b4b4" align="center"> - <b>JBoss Portal Login</b><br/><br/> - <table> - <tr> - <td align="right" width="50"> - Username:&nbsp; - </td> - <td align="left"> - <input type="text" name="j_username" value=""/> - </td> - </tr> - <tr> - <td align="right" width="50"> - Password:&nbsp; - </td> - <td align="left"> - <input type="password" name="j_password" value=""/> - </td> - </tr> - <tr> - <td colspan="2" align="right"> - <input type="submit" name="login" value="Login"/> - </td> - </tr> - </table> + <table cellspacing="0" cellpadding="0"> + <tr> + <td><img src="<%= prefix %>/images/login_top_left.png"/></td> + <td style="background-image:url('<%= prefix %>/images/login_top.png')"></td> + <td><img src="<%= prefix %>/images/login_top_right.png"/></td> + </tr> + <tr> + <td style="background-image:url('<%= prefix %>/images/login_left.png')"></td> + <!-- REAL CONTENT CELL : begin --> + <td style="background-color:#b4b4b4" align="center"> + <b>JBoss Portal Login</b><br/><br/> + <table> + <tr> + <td align="right" width="50"> + Username:&nbsp; + </td> + <td align="left"> + <input type="text" name="j_username" value=""/> + </td> + </tr> + <tr> + <td align="right" width="50"> + Password:&nbsp; + </td> + <td align="left"> + <input type="password" name="j_password" value=""/> + </td> + </tr> + <tr> + <td colspan="2" align="right"> + <input type="submit" name="login" value="Login"/> + </td> + </tr> + </table> - </td> - <!-- REAL CONTENT CELL : end --> - <td style="background-image:url('<%= prefix %>/images/login_right.png')"></td> - </tr> - <tr> - <td><img src="<%= prefix %>/images/login_bottom_left.png" /></td> - <td style="background-image:url('<%= prefix %>/images/login_bottom.png')"></td> - <td><img src="<%= prefix %>/images/login_bottom_right.png" /></td> - </tr> - </table> + </td> + <!-- REAL CONTENT CELL : end --> + <td style="background-image:url('<%= prefix %>/images/login_right.png')"></td> + </tr> + <tr> + <td><img src="<%= prefix %>/images/login_bottom_left.png"/></td> + <td style="background-image:url('<%= prefix %>/images/login_bottom.png')"></td> + <td><img src="<%= prefix %>/images/login_bottom_right.png"/></td> + </tr> + </table> </form> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/setup/portal-ds.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/setup/setup.sql ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/cache/domain.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/cache/local.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/cache/replicated.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/datarole.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/datarolecreated.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/dataroledeleted.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/dataroleedited.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml 2007-10-28 01:09:21 UTC (rev 8785) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml 2007-10-28 01:14:48 UTC (rev 8786) @@ -20,7 +20,8 @@ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> +<!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> <portlet-app> <portlet> <portlet-name>Portlet1</portlet-name> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/jboss-portlet.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/deployment/portlet-instances.xml ___________________________________________________________________ Name: svn:keywords + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/hibernate.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/log4j.properties ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/test/theme.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + LastChangedDate LastChangedBy LastChangedRevision Id